From 3475e92f22eecf601da920e002a7346e9a05f35b Mon Sep 17 00:00:00 2001 From: Francesco Riosa Date: Fri, 5 Jan 2007 12:03:48 +0000 Subject: [PATCH] force revision bump, needed to fix/discover bugs introuduced during last working days. Package-Manager: portage-2.1.2_rc4-r1 --- dev-db/mysql-community/Manifest | 66 ++-- .../files/digest-mysql-community-5.0.27 | 6 - .../files/digest-mysql-community-5.1.14_beta | 9 - ...t-mysql-community-5.1.15_alpha20061231-r60 | 9 - dev-db/mysql-community/files/mysql.conf.d | 80 ---- dev-db/mysql-community/files/mysql.rc6 | 357 ------------------ .../mysql-community/files/mysqlmanager.conf.d | 28 -- dev-db/mysql-community/files/mysqlmanager.rc6 | 230 ----------- .../mysql-community-5.0.27.ebuild | 58 --- .../mysql-community-5.1.14_beta.ebuild | 61 --- ...-community-5.1.15_alpha20061231-r60.ebuild | 61 --- dev-db/mysql/Manifest | 108 +++--- dev-db/mysql/files/mysql.conf.d | 80 ---- dev-db/mysql/files/mysql.rc6 | 357 ------------------ dev-db/mysql/files/mysqlmanager.conf.d | 28 -- dev-db/mysql/files/mysqlmanager.rc6 | 230 ----------- dev-db/mysql/mysql-4.0.27.ebuild | 34 -- dev-db/mysql/mysql-4.1.22.ebuild | 43 --- .../mysql-4.1.23_alpha20070101-r60.ebuild | 42 --- dev-db/mysql/mysql-5.0.26-r1.ebuild | 58 --- dev-db/mysql/mysql-5.0.30.ebuild | 58 --- .../mysql-5.0.34_alpha20070101-r60.ebuild | 75 ---- 22 files changed, 71 insertions(+), 2007 deletions(-) delete mode 100644 dev-db/mysql-community/files/digest-mysql-community-5.0.27 delete mode 100644 dev-db/mysql-community/files/digest-mysql-community-5.1.14_beta delete mode 100644 dev-db/mysql-community/files/digest-mysql-community-5.1.15_alpha20061231-r60 delete mode 100644 dev-db/mysql-community/files/mysql.conf.d delete mode 100644 dev-db/mysql-community/files/mysql.rc6 delete mode 100644 dev-db/mysql-community/files/mysqlmanager.conf.d delete mode 100644 dev-db/mysql-community/files/mysqlmanager.rc6 delete mode 100644 dev-db/mysql-community/mysql-community-5.0.27.ebuild delete mode 100644 dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild delete mode 100644 dev-db/mysql-community/mysql-community-5.1.15_alpha20061231-r60.ebuild delete mode 100644 dev-db/mysql/files/mysql.conf.d delete mode 100644 dev-db/mysql/files/mysql.rc6 delete mode 100644 dev-db/mysql/files/mysqlmanager.conf.d delete mode 100644 dev-db/mysql/files/mysqlmanager.rc6 delete mode 100644 dev-db/mysql/mysql-4.0.27.ebuild delete mode 100644 dev-db/mysql/mysql-4.1.22.ebuild delete mode 100644 dev-db/mysql/mysql-4.1.23_alpha20070101-r60.ebuild delete mode 100644 dev-db/mysql/mysql-5.0.26-r1.ebuild delete mode 100644 dev-db/mysql/mysql-5.0.30.ebuild delete mode 100644 dev-db/mysql/mysql-5.0.34_alpha20070101-r60.ebuild diff --git a/dev-db/mysql-community/Manifest b/dev-db/mysql-community/Manifest index d440c240e507..804de29a0d6f 100644 --- a/dev-db/mysql-community/Manifest +++ b/dev-db/mysql-community/Manifest @@ -6,60 +6,44 @@ AUX my.cnf-4.1 4220 RMD160 fd98c93f199b631164b1623965751cc3b367d04a SHA1 53eda46 MD5 06cafc559c9f18d2b215e62df55ee038 files/my.cnf-4.1 4220 RMD160 fd98c93f199b631164b1623965751cc3b367d04a files/my.cnf-4.1 4220 SHA256 e07909810868e75410c26b0e9b9d00a61c8d303f8a912b4b1232dbdbb168aac1 files/my.cnf-4.1 4220 -AUX mysql.conf.d 3273 RMD160 a2661c832c1091b2d05e599fc58cce6f686c7f31 SHA1 64e9bb80099bf6e14a07764fcb69bb02682aee0b SHA256 ee049781a3885305ce9999371198ff54f97fee4d2ad0814ba3aa3a03abc2724c -MD5 092bb6cad90a875da8899e104304c969 files/mysql.conf.d 3273 -RMD160 a2661c832c1091b2d05e599fc58cce6f686c7f31 files/mysql.conf.d 3273 -SHA256 ee049781a3885305ce9999371198ff54f97fee4d2ad0814ba3aa3a03abc2724c files/mysql.conf.d 3273 -AUX mysql.rc6 10634 RMD160 8bcbcc00004cf274a783fb83f6ab4d3eda15e625 SHA1 dfb872e1db1ef7e9ab5552792c28d4770ffa36fc SHA256 ff82da90eb08ad103eb2d7bb1500c4b01a0114a16f115c4892f9526e8dad0e65 -MD5 fc5857a4d2d914d98eeea84daa069a7d files/mysql.rc6 10634 -RMD160 8bcbcc00004cf274a783fb83f6ab4d3eda15e625 files/mysql.rc6 10634 -SHA256 ff82da90eb08ad103eb2d7bb1500c4b01a0114a16f115c4892f9526e8dad0e65 files/mysql.rc6 10634 -AUX mysqlmanager.conf.d 1009 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 SHA1 0d82531df24ba4f0d957176b6fa0076a1cae0356 SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7 -MD5 c94178cadec3be56c4e6c7ec9812cfcf files/mysqlmanager.conf.d 1009 -RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 files/mysqlmanager.conf.d 1009 -SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7 files/mysqlmanager.conf.d 1009 -AUX mysqlmanager.rc6 6627 RMD160 e980a5f09570e528c0a3b57cdc7d3fa2bff78502 SHA1 18179e0665116c1cb3ace712368b2cf6bb5e06a6 SHA256 19f876f17e193ecaf4382ae0dda6e8a77b431443aff9310d3687696b60a1c0f5 -MD5 042db86d50b38de7573c7346084cc081 files/mysqlmanager.rc6 6627 -RMD160 e980a5f09570e528c0a3b57cdc7d3fa2bff78502 files/mysqlmanager.rc6 6627 -SHA256 19f876f17e193ecaf4382ae0dda6e8a77b431443aff9310d3687696b60a1c0f5 files/mysqlmanager.rc6 6627 DIST mysql-5.0.27.tar.gz 25867740 RMD160 3de75b959d04e002b2e4cfe322abdb48bf2f80fd SHA1 656de9c03f07c2371f40277076ec2fc6eac51ec8 SHA256 08dc9a7b4adb766b2fb8390804147822f1772aa4bd2e06ca7764bc85010c73a7 DIST mysql-5.1.14-beta.tar.gz 23640648 RMD160 2acaa1393967a6fd57f9c37f3eef8dac62eb7138 SHA1 52533fcd07fbce2269a3c14f7314deada6dcf0c1 SHA256 6b4990a784169560fd487d24c69efba1f73662500d0d3132375d8b5cd026bb67 DIST mysql-5.1.15-bk-20061231.tar.bz2 11999404 RMD160 9a9929d6c2df4e128b3b5259b21fec5e04fe3181 SHA1 a6cdb54f1f113545103660fa20adfc128afee97c SHA256 1e4acc53175af275b48dbab33320d4841c9502c74f283e4f62215f5c2e602f15 DIST mysql-extras-20070105.tar.bz2 50005 RMD160 abf1f8ebab8ecdfdb5ebe9ca55076f39ab492acb SHA1 7f4dbc3d6c20fe953bf6e936a58343a229398ca0 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 DIST pbxt-0.9.73-beta.tar.gz 2706652 RMD160 a4d974a8519b62868e948966910a84dbded05abe SHA1 f6ed2ba49ec82646581edcb06e054c46a5ba1ded SHA256 a2176d137138d33028c57499b74a79c5f12dcd958c3e7f1aad67bb4b7b24674d -EBUILD mysql-community-5.0.27.ebuild 1972 RMD160 4fef1db763857a576989a6e890f52c254e7dd0f1 SHA1 1ae9f739a8cdef410b1c760e0908b952f18034eb SHA256 1203c76924043393118f9f7f03375eca459add894392a4256b0c67c44863b0f0 -MD5 2b1d47a3e4dd2d1d17c86e397d9b3c14 mysql-community-5.0.27.ebuild 1972 -RMD160 4fef1db763857a576989a6e890f52c254e7dd0f1 mysql-community-5.0.27.ebuild 1972 -SHA256 1203c76924043393118f9f7f03375eca459add894392a4256b0c67c44863b0f0 mysql-community-5.0.27.ebuild 1972 -EBUILD mysql-community-5.1.14_beta.ebuild 2163 RMD160 a597ba9ccd07a921ddc3544feb59a4bf19f6e277 SHA1 058c8cbe59acc48e2553b95fb4b7e90058cc7e63 SHA256 f4df86d28cac0b0c098b9359201ea73cb5790993eb48bc244b0b950ad8b9b1f3 -MD5 166ff98892f5a3d6b32b363ab88241f7 mysql-community-5.1.14_beta.ebuild 2163 -RMD160 a597ba9ccd07a921ddc3544feb59a4bf19f6e277 mysql-community-5.1.14_beta.ebuild 2163 -SHA256 f4df86d28cac0b0c098b9359201ea73cb5790993eb48bc244b0b950ad8b9b1f3 mysql-community-5.1.14_beta.ebuild 2163 +EBUILD mysql-community-5.0.27-r1.ebuild 1975 RMD160 62818a0e5fd30ce12a94773b39a93811e53ebe44 SHA1 3b3211c7ba8e91e6ec7e216e9d3a57719858c872 SHA256 7b84fbacbb10ac3d673e6fbe3a96006109f5317df336704051d54b48f2700830 +MD5 e572e2c8aa59aa497ec830cac4470357 mysql-community-5.0.27-r1.ebuild 1975 +RMD160 62818a0e5fd30ce12a94773b39a93811e53ebe44 mysql-community-5.0.27-r1.ebuild 1975 +SHA256 7b84fbacbb10ac3d673e6fbe3a96006109f5317df336704051d54b48f2700830 mysql-community-5.0.27-r1.ebuild 1975 +EBUILD mysql-community-5.1.14_beta-r1.ebuild 2166 RMD160 9cf06e966bbe796b7f2b4d1fbdc9599d31c40915 SHA1 6e27c4ff187f472b6d713d2f6dc5489abb97a64c SHA256 42afd8d48f87b86828a0ec99fed1d7985dfb55d67bf4e640f5066610c51b5853 +MD5 4b7fc33a042c56ae62546261175fefcc mysql-community-5.1.14_beta-r1.ebuild 2166 +RMD160 9cf06e966bbe796b7f2b4d1fbdc9599d31c40915 mysql-community-5.1.14_beta-r1.ebuild 2166 +SHA256 42afd8d48f87b86828a0ec99fed1d7985dfb55d67bf4e640f5066610c51b5853 mysql-community-5.1.14_beta-r1.ebuild 2166 EBUILD mysql-community-5.1.15_alpha-r90.ebuild 2024 RMD160 73b973ca11c75131fa725055dbc326ddd1301738 SHA1 786cf415cea9a58f87018ad296f5716f81f088c1 SHA256 da0f5f30084993559b2b8a75007757cd84b6c3fc20cac7129f0c43a8380232ec MD5 739cd719a2c9ae2339ee38d204e7f829 mysql-community-5.1.15_alpha-r90.ebuild 2024 RMD160 73b973ca11c75131fa725055dbc326ddd1301738 mysql-community-5.1.15_alpha-r90.ebuild 2024 SHA256 da0f5f30084993559b2b8a75007757cd84b6c3fc20cac7129f0c43a8380232ec mysql-community-5.1.15_alpha-r90.ebuild 2024 -EBUILD mysql-community-5.1.15_alpha20061231-r60.ebuild 2182 RMD160 580072e21c2c5274a957c9bf0a811b2954c26a1e SHA1 e7e0e4986099bfa80f96fdbd2319291683aa09b3 SHA256 d178d627c5743a684b781cda14323f1a48ab430ba5cf6b3c8e629e3ad6817598 -MD5 a8f50db7c447556b7cb83046f870adcb mysql-community-5.1.15_alpha20061231-r60.ebuild 2182 -RMD160 580072e21c2c5274a957c9bf0a811b2954c26a1e mysql-community-5.1.15_alpha20061231-r60.ebuild 2182 -SHA256 d178d627c5743a684b781cda14323f1a48ab430ba5cf6b3c8e629e3ad6817598 mysql-community-5.1.15_alpha20061231-r60.ebuild 2182 -MISC ChangeLog 2231 RMD160 45fc9fd1d74db8672bf1d8e81868ac7144dd813a SHA1 bd2fa8c8f4a04c3288efe6a35ee092ea059d6402 SHA256 8d455d41da456259fd5cf398238e8613eda0a7bf2554ad68dbf2de6350825a12 -MD5 65bc7de563a263112d92604193f232cc ChangeLog 2231 -RMD160 45fc9fd1d74db8672bf1d8e81868ac7144dd813a ChangeLog 2231 -SHA256 8d455d41da456259fd5cf398238e8613eda0a7bf2554ad68dbf2de6350825a12 ChangeLog 2231 +EBUILD mysql-community-5.1.15_alpha20061231-r61.ebuild 2182 RMD160 a21124497800f8bacbb4ce421987502bfc8a759e SHA1 8e7d0e93f19cbc934d9d7eae0a59b6545fff6b32 SHA256 a400e8c02aafc1e4cad2101d03edeff0feed7a20b0fe3221bd3ba351bd717429 +MD5 dd656df147d70d505475a9a8d966880f mysql-community-5.1.15_alpha20061231-r61.ebuild 2182 +RMD160 a21124497800f8bacbb4ce421987502bfc8a759e mysql-community-5.1.15_alpha20061231-r61.ebuild 2182 +SHA256 a400e8c02aafc1e4cad2101d03edeff0feed7a20b0fe3221bd3ba351bd717429 mysql-community-5.1.15_alpha20061231-r61.ebuild 2182 +MISC ChangeLog 2865 RMD160 e9a340ddb851bc9731ae179da12ba21a6a49c21f SHA1 af2403c13734f48a0c438ee87289dd9ae81013bb SHA256 768ab026bf336802ab1c6b7f836ece9a7e7b96ff61c665a0a959f2afbfc42ca7 +MD5 844cf446f9ab3573d5492b5274c8944c ChangeLog 2865 +RMD160 e9a340ddb851bc9731ae179da12ba21a6a49c21f ChangeLog 2865 +SHA256 768ab026bf336802ab1c6b7f836ece9a7e7b96ff61c665a0a959f2afbfc42ca7 ChangeLog 2865 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7 metadata.xml 159 -MD5 3cfc1263a523bda78a374216cb41eedf files/digest-mysql-community-5.0.27 509 -RMD160 94ff2824ba8fce090473dd1f07ac47d6394617b9 files/digest-mysql-community-5.0.27 509 -SHA256 bd78d5ab74106899509fd476ea084a96c6ff9b5afff44d73294f690e22e1c900 files/digest-mysql-community-5.0.27 509 -MD5 5e58f7e8bff2d7f0a88aaba3edeffc0e files/digest-mysql-community-5.1.14_beta 777 -RMD160 b4ca036d8fd26fd1353e8546c89c39fdc20331a3 files/digest-mysql-community-5.1.14_beta 777 -SHA256 6aa25e07b581e0ddcfcd95075a68fe3ff0359fefe59402ee875e6830f02dba32 files/digest-mysql-community-5.1.14_beta 777 +MD5 3cfc1263a523bda78a374216cb41eedf files/digest-mysql-community-5.0.27-r1 509 +RMD160 94ff2824ba8fce090473dd1f07ac47d6394617b9 files/digest-mysql-community-5.0.27-r1 509 +SHA256 bd78d5ab74106899509fd476ea084a96c6ff9b5afff44d73294f690e22e1c900 files/digest-mysql-community-5.0.27-r1 509 +MD5 5e58f7e8bff2d7f0a88aaba3edeffc0e files/digest-mysql-community-5.1.14_beta-r1 777 +RMD160 b4ca036d8fd26fd1353e8546c89c39fdc20331a3 files/digest-mysql-community-5.1.14_beta-r1 777 +SHA256 6aa25e07b581e0ddcfcd95075a68fe3ff0359fefe59402ee875e6830f02dba32 files/digest-mysql-community-5.1.14_beta-r1 777 MD5 751d62dcf0ca2b84a6955b688c65ed5d files/digest-mysql-community-5.1.15_alpha-r90 518 RMD160 f9c5ae70209420f3088c279f8713c975499080b3 files/digest-mysql-community-5.1.15_alpha-r90 518 SHA256 b4241d2de5d023b660dfd2aba49e80393c5fef73a55c52c6e24d55f203805ff0 files/digest-mysql-community-5.1.15_alpha-r90 518 -MD5 d4c2c60cfdc3d387a1357872a3a7e864 files/digest-mysql-community-5.1.15_alpha20061231-r60 801 -RMD160 ce8a90a173cc72f69646282dd86350e4a0016dd9 files/digest-mysql-community-5.1.15_alpha20061231-r60 801 -SHA256 f58d7c85e2d6ed76103bc927827d3860ed6e2031986d4d4ddf506fd9fec9aa6b files/digest-mysql-community-5.1.15_alpha20061231-r60 801 +MD5 d4c2c60cfdc3d387a1357872a3a7e864 files/digest-mysql-community-5.1.15_alpha20061231-r61 801 +RMD160 ce8a90a173cc72f69646282dd86350e4a0016dd9 files/digest-mysql-community-5.1.15_alpha20061231-r61 801 +SHA256 f58d7c85e2d6ed76103bc927827d3860ed6e2031986d4d4ddf506fd9fec9aa6b files/digest-mysql-community-5.1.15_alpha20061231-r61 801 diff --git a/dev-db/mysql-community/files/digest-mysql-community-5.0.27 b/dev-db/mysql-community/files/digest-mysql-community-5.0.27 deleted file mode 100644 index 3af7e02397c5..000000000000 --- a/dev-db/mysql-community/files/digest-mysql-community-5.0.27 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 584d423440a9d9c859678e3d4f2690b3 mysql-5.0.27.tar.gz 25867740 -RMD160 3de75b959d04e002b2e4cfe322abdb48bf2f80fd mysql-5.0.27.tar.gz 25867740 -SHA256 08dc9a7b4adb766b2fb8390804147822f1772aa4bd2e06ca7764bc85010c73a7 mysql-5.0.27.tar.gz 25867740 -MD5 444e5ecfccf6d2123fbfbda7f7ba2b83 mysql-extras-20070105.tar.bz2 50005 -RMD160 abf1f8ebab8ecdfdb5ebe9ca55076f39ab492acb mysql-extras-20070105.tar.bz2 50005 -SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 mysql-extras-20070105.tar.bz2 50005 diff --git a/dev-db/mysql-community/files/digest-mysql-community-5.1.14_beta b/dev-db/mysql-community/files/digest-mysql-community-5.1.14_beta deleted file mode 100644 index a353e5f9cdf4..000000000000 --- a/dev-db/mysql-community/files/digest-mysql-community-5.1.14_beta +++ /dev/null @@ -1,9 +0,0 @@ -MD5 f02115e98c99558e062adcf2dc305283 mysql-5.1.14-beta.tar.gz 23640648 -RMD160 2acaa1393967a6fd57f9c37f3eef8dac62eb7138 mysql-5.1.14-beta.tar.gz 23640648 -SHA256 6b4990a784169560fd487d24c69efba1f73662500d0d3132375d8b5cd026bb67 mysql-5.1.14-beta.tar.gz 23640648 -MD5 444e5ecfccf6d2123fbfbda7f7ba2b83 mysql-extras-20070105.tar.bz2 50005 -RMD160 abf1f8ebab8ecdfdb5ebe9ca55076f39ab492acb mysql-extras-20070105.tar.bz2 50005 -SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 mysql-extras-20070105.tar.bz2 50005 -MD5 1dde707c3f86ecbb4567b8d5de603dc3 pbxt-0.9.73-beta.tar.gz 2706652 -RMD160 a4d974a8519b62868e948966910a84dbded05abe pbxt-0.9.73-beta.tar.gz 2706652 -SHA256 a2176d137138d33028c57499b74a79c5f12dcd958c3e7f1aad67bb4b7b24674d pbxt-0.9.73-beta.tar.gz 2706652 diff --git a/dev-db/mysql-community/files/digest-mysql-community-5.1.15_alpha20061231-r60 b/dev-db/mysql-community/files/digest-mysql-community-5.1.15_alpha20061231-r60 deleted file mode 100644 index bffd0e1d21e4..000000000000 --- a/dev-db/mysql-community/files/digest-mysql-community-5.1.15_alpha20061231-r60 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 b231ba7f535806f1cb8d792e4091f1b9 mysql-5.1.15-bk-20061231.tar.bz2 11999404 -RMD160 9a9929d6c2df4e128b3b5259b21fec5e04fe3181 mysql-5.1.15-bk-20061231.tar.bz2 11999404 -SHA256 1e4acc53175af275b48dbab33320d4841c9502c74f283e4f62215f5c2e602f15 mysql-5.1.15-bk-20061231.tar.bz2 11999404 -MD5 444e5ecfccf6d2123fbfbda7f7ba2b83 mysql-extras-20070105.tar.bz2 50005 -RMD160 abf1f8ebab8ecdfdb5ebe9ca55076f39ab492acb mysql-extras-20070105.tar.bz2 50005 -SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 mysql-extras-20070105.tar.bz2 50005 -MD5 1dde707c3f86ecbb4567b8d5de603dc3 pbxt-0.9.73-beta.tar.gz 2706652 -RMD160 a4d974a8519b62868e948966910a84dbded05abe pbxt-0.9.73-beta.tar.gz 2706652 -SHA256 a2176d137138d33028c57499b74a79c5f12dcd958c3e7f1aad67bb4b7b24674d pbxt-0.9.73-beta.tar.gz 2706652 diff --git a/dev-db/mysql-community/files/mysql.conf.d b/dev-db/mysql-community/files/mysql.conf.d deleted file mode 100644 index 15ff170cc98a..000000000000 --- a/dev-db/mysql-community/files/mysql.conf.d +++ /dev/null @@ -1,80 +0,0 @@ -# Here is where we define which server(s) to start. -# Additional parameters to be passed to mysqld at startup may be added here, -# which will override the ones in "my.cnf". -# -# Below are described some suggested parameters to use. -# The parameters not recognized will be passed through to the mysqld daemon -# directly! -# To avoid starting a server just comment it's definition. -# -# Last but not least, SPACES are NOT allowed inside the parameters! -# -# Parameter : description -# ----------------+----------------------------------------------------------- -# nice : integer [-20 .. 19 ] default 0 -# : change the priority of the server -20 (high) to 19 (low) -# : see "man nice 1" for description -# ----------------+----------------------------------------------------------- -# mycnf : string [full path to my.cnf] -# : specify the path to my.cnf file to be used -# ----------------+----------------------------------------------------------- -# startup_timeout : integer [seconds] default 15 -# : time to wait for mysqld up and running, after this it's -# : marked as failed -# ----------------+----------------------------------------------------------- -# -# Additional parameters -# Parameter : description -# ----------------+----------------------------------------------------------- -# server-id : integer [1 .. 255] -# : Uniquely identifies the server instance in the community -# : of replication partners. -# ----------------+----------------------------------------------------------- -# port : integer [1025 .. 65535] default 3306 -# : Port number to use for connection. -# : Looses any meaning if skip-networking is set. -# ----------------+----------------------------------------------------------- -# skip-networking : NULL -# : Don't allow connection through TCP/IP. -# ----------------+----------------------------------------------------------- -# log-bin : string [name of the binlog files] -# : Log update queries in binary format. Optional (but -# : strongly recommended to avoid replication problems if -# : server's hostname changes) argument should be the chosen -# : location for the binary log files. -# ----------------+----------------------------------------------------------- -# Additionally the following variables are recognized: -# -# Be more verbose, accepts values from 1 to 4 -#DEBUG=4 -# -# The default location for the "master" pid file -#MYSQL_GLOB_PID_FILE="/var/run/svc-started-mysqld" -# -# The timeout for a failed attempt to stop a server -#STOPTIMEOUT=120 -# - -# The parameters are passed in a bash array variable, -# the variable name is mysql_slot_0_[server-num] -# "server-num" is an optional number used to start multiple servers -# -# Examples: -# -# start a default server with default options: -#mysql_slot_0=() -# -# start MySQL reniced, overriding some start parameters -#mysql_slot_0=( -# "nice=-5" -# "server-id=123" -# "log-bin="myhost" -# "port=3307" -#) -# -# start another server, different my.cnf -#mysql_slot_0_1=( -# "mycnf=/home/test/my.cnf" -# "server-id=124" -#) -# diff --git a/dev-db/mysql-community/files/mysql.rc6 b/dev-db/mysql-community/files/mysql.rc6 deleted file mode 100644 index 7b23901c226f..000000000000 --- a/dev-db/mysql-community/files/mysql.rc6 +++ /dev/null @@ -1,357 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/files/mysql.rc6,v 1.1 2006/11/23 15:46:49 chtekk Exp $ - -# external binaries used: which, sed, tac - -# int in_list(char * elem, char * list) -function in_list() { - local elem=${1:-"none"} - local list=${2:-","} - - [[ "${list}" == "${list/,${elem},/}" ]] \ - && return 1 \ - || return 0 -} - -function wdebug() { - if [[ "${DEBUG}" -ge "${1}" ]] ; then - shift - echo "dbg: ${@}" - fi -} - -depend() { - use dns net localmount netmount nfsmount -} - -do_escape() { - # Ihatethisreallyverymuch - #echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|" - echo "$1" -} - -# int get_slot_config(srv_slot=0, srv_num) -get_slot_config() { - wdebug 4 ">>> get_slot_config()" - - local srv srv_slot srv_num - srv_slot="${1:-"0"}" - srv_num="${2}" - MY_SUFFIX="-${srv_slot}" - # srv=array(0 => [srv_slot], 1 => [srv_num] ) - srv=( ${srv_slot} ${srv_num} ) - - local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" - local conf_d_parameters="${!tmp_eval}" - if [[ "${srv_slot}" == "0" ]] ; then - MY_SUFFIX='' - # try some other default for the default server - [[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=${mysql_slot[@]} - fi - [[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=( ) - basedir="" datadir="" pidfile="" socket="" - CHROOT="" NICE="" STARTUPTIMEOUT=5 STOPTIMEOUT=120 - - wdebug 3 "srv ${srv[@]}" - wdebug 3 "srv_slot ${srv_slot}" - wdebug 3 "srv_num ${srv_num}" - wdebug 3 "tmp_eval ${tmp_eval}" - wdebug 3 "conf_d_parameters ${conf_d_parameters[@]}" - wdebug 3 "MY_SUFFIX ${MY_SUFFIX}" - - local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" - local conf_d_parameters="${!tmp_eval}" - # collations need to be defined *after* the character sets, - # so we will duplicate them - local collations="" - [[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters='' - - MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf" - # summa of unmanaged parameters - # some parameters may be present multiple times - unmanagedparams="" - - # grab the parameters from conf.d/mysql definition - for my_default in ${conf_d_parameters[*]} ; do - case "${my_default}" in - nice=*) - NICE="${my_default#nice=}" - nice -n $NICE ls /tmp &>/dev/null || NICE="" - ;; - mycnf=*) MY_CNF="${my_default#mycnf=}" ;; - startup_timeout=*) - STARTUPTIMEOUT="${my_default#startup_timeout=}" ;; - basedir=*) basedir="${my_default#basedir=}" ;; - datadir=*) datadir="${my_default#datadir=}" ;; - pid-file=*) pidfile="${my_default#pid-file=}" ;; - socket=*) socket="${my_default#socket=}" ;; - *collation*=) - collations="${collations} --$( do_escape "${my_default}" )" - ;; - *=*) - # list of parameters we already have - # prepend "--" because my_print_defaults do it - unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )" - ;; - *) - unmanagedparams="${unmanagedparams} --${my_default}" - ;; - esac - done - - if [[ ! -r "${MY_CNF}" ]] ; then - ewarn "Cannot access ${MY_CNF} !" - MY_CNF="" - my_defaults="" - else - local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)" - if [[ ! -x "${my_print_defaults}" ]] ; then - eerror "my_print_defaults NOT found or not executable" - my_defaults="" - else - my_defaults=$( ${my_print_defaults} \ - --loose-verbose \ - --config-file="${MY_CNF}" \ - mysqld server ) - fi - fi - - # grab needed parameters from my.cnf, don't override the ones from - # conf.d/mysql - for my_default in ${my_defaults} ; do - case "${my_default}" in - --basedir=*) - [[ -z "${basedir}" ]] && basedir="${my_default#--basedir=}" ;; - --datadir=*) - [[ -z "${datadir}" ]] && datadir="${my_default#--datadir=}" ;; - --pid-file=*) - [[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;; - --socket=*) - [[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;; - --*collation*=) - # the order is inversed because we want the conf.d ones overriden - collations="$( do_escape "${my_default}" ) ${collations}" - ;; - esac - done - - # some parameters - basedir="${basedir:-"/usr"}" - datadir="${datadir:-"/var/lib/mysql${MY_SUFFIX}"}" - pidfile="${pidfile:-"/var/run/mysqld/mysqld${MY_SUFFIX}.pid"}" - socket="${socket:-"/var/run/mysqld/mysqld${MY_SUFFIX}.sock"}" - unmanagedparams="${unmanagedparams} ${collations}" - - wdebug 3 "chroot dir => ${CHROOT}" - wdebug 3 "niceness => ${NICE}" - wdebug 3 "basedir => ${basedir}" - wdebug 3 "datadir => ${datadir}" - wdebug 3 "pidfile => ${pidfile}" - wdebug 3 "socket => ${socket}" - wdebug 3 "Unamanged => ${unmanagedparams}" - - # extension for sleep tenth of seconds, not very portable so check it before - if sleep 0.01 ; then - STARTUPTIMEOUT=$(( STARTUPTIMEOUT * 10 )) - STOPTIMEOUT=$(( STOPTIMEOUT * 10 )) - TIMEUNIT=0.1 - else - TIMEUNIT=1 - fi - - # push these out to the script - export MY_SUFFIX NICE MY_CNF pidfile datadir basedir socket CHROOT - export unmanagedparams STARTUPTIMEOUT STOPTIMEOUT TIMEUNIT - wdebug 4 "<<< get_slot_config() ok" - return 0 -} - -checkconfig() { - wdebug 4 ">>> checkconfig(\"${1}\")" - local datadir="${1}" pidfile="${2}" socket="${3}" - - if [[ -n "${NOCHECK}" ]] ; then - rm -f "${pidfile}" "${socket}" - return 0 - fi - - if [[ ! -d "${datadir}" ]] ; then - eerror "MySQL datadir is empty or invalid" - eerror "Please check your my.cnf : ${MY_CNF}" - wdebug 4 "<<< checkconfig() KO" - return 1 - fi - - if [[ ! -d "${datadir}/mysql" ]] ; then - eerror "You don't appear to have the mysql database installed yet." - eerror "Please run /usr/bin/mysql_install_db to have this done..." - wdebug 4 "<<< checkconfig() KO" - return 1 - fi - - if [[ -f "${pidfile}" ]] ; then - kill -15 $(< ${pidfile}) 2>/dev/null - if [[ $? -eq 0 ]] ; then - # the process exist, we have a problem - eerror "\"${pidfile}\" is still present and the process is running." - eerror "Please stop it \"kill $(< ${pidfile})\" maybe ?" - wdebug 4 "<<< checkconfig() KO" - return 1 - else - rm -f "${pidfile}" - fi - fi - - if [[ -S "${socket}" ]] ; then - ewarn "Strange, the socket file already exist in \"${socket}\"" - ewarn "it will be removed now and re-created by the MySQL server" - ewarn "BUT please make your checks." - rm -f "${socket}" - fi - - wdebug 4 "<<< checkconfig() ok" - return 0 -} - -start() { - wdebug 4 ">>> start()" - - MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"} - # servers are defined in /etc/conf.d/mysql - local serverlist=${!mysql_slot_*} - # provide default for empty conf.d/mysql - if [[ -z "${serverlist}" ]] ; then - serverlist=0 - export mysql_slot_0=( ) - fi - local retstatus timeout - local globretstatus=1 - local srv_slot srv_num - # server MUST NOT share same location for these - local pidfilelist=',' datadirlist=',' socketlist=',' - local ssd_thing=1 - local mysqld_thing tmpnice - - ebegin "Starting ${myservice}" - # try to start each server - for srv in ${serverlist[*]} ; do - - srv_slot="${srv#mysql_slot_}" - if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then - srv_num='' - else - srv_num="${srv_slot#*_}" - fi - srv_slot="${srv_slot%%_*}" - - retstatus=0 - get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1 - - # checks - if ! checkconfig "${datadir}" "${pidfile}" "${socket}" ; then - retstatus=2 ; continue - fi - if in_list "${pidfile}" "${pidfilelist}" ; then - eerror "Sorry, won't start with same pid-file: ${pidfile}" - retstatus=3 ; continue - fi - if in_list "${datadir}" "${datadirlist}" ; then - eerror "Sorry, won't start with same datadir: ${datadir}" - retstatus=4 ; continue - fi - if in_list "${socket}" "${socketlist}" ; then - eerror "Sorry, won't start with same socket: ${socket}" - retstatus=5 ; continue - fi - - einfo "Starting ${myservice} (${MY_CNF})" - - mysqld_thing="${MY_CNF:+"--defaults-file="}${MY_CNF}" - mysqld_thing="${mysqld_thing} ${unmanagedparams}" - mysqld_thing="${mysqld_thing} --basedir=${basedir}" - mysqld_thing="${mysqld_thing} --datadir=${datadir}" - mysqld_thing="${mysqld_thing} --pid-file=${pidfile}" - mysqld_thing="${mysqld_thing} --socket=${socket}" - - wdebug 2 "starting mysqld with: ${mysqld_thing}" - - if [[ ${ssd_thing} -eq 1 ]] ; then - tmpnice="${NICE:+"--nicelevel "}${NICE}" - start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --start \ - --background ${tmpnice} --pidfile ${pidfile} \ - --exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing} - retstatus=$? - else - tmpnice="${NICE:+"nice -n "}${NICE}" - ${tmpnice} ${basedir}/sbin/mysqld${MY_SUFFIX} ${mysqld_thing} & - retstatus=0 - fi - - # only the first run is done by start-stop-daemon - ssd_thing="" - - # wait for socket creation - wdebug 1 - while ! [[ -S "${socket}" || "${STARTUPTIMEOUT}" -lt 1 || "${retstatus}" -ne 0 ]] ; do - STARTUPTIMEOUT=$(( STARTUPTIMEOUT - 1 )) - [[ ${DEBUG} -ge 1 ]] && echo -n "${STARTUPTIMEOUT}," - sleep ${TIMEUNIT} - done - wdebug 1 "" - if [[ ! -S "${socket}" ]] ; then - eerror "MySQL${MY_SUFFIX} NOT started (${retstatus})" - retstatus=1 - else - globretstatus=0 - pidfilelist="${pidfilelist}${pidfile}," - datadirlist="${datadirlist}${datadir}," - socketlist="${socketlist}${socket}," - echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}" - fi - done - # successfull if at least one mysqld started - wdebug 4 "<<< start()" - eend $globretstatus -} - -stop() { - get_slot_config &> /dev/null - MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"} - local runwhat pidfile shutdown_elem - local PID cnt timeout=${STOPTIMEOUT:-"120"} - local retstatus=0 - local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )" - - ebegin "Stopping ${myservice}" - wdebug 5 "MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}" - wdebug 5 "shutdown_list: ${shutdown_list}" - for shutdown_elem in ${shutdown_list} ; do - runwhat=${shutdown_elem%%=*} - pidfile=${shutdown_elem#*=} - timeout=${STOPTIMEOUT:-"120"} - PID=$(< "${pidfile}" ) - wdebug 3 "runwhat ${runwhat}" - wdebug 3 "pidfile ${pidfile}" - wdebug 3 "timeout ${timeout}" - wdebug 3 "PID ${PID}" - - einfo "Stopping mysqld (${runwhat})" - - start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --stop --pidfile "${pidfile}" & - wdebug 1 "" - while [[ -n "$PID" ]] \ - && $( ps -Ao pid | grep -q "^ *$PID$" ) \ - && [[ "${timeout}" -ge 1 ]] - do - timeout=$(($timeout - 1)) - [[ ${DEBUG} -ge 1 ]] && echo -n "$(( $STOPTIMEOUT - $timeout ))," - sleep ${TIMEUNIT} - done - [[ "${timeout}" -lt 1 ]] && retstatus=1 - done - sleep ${TIMEUNIT} - [[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE" - eend ${retstatus} -} diff --git a/dev-db/mysql-community/files/mysqlmanager.conf.d b/dev-db/mysql-community/files/mysqlmanager.conf.d deleted file mode 100644 index 8666f71596cc..000000000000 --- a/dev-db/mysql-community/files/mysqlmanager.conf.d +++ /dev/null @@ -1,28 +0,0 @@ -# Here is where we define which server(s) to start. -# Additional parameters to be passed to mysqlmanager at startup may be added here, -# which will override the ones in "my.cnf". -# -# To avoid starting a server just comment it's definition -# here or it will rant (no default start). -# Last but not least, spaces are NOT allowed inside the parameters! -# -# Below are described some suggested parameters to use. -# The parameters not recognized will be passed through to the mysqlmanager directly. -# -# Parameter : description - -# ----------------+----------------------------------------------------------- -# mycnf : string [full path to my.cnf] -# : specify the path to my.cnf file to be used -# : may contain a [manager] section -# ----------------+----------------------------------------------------------- -# -# Basic default -# -#mysqlmanager_slot_0=() -# -# Start MySQL 5.0.X overriding the my.cnf path -#mysqlmanager_slot_500=( -# "mycnf=/home/test/my.cnf" -#) -# diff --git a/dev-db/mysql-community/files/mysqlmanager.rc6 b/dev-db/mysql-community/files/mysqlmanager.rc6 deleted file mode 100644 index 894fc0b5887e..000000000000 --- a/dev-db/mysql-community/files/mysqlmanager.rc6 +++ /dev/null @@ -1,230 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/files/mysqlmanager.rc6,v 1.1 2006/11/23 13:58:06 vivo Exp $ - -# external binaries used: which, sed, tac - -depend() { - use dns net localmount netmount nfsmount - #provide mysql -} - -# int in_list(char * elem, char * list) -function in_list() { - local elem=${1:-"none"} - local list=${2:-","} - - [[ "${list}" == "${list/,${elem},/}" ]] \ - && return 1 \ - || return 0 -} - -do_escape() { - # Ihatethisreallyverymuch - #echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|" - echo "$1" -} - -# int get_slot_config(srv_slot=0, srv_num) -get_slot_config() { - [[ ${DEBUG} -ge 4 ]] && einfo ">>> get_slot_config(\"${1}\", \"${2}\")" - - srv_slot="${1:-"0"}" - srv_num="${2}" - MY_SUFFIX="-${srv_slot}" - [[ "${MY_SUFFIX}" == '-0' ]] && MY_SUFFIX='' - - basedir="" pidfile="" socket="" - - local tmp_eval="mysqlmanager_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" - local conf_d_parameters="${!tmp_eval}" - [[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters='' - - MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf" - # summa of unmanaged parameters - # some parameters may be present multiple times - unmanagedparams="" - - # grab the parameters from conf.d/mysql definition - for my_default in ${conf_d_parameters[*]} ; do - case "${my_default}" in - mycnf=*) MY_CNF="${my_default#mycnf=}" ;; - basedir=*) basedir="${my_default#basedir=}" ;; - pid-file=*) pidfile="${my_default#pid-file=}" ;; - socket=*) socket="${my_default#socket=}" ;; - *=*) - # list of parameters we already have - # prepend "--" because my_print_defaults do it - unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )" - ;; - *) - unmanagedparams="${unmanagedparams} --${my_default}" - ;; - esac - done - - if [[ ! -r "${MY_CNF}" ]] ; then - ewarn "Cannot access ${MY_CNF} !" - MY_CNF="" - my_defaults="" - else - local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)" - if [[ ! -x "${my_print_defaults}" ]] ; then - eerror "my_print_defaults NOT found or not executable" - my_defaults="" - else - my_defaults=$( ${my_print_defaults} \ - --loose-verbose \ - --config-file="${MY_CNF}" \ - manager ) - fi - fi - - # grab needed parameters from my.cnf, don't override the ones from - # conf.d/mysql - for my_default in ${my_defaults} ; do - case "${my_default}" in - --pid-file=*) - [[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;; - --socket=*) - [[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;; - esac - done - - # still empty, I'm in doubt if assign a default or break, will see - basedir="${basedir:-"/usr"}" - pidfile="${pidfile:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.pid"}" - socket="${socket:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.sock"}" - - if [[ ${DEBUG} -ge 3 ]] ; then - einfo "basedir => ${basedir}" - einfo "pidfile => ${pidfile}" - einfo "socket => ${socket}" - einfo "Unamanged => ${unmanagedparams}" - fi - - # push these out to the script - export MY_SUFFIX MY_CNF pidfile basedir socket - export unmanagedparams - [[ ${DEBUG} -ge 4 ]] && einfo "<<< get_slot_config() ok" - return 0 -} - -start() { - [[ ${DEBUG} -ge 4 ]] && einfo ">>> start()" - MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"} - # servers are defined in /etc/conf.d/mysql - local serverlist=${!mysqlmanager_slot_*} - # provide default for empty conf.d/mysql - if [[ -z "${serverlist}" ]] ; then - serverlist=0 - export mysqlmanager_slot_0=() - fi - local retstatus timeout - local globretstatus=1 - local srv_slot srv_num - # server MUST NOT share same location for these - local pidfilelist=',' socketlist=',' - - # additional security - rm -f "${MYSQL_GLOB_PID_FILE}" ; touch "${MYSQL_GLOB_PID_FILE}" - if [[ $? -ne 0 ]] ; then - eerror "cannot create MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}" - [[ ${DEBUG} -ge 4 ]] && einfo "<<< start() KO" - return 1 - fi - - ebegin - # try to start each server - for srv in ${serverlist[*]} ; do - einfo "working on ${srv}" - - srv_slot="${srv#mysqlmanager_slot_}" - if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then - srv_num='' - else - srv_num="${srv_slot#*_}" - fi - srv_slot="${srv_slot%%_*}" - - retstatus=0 - get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1 - - # timeout (seconds) before declaring the startup failed - - # pre_run checks - if [[ "$retstatus" -eq 0 ]] ; then - if in_list "${pidfile}" "${pidfilelist}" ; then - retstatus=3 - eerror "Sorry, won't start with same pid-file: ${pidfile}" - fi - if in_list "${socket}" "${socketlist}" ; then - retstatus=5 - eerror "Sorry, won't start with same socket: ${socket}" - fi - fi - - if [[ $retstatus -eq 0 ]] ; then - # additional security - rm -f ${pidfile} ${socket} - einfo "Starting mysqlmanager${MY_SUFFIX:+"_"}${srv_slot}${srv_num:+"_"}${srv_num} (${MY_CNF})" - - [[ ${DEBUG} -ge 2 ]] && echo "starting mysqlmanager with: "${basedir}/sbin/mysqlmanager${MY_SUFFIX} ${unmanagedparams} --pid-file=${pidfile} --socket=${socket} - - start-stop-daemon --quiet --start --background \ - --pidfile "${pidfile}" \ - --exec ${basedir}/sbin/mysqlmanager${MY_SUFFIX} \ - -- \ - ${MY_CNF:+"--defaults-file="}${MY_CNF} \ - ${unmanagedparams} \ - --pid-file=${pidfile} \ - --socket=${socket} - - retstatus=$? - - if [[ "${retstatus}" -eq 0 ]] ; then - pidfilelist="${pidfilelist}${pidfile}," - socketlist="${socketlist}${socket}," - globretstatus=0 - echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}" - fi - fi - done - # successfull if at least one mysqlmanager started - [[ ${DEBUG} -ge 4 ]] && einfo "<<< start()" - eend $globretstatus -} - -stop () { - MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"} - local runwhat pidfile shutdown_elem - local PID cnt timeout - local retstatus=0 - local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )" - - # shutdown in reverse order - ebegin - for shutdown_elem in $shutdown_list; do - runwhat=${shutdown_elem%%=*} - pidfile=${shutdown_elem#*=} - timeout=${STOPTIMEOUT:-"10"} - - einfo "Stopping mysqlmanager (${runwhat})" - - PID=$(cat "${pidfile}" 2>/dev/null) - start-stop-daemon --stop --quiet --pidfile="${pidfile}" - [[ ${DEBUG} -ge 1 ]] && echo "" - while [[ -n "$PID" && $( kill -0 $PID 2>/dev/null ) && "${timeout}" -ge 1 ]] ; do - timeout=$(($timeout - 1)) - [[ ${DEBUG} -ge 1 ]] && echo -n $(( $STOPTIMEOUT - $timeout )) - sleep 1 - done - if [[ "${timeout}" -lt 1 ]] ; then - retstatus=$(( $retstatus + 1 )) - fi - done - - [[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE" - eend $retstatus -} diff --git a/dev-db/mysql-community/mysql-community-5.0.27.ebuild b/dev-db/mysql-community/mysql-community-5.0.27.ebuild deleted file mode 100644 index 524e5c856b28..000000000000 --- a/dev-db/mysql-community/mysql-community-5.0.27.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.0.27.ebuild,v 1.4 2007/01/05 00:20:07 vivo Exp $ - -MY_EXTRAS_VER="20070105" -SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" - -inherit mysql - -#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" - -src_test() { - - make check || die "make check failed" - if ! useq "minimal" ; then - cd "${S}" - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus - local t - addpredict /this-dir-does-not-exist/t9.MYI - - # mysqladmin start before dir creation - mkdir mysql-test/var{,/log} - - if [[ ${UID} -eq 0 ]] ; then - mysql_disable_test "im_daemon_life_cycle" "fail as root" - mysql_disable_test "im_life_cycle" "fail as root" - mysql_disable_test "im_options_set" "fail as root" - mysql_disable_test "im_options_unset" "fail as root" - mysql_disable_test "im_utils" "fail as root" - fi - - for t in \ - loaddata_autocom_ndb \ - ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \ - ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \ - ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \ - ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \ - ndb_{restore,subquery,transaction,trigger,truncate,types,update} \ - ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb - do - mysql_disable_test "${t}" "fail in sandbox" - done - - useq "extraengine" && mysql_disable_test "federated" "fail with extraengine" - - make test-force-pl - retstatus=$? - - # Just to be sure ;) - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - [[ $retstatus -eq 0 ]] || die "make test failed" - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild b/dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild deleted file mode 100644 index d458d9da12da..000000000000 --- a/dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild,v 1.3 2007/01/05 00:20:07 vivo Exp $ - -MY_EXTRAS_VER="20070105" -SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" -PBXT_VERSION="0.9.73-beta" - -inherit mysql - -#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" - -src_test() { - - make check || die "make check failed" - if ! useq "minimal" ; then - cd "${S}/mysql-test" - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus - local t - local testopts="--force" - - # sandbox make ndbd zombie - hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb" - - addpredict /this-dir-does-not-exist/t9.MYI - - # mysqladmin start before dir creation - mkdir ${S}/mysql-test/var{,/log} - - if [[ ${UID} -eq 0 ]] ; then - mysql_disable_test "im_cmd_line" "fail as root" - mysql_disable_test "im_daemon_life_cycle" "fail as root" - mysql_disable_test "im_instance_conf" "fail as root" - mysql_disable_test "im_life_cycle" "fail as root" - mysql_disable_test "im_options" "fail as root" - mysql_disable_test "im_utils" "fail as root" - mysql_disable_test "trigger" "fail as root" - fi - - useq "extraengine" && mysql_disable_test "federated" "fail with extraengine" - - mysql_disable_test "view" "FIXME: fail because now we are in year 2007" - - # from Makefile.am: - retstatus=1 - ./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=mixed \ - && ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=row \ - && ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=mixed \ - && ./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=row \ - && retstatus=0 - - # Just to be sure ;) - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - [[ $retstatus -eq 0 ]] || die "make test failed" - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql-community/mysql-community-5.1.15_alpha20061231-r60.ebuild b/dev-db/mysql-community/mysql-community-5.1.15_alpha20061231-r60.ebuild deleted file mode 100644 index d91ae7eb2fae..000000000000 --- a/dev-db/mysql-community/mysql-community-5.1.15_alpha20061231-r60.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.1.15_alpha20061231-r60.ebuild,v 1.2 2007/01/05 00:20:07 vivo Exp $ - -MY_EXTRAS_VER="latest" -SERVER_URI="mirror://gentoo/MySQL-${PV%.*}/mysql-${PV//_alpha/-bk-}.tar.bz2" -PBXT_VERSION="0.9.73-beta" - -inherit mysql - -#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" - -src_test() { - - make check || die "make check failed" - if ! useq "minimal" ; then - cd "${S}/mysql-test" - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus - local t - local testopts="--force" - - # sandbox make ndbd zombie - hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb" - - addpredict /this-dir-does-not-exist/t9.MYI - - # mysqladmin start before dir creation - mkdir ${S}/mysql-test/var{,/log} - - if [[ ${UID} -eq 0 ]] ; then - mysql_disable_test "im_cmd_line" "fail as root" - mysql_disable_test "im_daemon_life_cycle" "fail as root" - mysql_disable_test "im_instance_conf" "fail as root" - mysql_disable_test "im_life_cycle" "fail as root" - mysql_disable_test "im_options" "fail as root" - mysql_disable_test "im_utils" "fail as root" - mysql_disable_test "trigger" "fail as root" - fi - - useq "extraengine" && mysql_disable_test "federated" "fail with extraengine" - - mysql_disable_test "view" "Already fixed: fail because now we are in year 2007" - - # from Makefile.am: - retstatus=1 - ./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=mixed \ - && ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=row \ - && ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=mixed \ - && ./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=row \ - && retstatus=0 - - # Just to be sure ;) - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - [[ $retstatus -eq 0 ]] || die "make test failed" - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index bcf1f65590df..caa7b917a8ea 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -14,26 +14,10 @@ AUX my.cnf-4.1 4212 RMD160 86a7b4aaf70b4a4321419a7616c6f8276a1530a1 SHA1 5c68c2c MD5 a81fb39bb23727683a8d8a717cb74a9d files/my.cnf-4.1 4212 RMD160 86a7b4aaf70b4a4321419a7616c6f8276a1530a1 files/my.cnf-4.1 4212 SHA256 7460667229e18b1f0e446105431e7ae31177e3e7774ff6736eba8b057cd3fc80 files/my.cnf-4.1 4212 -AUX mysql.conf.d 3273 RMD160 a2661c832c1091b2d05e599fc58cce6f686c7f31 SHA1 64e9bb80099bf6e14a07764fcb69bb02682aee0b SHA256 ee049781a3885305ce9999371198ff54f97fee4d2ad0814ba3aa3a03abc2724c -MD5 092bb6cad90a875da8899e104304c969 files/mysql.conf.d 3273 -RMD160 a2661c832c1091b2d05e599fc58cce6f686c7f31 files/mysql.conf.d 3273 -SHA256 ee049781a3885305ce9999371198ff54f97fee4d2ad0814ba3aa3a03abc2724c files/mysql.conf.d 3273 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 files/mysql.init 886 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 files/mysql.init 886 -AUX mysql.rc6 10624 RMD160 29e5ff0a795fe5788b39a1cb27ed297db37a4ad0 SHA1 adabb3184ccf42d58ab25f63377d30e94adfb132 SHA256 f840b9718ac957fd513021b0bc5b22d067e221f96cd9d797b94eae0c03c3c236 -MD5 f1adf5702b9517ad43157c7291fda3e8 files/mysql.rc6 10624 -RMD160 29e5ff0a795fe5788b39a1cb27ed297db37a4ad0 files/mysql.rc6 10624 -SHA256 f840b9718ac957fd513021b0bc5b22d067e221f96cd9d797b94eae0c03c3c236 files/mysql.rc6 10624 -AUX mysqlmanager.conf.d 1009 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 SHA1 0d82531df24ba4f0d957176b6fa0076a1cae0356 SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7 -MD5 c94178cadec3be56c4e6c7ec9812cfcf files/mysqlmanager.conf.d 1009 -RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 files/mysqlmanager.conf.d 1009 -SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7 files/mysqlmanager.conf.d 1009 -AUX mysqlmanager.rc6 6617 RMD160 a1306938ff11e18a9852a2546aaec34490d8a5e9 SHA1 62033f95762be615b451ffa89b5e1538aed82392 SHA256 bf83fdd06ca9615545e6aafd7a3abb06cac92a5854284bdde337f77d98329e55 -MD5 44dff672094af9d6c679a6aa8d9411b3 files/mysqlmanager.rc6 6617 -RMD160 a1306938ff11e18a9852a2546aaec34490d8a5e9 files/mysqlmanager.rc6 6617 -SHA256 bf83fdd06ca9615545e6aafd7a3abb06cac92a5854284bdde337f77d98329e55 files/mysqlmanager.rc6 6617 DIST mysql-3.23.58.tar.gz 12039843 RMD160 b7d436ac7aaa9238e724bf3c62c5f837bef676b6 SHA1 f3383e41e8926c040a295173881414a1e96e0266 SHA256 8dcc6a613820701221b787419c32c1c717562194cfd296187da0e87454252acc DIST mysql-4.0.25.tar.gz 11159288 RMD160 9c32ff5b7332712929eb2eb8eb58ae1f4be7ad46 SHA1 65315c7659c75fcc9f3d9f749dbed26581f6da9c SHA256 5cf5e35e4c887cc6bee19881566afb07fcf5ef711ddfc79f7b9d2c4e00c8412b DIST mysql-4.0.27.tar.gz 11152643 RMD160 00cf895eab192e3e0ab526587ccab3e81c6c9070 SHA1 9cce3b92c47d17bf58ec6cdefebfdf953b5ce2c4 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f @@ -53,38 +37,38 @@ EBUILD mysql-4.0.25-r2.ebuild 1052 RMD160 1244b3d41c7d75ab362ab7f0cd2879ee526ec1 MD5 38fe984720492709610f2553586d595c mysql-4.0.25-r2.ebuild 1052 RMD160 1244b3d41c7d75ab362ab7f0cd2879ee526ec1f9 mysql-4.0.25-r2.ebuild 1052 SHA256 35c79833731375511354d6a4ced90fee73082ca5e7066a7880ef6d2212c2e1a6 mysql-4.0.25-r2.ebuild 1052 -EBUILD mysql-4.0.27.ebuild 1042 RMD160 6908f802f64cbeff71142a947eeb7e11f4005b7f SHA1 a5982575cff195247b44e2be7770ae31d030f144 SHA256 fff9b9bc18e6e653131dbee71498c86b12f40005a33bbcc7fc856689f2b2efe4 -MD5 e64fd248150de4d007c471afafa44606 mysql-4.0.27.ebuild 1042 -RMD160 6908f802f64cbeff71142a947eeb7e11f4005b7f mysql-4.0.27.ebuild 1042 -SHA256 fff9b9bc18e6e653131dbee71498c86b12f40005a33bbcc7fc856689f2b2efe4 mysql-4.0.27.ebuild 1042 +EBUILD mysql-4.0.27-r1.ebuild 1044 RMD160 ac142e15b7b65c00995fe4a3dce097add1d7e0cd SHA1 b8face83d2621bca58b9786abdbe1f11250e2e0a SHA256 6c9db6b52c76736933eed7dd4570c6e99be74d4b57742f5279942705d7addf82 +MD5 ab1cbf5fbd62c410f80ac9375c05d179 mysql-4.0.27-r1.ebuild 1044 +RMD160 ac142e15b7b65c00995fe4a3dce097add1d7e0cd mysql-4.0.27-r1.ebuild 1044 +SHA256 6c9db6b52c76736933eed7dd4570c6e99be74d4b57742f5279942705d7addf82 mysql-4.0.27-r1.ebuild 1044 EBUILD mysql-4.1.21.ebuild 1051 RMD160 af944b29fa2e722f4e5355f54aab9dc98205c79e SHA1 fa35f4328f51dcab384a568d670c57ee864d3c64 SHA256 5225568a5129a619719a43d5b3ed41d8a3cc054250d05531d4fcce567f81d748 MD5 215e7b4ad72d2bb18bb30205aa2a7309 mysql-4.1.21.ebuild 1051 RMD160 af944b29fa2e722f4e5355f54aab9dc98205c79e mysql-4.1.21.ebuild 1051 SHA256 5225568a5129a619719a43d5b3ed41d8a3cc054250d05531d4fcce567f81d748 mysql-4.1.21.ebuild 1051 -EBUILD mysql-4.1.22.ebuild 1271 RMD160 9f2edb67469c13a29e55a17a1f6882c67650cacf SHA1 99bf639607b0915363a36ee42695461e7c645739 SHA256 4b6e1cf9f1bb09f26dd582016fbc183da6775db9496585d4d8d31d893cbd54a6 -MD5 d5d37082dc3ffa4ec0f5b0c8ce1db6a7 mysql-4.1.22.ebuild 1271 -RMD160 9f2edb67469c13a29e55a17a1f6882c67650cacf mysql-4.1.22.ebuild 1271 -SHA256 4b6e1cf9f1bb09f26dd582016fbc183da6775db9496585d4d8d31d893cbd54a6 mysql-4.1.22.ebuild 1271 -EBUILD mysql-4.1.23_alpha20070101-r60.ebuild 1180 RMD160 5a3205deeeb55bd7b272f735506eb8ef843969ce SHA1 ad0fd381921dd3fb9e62671d4ec2295c87b8a587 SHA256 0b97a5a4bf7cdec447801a64efdea070152407b97ec8557dcc588cf7942870b4 -MD5 80278e2dc718674b23083fd7fc06afad mysql-4.1.23_alpha20070101-r60.ebuild 1180 -RMD160 5a3205deeeb55bd7b272f735506eb8ef843969ce mysql-4.1.23_alpha20070101-r60.ebuild 1180 -SHA256 0b97a5a4bf7cdec447801a64efdea070152407b97ec8557dcc588cf7942870b4 mysql-4.1.23_alpha20070101-r60.ebuild 1180 -EBUILD mysql-5.0.26-r1.ebuild 1946 RMD160 8653e5a6d59d75c9d89b4e1221253b364469ae05 SHA1 a723bc521a43e01329fd335cd3cbdddda72142a2 SHA256 33b9c2b804954df600a7592f3e888ea5dee1df0233521fa84918cd98994f3cea -MD5 5d2805bc8626475098a13e5fd52bc4f0 mysql-5.0.26-r1.ebuild 1946 -RMD160 8653e5a6d59d75c9d89b4e1221253b364469ae05 mysql-5.0.26-r1.ebuild 1946 -SHA256 33b9c2b804954df600a7592f3e888ea5dee1df0233521fa84918cd98994f3cea mysql-5.0.26-r1.ebuild 1946 -EBUILD mysql-5.0.30.ebuild 1946 RMD160 7f6d723b0b65405180318fcbbdd5f0d85b988cca SHA1 3d57190ecded33ff0816cfd6b0f570b04cf1e4b7 SHA256 b84a8a3e01e2bc819d1c74be1ca57c135f89b59b36e764f08fb04c13d1ab0a13 -MD5 b91c0d3a55c68104492aeaa896e10265 mysql-5.0.30.ebuild 1946 -RMD160 7f6d723b0b65405180318fcbbdd5f0d85b988cca mysql-5.0.30.ebuild 1946 -SHA256 b84a8a3e01e2bc819d1c74be1ca57c135f89b59b36e764f08fb04c13d1ab0a13 mysql-5.0.30.ebuild 1946 -EBUILD mysql-5.0.34_alpha20070101-r60.ebuild 2508 RMD160 30e400e771319c5fc737c54530855c0fdbe4051f SHA1 07b4be407a00502be6db9341ef9e9d36da4aa37e SHA256 a808feca1c775f409f229f14135562146024add18afa71890b0c7dbfc49e0ee2 -MD5 12a87a30da1fc6dd07bf34a20d4fc445 mysql-5.0.34_alpha20070101-r60.ebuild 2508 -RMD160 30e400e771319c5fc737c54530855c0fdbe4051f mysql-5.0.34_alpha20070101-r60.ebuild 2508 -SHA256 a808feca1c775f409f229f14135562146024add18afa71890b0c7dbfc49e0ee2 mysql-5.0.34_alpha20070101-r60.ebuild 2508 -MISC ChangeLog 77364 RMD160 1b5cb8e1505bcdc4ea827a333878916a70765f68 SHA1 5040847e6008fb800387e441786a163c66e82fed SHA256 16f2048708870c7c2ee2a28adf9ac7f66133a7a4e95d6417ba90febba1fb80c3 -MD5 aa842dfb38d87abd2641d67d8d116b1e ChangeLog 77364 -RMD160 1b5cb8e1505bcdc4ea827a333878916a70765f68 ChangeLog 77364 -SHA256 16f2048708870c7c2ee2a28adf9ac7f66133a7a4e95d6417ba90febba1fb80c3 ChangeLog 77364 +EBUILD mysql-4.1.22-r1.ebuild 1274 RMD160 f2ef75a4ed0b4085377f51370d21b7e45e1ea055 SHA1 d8b983d8b13609c438a2d39e385aaed7d61a9602 SHA256 c7ee2210e51162573375b06535664d309490f08c4685a0826b50d0ca56063b79 +MD5 aeb9323fa432354480dc4254e19a03fe mysql-4.1.22-r1.ebuild 1274 +RMD160 f2ef75a4ed0b4085377f51370d21b7e45e1ea055 mysql-4.1.22-r1.ebuild 1274 +SHA256 c7ee2210e51162573375b06535664d309490f08c4685a0826b50d0ca56063b79 mysql-4.1.22-r1.ebuild 1274 +EBUILD mysql-4.1.23_alpha20070101-r61.ebuild 1180 RMD160 4b4326ec73b19f62d6fdd5fe03039265af7971df SHA1 d78989bf10186040193223c438e0fb6bc6d9c589 SHA256 0c11bf73ffb431ca18119cc302a0ca5b057045effc3b6eea758fa732b04e010b +MD5 f7decc476e441637805ac4beb1b33588 mysql-4.1.23_alpha20070101-r61.ebuild 1180 +RMD160 4b4326ec73b19f62d6fdd5fe03039265af7971df mysql-4.1.23_alpha20070101-r61.ebuild 1180 +SHA256 0c11bf73ffb431ca18119cc302a0ca5b057045effc3b6eea758fa732b04e010b mysql-4.1.23_alpha20070101-r61.ebuild 1180 +EBUILD mysql-5.0.26-r2.ebuild 1945 RMD160 117bebf9817866defc37eb7982c580d33438bec1 SHA1 8815b37b36ad8d1e5c2fef5ef76ffab6e23ca351 SHA256 3fc469d01f513a8076aae5697e6af73a6b34449e0a3d663b695627fa8b3bb850 +MD5 e0208eb59cdaa2b13bf8a97a90764fd9 mysql-5.0.26-r2.ebuild 1945 +RMD160 117bebf9817866defc37eb7982c580d33438bec1 mysql-5.0.26-r2.ebuild 1945 +SHA256 3fc469d01f513a8076aae5697e6af73a6b34449e0a3d663b695627fa8b3bb850 mysql-5.0.26-r2.ebuild 1945 +EBUILD mysql-5.0.30-r1.ebuild 1949 RMD160 cc5c1b5583f2e746dc95abb94e8ca3a7b7c54e27 SHA1 e5b2632bf1d156b88834400d158f1ae6047c9d36 SHA256 f8bc3c57be8be6a0e48f40b832db71ff9d7c5db3c6459a98838743d1dd1bb340 +MD5 13c8b73ae6d3c22515c0e4d706cfa88c mysql-5.0.30-r1.ebuild 1949 +RMD160 cc5c1b5583f2e746dc95abb94e8ca3a7b7c54e27 mysql-5.0.30-r1.ebuild 1949 +SHA256 f8bc3c57be8be6a0e48f40b832db71ff9d7c5db3c6459a98838743d1dd1bb340 mysql-5.0.30-r1.ebuild 1949 +EBUILD mysql-5.0.34_alpha20070101-r61.ebuild 2508 RMD160 0b0d2b985b8de64c3a7362248fb444e2b76b57f7 SHA1 e7cd7cae92030c50093428ba8b8d25746bb6b77d SHA256 0601f4f052a811df8190330b120c4c8989ed2a44a043f3717530cee66e3b963e +MD5 254e192ac6c73114f22284c525a32a08 mysql-5.0.34_alpha20070101-r61.ebuild 2508 +RMD160 0b0d2b985b8de64c3a7362248fb444e2b76b57f7 mysql-5.0.34_alpha20070101-r61.ebuild 2508 +SHA256 0601f4f052a811df8190330b120c4c8989ed2a44a043f3717530cee66e3b963e mysql-5.0.34_alpha20070101-r61.ebuild 2508 +MISC ChangeLog 78180 RMD160 a38f1621f0a05efdd4f398871a5ef50f3e7e939d SHA1 32bed6daaa31da1a7c5f8be2c104844ca5f12aa4 SHA256 31151c13f0e5c0268d7622691cc8da36c9760765678a4040125fc3909e1ecb51 +MD5 27355bd038fb5760372e63c6927b00ad ChangeLog 78180 +RMD160 a38f1621f0a05efdd4f398871a5ef50f3e7e939d ChangeLog 78180 +SHA256 31151c13f0e5c0268d7622691cc8da36c9760765678a4040125fc3909e1ecb51 ChangeLog 78180 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159 @@ -95,24 +79,24 @@ SHA256 df65c65648e29af5cf3df09407521acb4a0160106247cb14d0f23b3ec3c5de74 files/di MD5 e4fa263d3b35f5f4f23856868bdf2950 files/digest-mysql-4.0.25-r2 509 RMD160 882fe3b4bc916f2a66a7854b5fb96fc03e31efe7 files/digest-mysql-4.0.25-r2 509 SHA256 5355aa6145f94d54b17a3c0c486862945dd56bd3d4b50b4143c07d78163f3312 files/digest-mysql-4.0.25-r2 509 -MD5 0a8ffd929bdf0c5524211fa07b8ca049 files/digest-mysql-4.0.27 509 -RMD160 fcb19ef585d0c1cd8f0b60d17078de35a5aa614f files/digest-mysql-4.0.27 509 -SHA256 ded131d259a85cf0589bb9d572e56829402edbd65676aac87d7bfdecca7a583d files/digest-mysql-4.0.27 509 +MD5 0a8ffd929bdf0c5524211fa07b8ca049 files/digest-mysql-4.0.27-r1 509 +RMD160 fcb19ef585d0c1cd8f0b60d17078de35a5aa614f files/digest-mysql-4.0.27-r1 509 +SHA256 ded131d259a85cf0589bb9d572e56829402edbd65676aac87d7bfdecca7a583d files/digest-mysql-4.0.27-r1 509 MD5 d0599ca0548d446bda87a00920a056c0 files/digest-mysql-4.1.21 509 RMD160 c2e28497185a5960b5449fd225c4738f1b1aa331 files/digest-mysql-4.1.21 509 SHA256 dcdd5bc586db79418cc5214d71825306cc22db2a7c24487fc12278ec0384a52e files/digest-mysql-4.1.21 509 -MD5 b115c41dd6ad161b69a46aee9fce436c files/digest-mysql-4.1.22 509 -RMD160 f89dc74e8d9eb254f3b4f349d0a6aa862de0eae4 files/digest-mysql-4.1.22 509 -SHA256 ae3b48f45d48fc69a0197d6020801a0422ed69bf76307cc232b1c1becd49f1b5 files/digest-mysql-4.1.22 509 -MD5 2131975c8b05704e3c0cffec893c4602 files/digest-mysql-4.1.23_alpha20070101-r60 548 -RMD160 0e89601b33db8a0f9d477d2bd1a6a0b06f811b61 files/digest-mysql-4.1.23_alpha20070101-r60 548 -SHA256 b38017bdff7d53137af64a03c6b7ddf2351203df21f3d0a01b28309b14246f07 files/digest-mysql-4.1.23_alpha20070101-r60 548 -MD5 5cccd323d243a1dba0bcb0a825e44c78 files/digest-mysql-5.0.26-r1 509 -RMD160 d693916c51f14b3ab7d4d8f2cb82b45f841ff0ff files/digest-mysql-5.0.26-r1 509 -SHA256 025d369bf41c4103bd3735396ca64301ce0188ae1539e5c2a4ff664d23db4656 files/digest-mysql-5.0.26-r1 509 -MD5 203ef39bd08fcaa8119f843c99f44c49 files/digest-mysql-5.0.30 509 -RMD160 79b4d96be7a0dd882efb9f11e642b52bb9732a68 files/digest-mysql-5.0.30 509 -SHA256 5a152952ae7701949ac62be0d703b14888ab2a248a1ef1fb77bf765b4f75c05c files/digest-mysql-5.0.30 509 -MD5 98acb9810f87773a30a14a1f25346b14 files/digest-mysql-5.0.34_alpha20070101-r60 548 -RMD160 6cf44dc446065e6e890dcbd59291cb4c6f99ba0d files/digest-mysql-5.0.34_alpha20070101-r60 548 -SHA256 06652eba0cd954daf34a7cbeaee9fdd5ed23bd416c5324bafc385363448277e3 files/digest-mysql-5.0.34_alpha20070101-r60 548 +MD5 b115c41dd6ad161b69a46aee9fce436c files/digest-mysql-4.1.22-r1 509 +RMD160 f89dc74e8d9eb254f3b4f349d0a6aa862de0eae4 files/digest-mysql-4.1.22-r1 509 +SHA256 ae3b48f45d48fc69a0197d6020801a0422ed69bf76307cc232b1c1becd49f1b5 files/digest-mysql-4.1.22-r1 509 +MD5 2131975c8b05704e3c0cffec893c4602 files/digest-mysql-4.1.23_alpha20070101-r61 548 +RMD160 0e89601b33db8a0f9d477d2bd1a6a0b06f811b61 files/digest-mysql-4.1.23_alpha20070101-r61 548 +SHA256 b38017bdff7d53137af64a03c6b7ddf2351203df21f3d0a01b28309b14246f07 files/digest-mysql-4.1.23_alpha20070101-r61 548 +MD5 5cccd323d243a1dba0bcb0a825e44c78 files/digest-mysql-5.0.26-r2 509 +RMD160 d693916c51f14b3ab7d4d8f2cb82b45f841ff0ff files/digest-mysql-5.0.26-r2 509 +SHA256 025d369bf41c4103bd3735396ca64301ce0188ae1539e5c2a4ff664d23db4656 files/digest-mysql-5.0.26-r2 509 +MD5 203ef39bd08fcaa8119f843c99f44c49 files/digest-mysql-5.0.30-r1 509 +RMD160 79b4d96be7a0dd882efb9f11e642b52bb9732a68 files/digest-mysql-5.0.30-r1 509 +SHA256 5a152952ae7701949ac62be0d703b14888ab2a248a1ef1fb77bf765b4f75c05c files/digest-mysql-5.0.30-r1 509 +MD5 98acb9810f87773a30a14a1f25346b14 files/digest-mysql-5.0.34_alpha20070101-r61 548 +RMD160 6cf44dc446065e6e890dcbd59291cb4c6f99ba0d files/digest-mysql-5.0.34_alpha20070101-r61 548 +SHA256 06652eba0cd954daf34a7cbeaee9fdd5ed23bd416c5324bafc385363448277e3 files/digest-mysql-5.0.34_alpha20070101-r61 548 diff --git a/dev-db/mysql/files/mysql.conf.d b/dev-db/mysql/files/mysql.conf.d deleted file mode 100644 index 15ff170cc98a..000000000000 --- a/dev-db/mysql/files/mysql.conf.d +++ /dev/null @@ -1,80 +0,0 @@ -# Here is where we define which server(s) to start. -# Additional parameters to be passed to mysqld at startup may be added here, -# which will override the ones in "my.cnf". -# -# Below are described some suggested parameters to use. -# The parameters not recognized will be passed through to the mysqld daemon -# directly! -# To avoid starting a server just comment it's definition. -# -# Last but not least, SPACES are NOT allowed inside the parameters! -# -# Parameter : description -# ----------------+----------------------------------------------------------- -# nice : integer [-20 .. 19 ] default 0 -# : change the priority of the server -20 (high) to 19 (low) -# : see "man nice 1" for description -# ----------------+----------------------------------------------------------- -# mycnf : string [full path to my.cnf] -# : specify the path to my.cnf file to be used -# ----------------+----------------------------------------------------------- -# startup_timeout : integer [seconds] default 15 -# : time to wait for mysqld up and running, after this it's -# : marked as failed -# ----------------+----------------------------------------------------------- -# -# Additional parameters -# Parameter : description -# ----------------+----------------------------------------------------------- -# server-id : integer [1 .. 255] -# : Uniquely identifies the server instance in the community -# : of replication partners. -# ----------------+----------------------------------------------------------- -# port : integer [1025 .. 65535] default 3306 -# : Port number to use for connection. -# : Looses any meaning if skip-networking is set. -# ----------------+----------------------------------------------------------- -# skip-networking : NULL -# : Don't allow connection through TCP/IP. -# ----------------+----------------------------------------------------------- -# log-bin : string [name of the binlog files] -# : Log update queries in binary format. Optional (but -# : strongly recommended to avoid replication problems if -# : server's hostname changes) argument should be the chosen -# : location for the binary log files. -# ----------------+----------------------------------------------------------- -# Additionally the following variables are recognized: -# -# Be more verbose, accepts values from 1 to 4 -#DEBUG=4 -# -# The default location for the "master" pid file -#MYSQL_GLOB_PID_FILE="/var/run/svc-started-mysqld" -# -# The timeout for a failed attempt to stop a server -#STOPTIMEOUT=120 -# - -# The parameters are passed in a bash array variable, -# the variable name is mysql_slot_0_[server-num] -# "server-num" is an optional number used to start multiple servers -# -# Examples: -# -# start a default server with default options: -#mysql_slot_0=() -# -# start MySQL reniced, overriding some start parameters -#mysql_slot_0=( -# "nice=-5" -# "server-id=123" -# "log-bin="myhost" -# "port=3307" -#) -# -# start another server, different my.cnf -#mysql_slot_0_1=( -# "mycnf=/home/test/my.cnf" -# "server-id=124" -#) -# diff --git a/dev-db/mysql/files/mysql.rc6 b/dev-db/mysql/files/mysql.rc6 deleted file mode 100644 index d18d5a6b3aa5..000000000000 --- a/dev-db/mysql/files/mysql.rc6 +++ /dev/null @@ -1,357 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.rc6,v 1.5 2006/10/13 19:51:09 chtekk Exp $ - -# external binaries used: which, sed, tac - -# int in_list(char * elem, char * list) -function in_list() { - local elem=${1:-"none"} - local list=${2:-","} - - [[ "${list}" == "${list/,${elem},/}" ]] \ - && return 1 \ - || return 0 -} - -function wdebug() { - if [[ "${DEBUG}" -ge "${1}" ]] ; then - shift - echo "dbg: ${@}" - fi -} - -depend() { - use dns net localmount netmount nfsmount -} - -do_escape() { - # Ihatethisreallyverymuch - #echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|" - echo "$1" -} - -# int get_slot_config(srv_slot=0, srv_num) -get_slot_config() { - wdebug 4 ">>> get_slot_config()" - - local srv srv_slot srv_num - srv_slot="${1:-"0"}" - srv_num="${2}" - MY_SUFFIX="-${srv_slot}" - # srv=array(0 => [srv_slot], 1 => [srv_num] ) - srv=( ${srv_slot} ${srv_num} ) - - local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" - local conf_d_parameters="${!tmp_eval}" - if [[ "${srv_slot}" == "0" ]] ; then - MY_SUFFIX='' - # try some other default for the default server - [[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=${mysql_slot[@]} - fi - [[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=( ) - basedir="" datadir="" pidfile="" socket="" - CHROOT="" NICE="" STARTUPTIMEOUT=5 STOPTIMEOUT=120 - - wdebug 3 "srv ${srv[@]}" - wdebug 3 "srv_slot ${srv_slot}" - wdebug 3 "srv_num ${srv_num}" - wdebug 3 "tmp_eval ${tmp_eval}" - wdebug 3 "conf_d_parameters ${conf_d_parameters[@]}" - wdebug 3 "MY_SUFFIX ${MY_SUFFIX}" - - local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" - local conf_d_parameters="${!tmp_eval}" - # collations need to be defined *after* the character sets, - # so we will duplicate them - local collations="" - [[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters='' - - MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf" - # summa of unmanaged parameters - # some parameters may be present multiple times - unmanagedparams="" - - # grab the parameters from conf.d/mysql definition - for my_default in ${conf_d_parameters[*]} ; do - case "${my_default}" in - nice=*) - NICE="${my_default#nice=}" - nice -n $NICE ls /tmp &>/dev/null || NICE="" - ;; - mycnf=*) MY_CNF="${my_default#mycnf=}" ;; - startup_timeout=*) - STARTUPTIMEOUT="${my_default#startup_timeout=}" ;; - basedir=*) basedir="${my_default#basedir=}" ;; - datadir=*) datadir="${my_default#datadir=}" ;; - pid-file=*) pidfile="${my_default#pid-file=}" ;; - socket=*) socket="${my_default#socket=}" ;; - *collation*=) - collations="${collations} --$( do_escape "${my_default}" )" - ;; - *=*) - # list of parameters we already have - # prepend "--" because my_print_defaults do it - unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )" - ;; - *) - unmanagedparams="${unmanagedparams} --${my_default}" - ;; - esac - done - - if [[ ! -r "${MY_CNF}" ]] ; then - ewarn "Cannot access ${MY_CNF} !" - MY_CNF="" - my_defaults="" - else - local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)" - if [[ ! -x "${my_print_defaults}" ]] ; then - eerror "my_print_defaults NOT found or not executable" - my_defaults="" - else - my_defaults=$( ${my_print_defaults} \ - --loose-verbose \ - --config-file="${MY_CNF}" \ - mysqld server ) - fi - fi - - # grab needed parameters from my.cnf, don't override the ones from - # conf.d/mysql - for my_default in ${my_defaults} ; do - case "${my_default}" in - --basedir=*) - [[ -z "${basedir}" ]] && basedir="${my_default#--basedir=}" ;; - --datadir=*) - [[ -z "${datadir}" ]] && datadir="${my_default#--datadir=}" ;; - --pid-file=*) - [[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;; - --socket=*) - [[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;; - --*collation*=) - # the order is inversed because we want the conf.d ones overriden - collations="$( do_escape "${my_default}" ) ${collations}" - ;; - esac - done - - # some parameters - basedir="${basedir:-"/usr"}" - datadir="${datadir:-"/var/lib/mysql${MY_SUFFIX}"}" - pidfile="${pidfile:-"/var/run/mysqld/mysqld${MY_SUFFIX}.pid"}" - socket="${socket:-"/var/run/mysqld/mysqld${MY_SUFFIX}.sock"}" - unmanagedparams="${unmanagedparams} ${collations}" - - wdebug 3 "chroot dir => ${CHROOT}" - wdebug 3 "niceness => ${NICE}" - wdebug 3 "basedir => ${basedir}" - wdebug 3 "datadir => ${datadir}" - wdebug 3 "pidfile => ${pidfile}" - wdebug 3 "socket => ${socket}" - wdebug 3 "Unamanged => ${unmanagedparams}" - - # extension for sleep tenth of seconds, not very portable so check it before - if sleep 0.01 ; then - STARTUPTIMEOUT=$(( STARTUPTIMEOUT * 10 )) - STOPTIMEOUT=$(( STOPTIMEOUT * 10 )) - TIMEUNIT=0.1 - else - TIMEUNIT=1 - fi - - # push these out to the script - export MY_SUFFIX NICE MY_CNF pidfile datadir basedir socket CHROOT - export unmanagedparams STARTUPTIMEOUT STOPTIMEOUT TIMEUNIT - wdebug 4 "<<< get_slot_config() ok" - return 0 -} - -checkconfig() { - wdebug 4 ">>> checkconfig(\"${1}\")" - local datadir="${1}" pidfile="${2}" socket="${3}" - - if [[ -n "${NOCHECK}" ]] ; then - rm -f "${pidfile}" "${socket}" - return 0 - fi - - if [[ ! -d "${datadir}" ]] ; then - eerror "MySQL datadir is empty or invalid" - eerror "Please check your my.cnf : ${MY_CNF}" - wdebug 4 "<<< checkconfig() KO" - return 1 - fi - - if [[ ! -d "${datadir}/mysql" ]] ; then - eerror "You don't appear to have the mysql database installed yet." - eerror "Please run /usr/bin/mysql_install_db to have this done..." - wdebug 4 "<<< checkconfig() KO" - return 1 - fi - - if [[ -f "${pidfile}" ]] ; then - kill -15 $(< ${pidfile}) 2>/dev/null - if [[ $? -eq 0 ]] ; then - # the process exist, we have a problem - eerror "\"${pidfile}\" is still present and the process is running." - eerror "Please stop it \"kill $(< ${pidfile})\" maybe ?" - wdebug 4 "<<< checkconfig() KO" - return 1 - else - rm -f "${pidfile}" - fi - fi - - if [[ -S "${socket}" ]] ; then - ewarn "Strange, the socket file already exist in \"${socket}\"" - ewarn "it will be removed now and re-created by the MySQL server" - ewarn "BUT please make your checks." - rm -f "${socket}" - fi - - wdebug 4 "<<< checkconfig() ok" - return 0 -} - -start() { - wdebug 4 ">>> start()" - - MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"} - # servers are defined in /etc/conf.d/mysql - local serverlist=${!mysql_slot_*} - # provide default for empty conf.d/mysql - if [[ -z "${serverlist}" ]] ; then - serverlist=0 - export mysql_slot_0=( ) - fi - local retstatus timeout - local globretstatus=1 - local srv_slot srv_num - # server MUST NOT share same location for these - local pidfilelist=',' datadirlist=',' socketlist=',' - local ssd_thing=1 - local mysqld_thing tmpnice - - ebegin "Starting ${myservice}" - # try to start each server - for srv in ${serverlist[*]} ; do - - srv_slot="${srv#mysql_slot_}" - if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then - srv_num='' - else - srv_num="${srv_slot#*_}" - fi - srv_slot="${srv_slot%%_*}" - - retstatus=0 - get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1 - - # checks - if ! checkconfig "${datadir}" "${pidfile}" "${socket}" ; then - retstatus=2 ; continue - fi - if in_list "${pidfile}" "${pidfilelist}" ; then - eerror "Sorry, won't start with same pid-file: ${pidfile}" - retstatus=3 ; continue - fi - if in_list "${datadir}" "${datadirlist}" ; then - eerror "Sorry, won't start with same datadir: ${datadir}" - retstatus=4 ; continue - fi - if in_list "${socket}" "${socketlist}" ; then - eerror "Sorry, won't start with same socket: ${socket}" - retstatus=5 ; continue - fi - - einfo "Starting ${myservice} (${MY_CNF})" - - mysqld_thing="${MY_CNF:+"--defaults-file="}${MY_CNF}" - mysqld_thing="${mysqld_thing} ${unmanagedparams}" - mysqld_thing="${mysqld_thing} --basedir=${basedir}" - mysqld_thing="${mysqld_thing} --datadir=${datadir}" - mysqld_thing="${mysqld_thing} --pid-file=${pidfile}" - mysqld_thing="${mysqld_thing} --socket=${socket}" - - wdebug 2 "starting mysqld with: ${mysqld_thing}" - - if [[ ${ssd_thing} -eq 1 ]] ; then - tmpnice="${NICE:+"--nicelevel "}${NICE}" - start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --start \ - --background ${tmpnice} --pidfile ${pidfile} \ - --exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing} - retstatus=$? - else - tmpnice="${NICE:+"nice -n "}${NICE}" - ${tmpnice} ${basedir}/sbin/mysqld${MY_SUFFIX} ${mysqld_thing} & - retstatus=0 - fi - - # only the first run is done by start-stop-daemon - ssd_thing="" - - # wait for socket creation - wdebug 1 - while ! [[ -S "${socket}" || "${STARTUPTIMEOUT}" -lt 1 || "${retstatus}" -ne 0 ]] ; do - STARTUPTIMEOUT=$(( STARTUPTIMEOUT - 1 )) - [[ ${DEBUG} -ge 1 ]] && echo -n "${STARTUPTIMEOUT}," - sleep ${TIMEUNIT} - done - wdebug 1 "" - if [[ ! -S "${socket}" ]] ; then - eerror "MySQL${MY_SUFFIX} NOT started (${retstatus})" - retstatus=1 - else - globretstatus=0 - pidfilelist="${pidfilelist}${pidfile}," - datadirlist="${datadirlist}${datadir}," - socketlist="${socketlist}${socket}," - echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}" - fi - done - # successfull if at least one mysqld started - wdebug 4 "<<< start()" - eend $globretstatus -} - -stop() { - get_slot_config &> /dev/null - MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"} - local runwhat pidfile shutdown_elem - local PID cnt timeout=${STOPTIMEOUT:-"120"} - local retstatus=0 - local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )" - - ebegin "Stopping ${myservice}" - wdebug 5 "MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}" - wdebug 5 "shutdown_list: ${shutdown_list}" - for shutdown_elem in ${shutdown_list} ; do - runwhat=${shutdown_elem%%=*} - pidfile=${shutdown_elem#*=} - timeout=${STOPTIMEOUT:-"120"} - PID=$(< "${pidfile}" ) - wdebug 3 "runwhat ${runwhat}" - wdebug 3 "pidfile ${pidfile}" - wdebug 3 "timeout ${timeout}" - wdebug 3 "PID ${PID}" - - einfo "Stopping mysqld (${runwhat})" - - start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --stop --pidfile "${pidfile}" & - wdebug 1 "" - while [[ -n "$PID" ]] \ - && $( ps -Ao pid | grep -q "^ *$PID$" ) \ - && [[ "${timeout}" -ge 1 ]] - do - timeout=$(($timeout - 1)) - [[ ${DEBUG} -ge 1 ]] && echo -n "$(( $STOPTIMEOUT - $timeout ))," - sleep ${TIMEUNIT} - done - [[ "${timeout}" -lt 1 ]] && retstatus=1 - done - sleep ${TIMEUNIT} - [[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE" - eend ${retstatus} -} diff --git a/dev-db/mysql/files/mysqlmanager.conf.d b/dev-db/mysql/files/mysqlmanager.conf.d deleted file mode 100644 index 8666f71596cc..000000000000 --- a/dev-db/mysql/files/mysqlmanager.conf.d +++ /dev/null @@ -1,28 +0,0 @@ -# Here is where we define which server(s) to start. -# Additional parameters to be passed to mysqlmanager at startup may be added here, -# which will override the ones in "my.cnf". -# -# To avoid starting a server just comment it's definition -# here or it will rant (no default start). -# Last but not least, spaces are NOT allowed inside the parameters! -# -# Below are described some suggested parameters to use. -# The parameters not recognized will be passed through to the mysqlmanager directly. -# -# Parameter : description - -# ----------------+----------------------------------------------------------- -# mycnf : string [full path to my.cnf] -# : specify the path to my.cnf file to be used -# : may contain a [manager] section -# ----------------+----------------------------------------------------------- -# -# Basic default -# -#mysqlmanager_slot_0=() -# -# Start MySQL 5.0.X overriding the my.cnf path -#mysqlmanager_slot_500=( -# "mycnf=/home/test/my.cnf" -#) -# diff --git a/dev-db/mysql/files/mysqlmanager.rc6 b/dev-db/mysql/files/mysqlmanager.rc6 deleted file mode 100644 index 91e8b580a596..000000000000 --- a/dev-db/mysql/files/mysqlmanager.rc6 +++ /dev/null @@ -1,230 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager.rc6,v 1.3 2006/08/28 12:22:21 vivo Exp $ - -# external binaries used: which, sed, tac - -depend() { - use dns net localmount netmount nfsmount - #provide mysql -} - -# int in_list(char * elem, char * list) -function in_list() { - local elem=${1:-"none"} - local list=${2:-","} - - [[ "${list}" == "${list/,${elem},/}" ]] \ - && return 1 \ - || return 0 -} - -do_escape() { - # Ihatethisreallyverymuch - #echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|" - echo "$1" -} - -# int get_slot_config(srv_slot=0, srv_num) -get_slot_config() { - [[ ${DEBUG} -ge 4 ]] && einfo ">>> get_slot_config(\"${1}\", \"${2}\")" - - srv_slot="${1:-"0"}" - srv_num="${2}" - MY_SUFFIX="-${srv_slot}" - [[ "${MY_SUFFIX}" == '-0' ]] && MY_SUFFIX='' - - basedir="" pidfile="" socket="" - - local tmp_eval="mysqlmanager_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" - local conf_d_parameters="${!tmp_eval}" - [[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters='' - - MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf" - # summa of unmanaged parameters - # some parameters may be present multiple times - unmanagedparams="" - - # grab the parameters from conf.d/mysql definition - for my_default in ${conf_d_parameters[*]} ; do - case "${my_default}" in - mycnf=*) MY_CNF="${my_default#mycnf=}" ;; - basedir=*) basedir="${my_default#basedir=}" ;; - pid-file=*) pidfile="${my_default#pid-file=}" ;; - socket=*) socket="${my_default#socket=}" ;; - *=*) - # list of parameters we already have - # prepend "--" because my_print_defaults do it - unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )" - ;; - *) - unmanagedparams="${unmanagedparams} --${my_default}" - ;; - esac - done - - if [[ ! -r "${MY_CNF}" ]] ; then - ewarn "Cannot access ${MY_CNF} !" - MY_CNF="" - my_defaults="" - else - local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)" - if [[ ! -x "${my_print_defaults}" ]] ; then - eerror "my_print_defaults NOT found or not executable" - my_defaults="" - else - my_defaults=$( ${my_print_defaults} \ - --loose-verbose \ - --config-file="${MY_CNF}" \ - manager ) - fi - fi - - # grab needed parameters from my.cnf, don't override the ones from - # conf.d/mysql - for my_default in ${my_defaults} ; do - case "${my_default}" in - --pid-file=*) - [[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;; - --socket=*) - [[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;; - esac - done - - # still empty, I'm in doubt if assign a default or break, will see - basedir="${basedir:-"/usr"}" - pidfile="${pidfile:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.pid"}" - socket="${socket:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.sock"}" - - if [[ ${DEBUG} -ge 3 ]] ; then - einfo "basedir => ${basedir}" - einfo "pidfile => ${pidfile}" - einfo "socket => ${socket}" - einfo "Unamanged => ${unmanagedparams}" - fi - - # push these out to the script - export MY_SUFFIX MY_CNF pidfile basedir socket - export unmanagedparams - [[ ${DEBUG} -ge 4 ]] && einfo "<<< get_slot_config() ok" - return 0 -} - -start() { - [[ ${DEBUG} -ge 4 ]] && einfo ">>> start()" - MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"} - # servers are defined in /etc/conf.d/mysql - local serverlist=${!mysqlmanager_slot_*} - # provide default for empty conf.d/mysql - if [[ -z "${serverlist}" ]] ; then - serverlist=0 - export mysqlmanager_slot_0=() - fi - local retstatus timeout - local globretstatus=1 - local srv_slot srv_num - # server MUST NOT share same location for these - local pidfilelist=',' socketlist=',' - - # additional security - rm -f "${MYSQL_GLOB_PID_FILE}" ; touch "${MYSQL_GLOB_PID_FILE}" - if [[ $? -ne 0 ]] ; then - eerror "cannot create MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}" - [[ ${DEBUG} -ge 4 ]] && einfo "<<< start() KO" - return 1 - fi - - ebegin - # try to start each server - for srv in ${serverlist[*]} ; do - einfo "working on ${srv}" - - srv_slot="${srv#mysqlmanager_slot_}" - if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then - srv_num='' - else - srv_num="${srv_slot#*_}" - fi - srv_slot="${srv_slot%%_*}" - - retstatus=0 - get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1 - - # timeout (seconds) before declaring the startup failed - - # pre_run checks - if [[ "$retstatus" -eq 0 ]] ; then - if in_list "${pidfile}" "${pidfilelist}" ; then - retstatus=3 - eerror "Sorry, won't start with same pid-file: ${pidfile}" - fi - if in_list "${socket}" "${socketlist}" ; then - retstatus=5 - eerror "Sorry, won't start with same socket: ${socket}" - fi - fi - - if [[ $retstatus -eq 0 ]] ; then - # additional security - rm -f ${pidfile} ${socket} - einfo "Starting mysqlmanager${MY_SUFFIX:+"_"}${srv_slot}${srv_num:+"_"}${srv_num} (${MY_CNF})" - - [[ ${DEBUG} -ge 2 ]] && echo "starting mysqlmanager with: "${basedir}/sbin/mysqlmanager${MY_SUFFIX} ${unmanagedparams} --pid-file=${pidfile} --socket=${socket} - - start-stop-daemon --quiet --start --background \ - --pidfile "${pidfile}" \ - --exec ${basedir}/sbin/mysqlmanager${MY_SUFFIX} \ - -- \ - ${MY_CNF:+"--defaults-file="}${MY_CNF} \ - ${unmanagedparams} \ - --pid-file=${pidfile} \ - --socket=${socket} - - retstatus=$? - - if [[ "${retstatus}" -eq 0 ]] ; then - pidfilelist="${pidfilelist}${pidfile}," - socketlist="${socketlist}${socket}," - globretstatus=0 - echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}" - fi - fi - done - # successfull if at least one mysqlmanager started - [[ ${DEBUG} -ge 4 ]] && einfo "<<< start()" - eend $globretstatus -} - -stop () { - MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"} - local runwhat pidfile shutdown_elem - local PID cnt timeout - local retstatus=0 - local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )" - - # shutdown in reverse order - ebegin - for shutdown_elem in $shutdown_list; do - runwhat=${shutdown_elem%%=*} - pidfile=${shutdown_elem#*=} - timeout=${STOPTIMEOUT:-"10"} - - einfo "Stopping mysqlmanager (${runwhat})" - - PID=$(cat "${pidfile}" 2>/dev/null) - start-stop-daemon --stop --quiet --pidfile="${pidfile}" - [[ ${DEBUG} -ge 1 ]] && echo "" - while [[ -n "$PID" && $( kill -0 $PID 2>/dev/null ) && "${timeout}" -ge 1 ]] ; do - timeout=$(($timeout - 1)) - [[ ${DEBUG} -ge 1 ]] && echo -n $(( $STOPTIMEOUT - $timeout )) - sleep 1 - done - if [[ "${timeout}" -lt 1 ]] ; then - retstatus=$(( $retstatus + 1 )) - fi - done - - [[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE" - eend $retstatus -} diff --git a/dev-db/mysql/mysql-4.0.27.ebuild b/dev-db/mysql/mysql-4.0.27.ebuild deleted file mode 100644 index 15a146e13292..000000000000 --- a/dev-db/mysql/mysql-4.0.27.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.27.ebuild,v 1.16 2007/01/05 00:17:35 vivo Exp $ - -MY_EXTRAS_VER="20070105" -SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" - -inherit mysql - -#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" - -src_test() { - cd "${S}" - einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" - make check || die "make check failed" - if ! useq "minimal" ; then - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus - addpredict /this-dir-does-not-exist/t9.MYI - - cd mysql-test - sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run - ./mysql-test-run - retstatus=$? - - # Just to be sure ;) - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - [[ $retstatus -eq 0 ]] || die "make test failed" - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql/mysql-4.1.22.ebuild b/dev-db/mysql/mysql-4.1.22.ebuild deleted file mode 100644 index 30877e506a22..000000000000 --- a/dev-db/mysql/mysql-4.1.22.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.22.ebuild,v 1.4 2007/01/05 00:17:35 vivo Exp $ - -MY_EXTRAS_VER="20070105" -SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" - -inherit mysql - -#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" - -src_test() { - cd "${S}" - einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" - make check || die "make check failed" - if ! useq "minimal" ; then - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus - local testopts="--force" - - # sandbox make ndbd zombie - hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb" - - addpredict /this-dir-does-not-exist/t9.MYI - - cd mysql-test - sed -i -e "s|3306|3307|g" mysql-test-run.pl - - # from Makefile.am: - retstatus=1 - ./mysql-test-run.pl ${testopts} \ - && ./mysql-test-run.pl ${testopts} --ps-protocol \ - && retstatus=0 - - # Just to be sure ;) - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - [[ $retstatus -eq 0 ]] || die "test failed" - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql/mysql-4.1.23_alpha20070101-r60.ebuild b/dev-db/mysql/mysql-4.1.23_alpha20070101-r60.ebuild deleted file mode 100644 index 139220f7b852..000000000000 --- a/dev-db/mysql/mysql-4.1.23_alpha20070101-r60.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.23_alpha20070101-r60.ebuild,v 1.2 2007/01/04 20:48:42 vivo Exp $ - -MY_EXTRAS_VER="latest" -SERVER_URI="mirror://gentoo/MySQL-${PV%.*}/mysql-${PV//_alpha/-bk-}.tar.bz2" - -inherit mysql - -#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit -KEYWORDS="testing" - -src_test() { - cd "${S}" - einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" - make check || die "make check failed" - if ! useq "minimal" ; then - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus - local testopts="--force" - - # sandbox make ndbd zombie - hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb" - - addpredict /this-dir-does-not-exist/t9.MYI - - cd mysql-test - - # from Makefile.am: - retstatus=1 - ./mysql-test-run.pl ${testopts} \ - && ./mysql-test-run.pl ${testopts} --ps-protocol \ - && retstatus=0 - - # Just to be sure ;) - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - [[ $retstatus -eq 0 ]] || die "test failed" - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql/mysql-5.0.26-r1.ebuild b/dev-db/mysql/mysql-5.0.26-r1.ebuild deleted file mode 100644 index a2c300d2ae71..000000000000 --- a/dev-db/mysql/mysql-5.0.26-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.26-r1.ebuild,v 1.16 2007/01/05 00:17:35 vivo Exp $ - -MY_EXTRAS_VER="20070105" -SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" - -inherit mysql - -#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" - -src_test() { - - make check || die "make check failed" - if ! useq "minimal" ; then - cd "${S}" - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus - local t - addpredict /this-dir-does-not-exist/t9.MYI - - # mysqladmin start before dir creation - mkdir mysql-test/var{,/log} - - if [[ ${UID} -eq 0 ]] ; then - mysql_disable_test "im_daemon_life_cycle" "fail as root" - mysql_disable_test "im_life_cycle" "fail as root" - mysql_disable_test "im_options_set" "fail as root" - mysql_disable_test "im_options_unset" "fail as root" - mysql_disable_test "im_utils" "fail as root" - fi - - for t in \ - loaddata_autocom_ndb \ - ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \ - ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \ - ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \ - ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \ - ndb_{restore,subquery,transaction,trigger,truncate,types,update} \ - ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb - do - mysql_disable_test "${t}" "fail in sandbox" - done - - useq "extraengine" && mysql_disable_test "federated" "fail with extraengine" - - make test-force-pl - retstatus=$? - - # Just to be sure ;) - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - [[ $retstatus -eq 0 ]] || die "make test failed" - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql/mysql-5.0.30.ebuild b/dev-db/mysql/mysql-5.0.30.ebuild deleted file mode 100644 index 7b054ed1aefa..000000000000 --- a/dev-db/mysql/mysql-5.0.30.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.30.ebuild,v 1.5 2007/01/05 00:17:35 vivo Exp $ - -MY_EXTRAS_VER="20070105" -SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" - -inherit mysql - -#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" - -src_test() { - - make check || die "make check failed" - if ! useq "minimal" ; then - cd "${S}" - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus - local t - addpredict /this-dir-does-not-exist/t9.MYI - - # mysqladmin start before dir creation - mkdir mysql-test/var{,/log} - - if [[ ${UID} -eq 0 ]] ; then - mysql_disable_test "im_daemon_life_cycle" "fail as root" - mysql_disable_test "im_life_cycle" "fail as root" - mysql_disable_test "im_options_set" "fail as root" - mysql_disable_test "im_options_unset" "fail as root" - mysql_disable_test "im_utils" "fail as root" - fi - - for t in \ - loaddata_autocom_ndb \ - ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \ - ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \ - ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \ - ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \ - ndb_{restore,subquery,transaction,trigger,truncate,types,update} \ - ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb - do - mysql_disable_test "${t}" "fail in sandbox" - done - - useq "extraengine" && mysql_disable_test "federated" "fail with extraengine" - - make test-force-pl - retstatus=$? - - # Just to be sure ;) - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - [[ $retstatus -eq 0 ]] || die "make test failed" - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql/mysql-5.0.34_alpha20070101-r60.ebuild b/dev-db/mysql/mysql-5.0.34_alpha20070101-r60.ebuild deleted file mode 100644 index f90ddf306e67..000000000000 --- a/dev-db/mysql/mysql-5.0.34_alpha20070101-r60.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.34_alpha20070101-r60.ebuild,v 1.2 2007/01/04 20:48:42 vivo Exp $ - -MY_EXTRAS_VER="latest" -SERVER_URI="mirror://gentoo/MySQL-${PV%.*}/mysql-${PV//_alpha/-bk-}.tar.bz2" - -inherit mysql - -#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit -KEYWORDS="testing" - -src_test() { - - make check || die "make check failed" - if ! useq "minimal" ; then - cd "${S}/mysql-test" - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus - local t - local testopts="--force" - - # sandbox make ndbd zombie - hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb" - - addpredict /this-dir-does-not-exist/t9.MYI - - # mysqladmin start before dir creation - mkdir ${S}/mysql-test/var{,/log} - - if [[ ${UID} -eq 0 ]] ; then - mysql_disable_test "im_cmd_line" "fail as root" - mysql_disable_test "im_daemon_life_cycle" "fail as root" - mysql_disable_test "im_instance_conf" "fail as root" - mysql_disable_test "im_life_cycle" "fail as root" - mysql_disable_test "im_options" "fail as root" - mysql_disable_test "im_options_set" "fail as root" - mysql_disable_test "im_options_unset" "fail as root" - mysql_disable_test "im_utils" "fail as root" - mysql_disable_test "trigger" "fail as root" - fi - - for t in \ - loaddata_autocom_ndb \ - ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \ - ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \ - ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \ - ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \ - ndb_{restore,subquery,transaction,trigger,truncate,types,update} \ - ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb - do - mysql_disable_test "${t}" "fail in sandbox" - done - - useq "extraengine" && mysql_disable_test "federated" "fail with extraengine" - - mysql_disable_test "view" "Already fixed: fail because now we are in year 2007" - - for t in \ - myisam mysql_upgrade query_cache_notembedded rpl000015 rpl000017 - do - mysql_disable_test "${t}" "FIXME: Im'not supposed to fail" - done - - make test-force - retstatus=$? - - # Just to be sure ;) - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - [[ $retstatus -eq 0 ]] || die "make test failed" - else - einfo "Skipping server tests due to minimal build." - fi -} -- 2.26.2