Update mysql5-{client,server} pacakge to 5.0.92. Functionality added or changed: * The time zone tables available at http://dev.mysql.com/downloads/timezones.html have been updated. These tables can be used on systems such as Windows or HP-UX that do not include zoneinfo files. (Bug#40230) Bugs fixed: * Security Fix: During evaluation of arguments to extreme-value functions (such as LEAST() and GREATEST()), type errors did not propagate properly, causing the server to crash. (Bug#55826, CVE-2010-3833) * Security Fix: The server could crash after materializing a derived table that required a temporary table for grouping. (Bug#55568, CVE-2010-3834) * Security Fix: A user-variable assignment expression that is evaluated in a logical expression context can be precalculated in a temporary table for GROUP BY. However, when the expression value is used after creation of the temporary table, it was re-evaluated, not read from the table and a server crash resulted. (Bug#55564, CVE-2010-3835) * Security Fix: Joins involving a table with a unique SET column could cause a server crash. (Bug#54575, CVE-2010-3677) * Security Fix: Pre-evaluation of LIKE predicates during view preparation could cause a server crash. (Bug#54568, CVE-2010-3836) * Security Fix: GROUP_CONCAT() and WITH ROLLUP together could cause a server crash. (Bug#54476, CVE-2010-3837) * Security Fix: Queries could cause a server crash if the GREATEST() or LEAST() function had a mixed list of numeric and LONGBLOB arguments, and the result of such a function was processed using an intermediate temporary table. (Bug#54461, CVE-2010-3838) * Security Fix: Using EXPLAIN with queries of the form SELECT ... UNION ... ORDER BY (SELECT ... WHERE ...) could cause a server crash. (Bug#52711, CVE-2010-3682) * InnoDB Storage Engine: Creating or dropping a table with 1023 transactions active caused an assertion failure. (Bug#49238) * The make_binary_distribution target to make could fail on some platforms because the lines generated were too long for the shell. (Bug#54590) * A client could supply data in chunks to a prepared statement parameter other than of type TEXT or BLOB using the mysql_stmt_send_long_data() C API function (or COM_STMT_SEND_LONG_DATA command). This led to a crash because other data types are not valid for long data. (Bug#54041) * Builds of the embedded mysqld would fail due to a missing element of the struct NET. (Bug#53908, Bug#53912) * The definition of the MY_INIT macro in my_sys.h included an extraneous semicolon, which could cause compilation failure. (Bug#53906) * If the remote server for a FEDERATED table could not be accessed, queries for the INFORMATION_SCHEMA.TABLES table failed. (Bug#35333) * mysqld could fail during execution when using SSL. (Bug#34236) * Threads that were calculating the estimated number of records for a range scan did not respond to the KILL statement. That is, if a range join type is possible (even if not selected by the optimizer as a join type of choice and thus not shown by EXPLAIN), the query in the statistics state (shown by the SHOW PROCESSLIST) did not respond to the KILL statement. (Bug#25421)diff -r1.40 -r1.41 pkgsrc/databases/mysql5-client/Makefile.common
(taca)
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.40 2010/11/15 16:24:09 sketch Exp $ | 1 | # $NetBSD: Makefile.common,v 1.41 2011/02/26 02:58:55 taca Exp $ | |
2 | # | 2 | # | |
3 | # used by databases/mysql5-client/Makefile | 3 | # used by databases/mysql5-client/Makefile | |
4 | # used by databases/mysql5-server/Makefile | 4 | # used by databases/mysql5-server/Makefile | |
5 | # | 5 | # | |
6 | 6 | |||
7 | DISTNAME= mysql-5.0.91 | 7 | DISTNAME= mysql-5.0.92 | |
8 | CATEGORIES= databases | 8 | CATEGORIES= databases | |
9 | MASTER_SITES= http://downloads.mysql.com/archives/mysql-5.0/ \ | 9 | MASTER_SITES= http://downloads.mysql.com/archives/mysql-5.0/ \ | |
10 | ${MASTER_SITE_MYSQL:=MySQL-5.0/} | 10 | ${MASTER_SITE_MYSQL:=MySQL-5.0/} | |
11 | 11 | |||
12 | MAINTAINER= pkgsrc-users@NetBSD.org | 12 | MAINTAINER= pkgsrc-users@NetBSD.org | |
13 | HOMEPAGE= http://www.mysql.com/ | 13 | HOMEPAGE= http://www.mysql.com/ | |
14 | LICENSE= gnu-gpl-v2 | 14 | LICENSE= gnu-gpl-v2 | |
15 | 15 | |||
16 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
17 | GNU_CONFIGURE= yes | 17 | GNU_CONFIGURE= yes | |
18 | 18 | |||
19 | .include "../../mk/bsd.prefs.mk" | 19 | .include "../../mk/bsd.prefs.mk" | |
20 | .include "options.mk" | 20 | .include "options.mk" |
@@ -1,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | $NetBSD: distinfo,v 1.29 2010/06/02 13:34:45 taca Exp $ | 1 | $NetBSD: distinfo,v 1.30 2011/02/26 02:58:55 taca Exp $ | |
2 | 2 | |||
3 | SHA1 (mysql-5.0.91.tar.gz) = 14a79138a1296ce6ebb681fceba622d870feba3e | 3 | SHA1 (mysql-5.0.92.tar.gz) = 10fffc7672a469af4a7fd980922b04d7ba0143ba | |
4 | RMD160 (mysql-5.0.91.tar.gz) = 3aaa638172f6916d3698c5421b24a01647f7e9db | 4 | RMD160 (mysql-5.0.92.tar.gz) = 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 | |
5 | Size (mysql-5.0.91.tar.gz) = 22340514 bytes | 5 | Size (mysql-5.0.92.tar.gz) = 22440590 bytes | |
6 | SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec | 6 | SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec | |
7 | SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7 | 7 | SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7 | |
8 | SHA1 (patch-ac) = 66b6d0ffd3011df1dcf8f3be7f7300e975635d95 | 8 | SHA1 (patch-ac) = 66b6d0ffd3011df1dcf8f3be7f7300e975635d95 | |
9 | SHA1 (patch-ad) = 430b8ae2d13598eec90cfdc73d37d932dd97f217 | 9 | SHA1 (patch-ad) = 1cf8853882d60a2391d7eb41e9830dd89a8a58ce | |
10 | SHA1 (patch-ae) = f19a31c810bbccdda48c647743a819fdf58b195f | 10 | SHA1 (patch-ae) = f19a31c810bbccdda48c647743a819fdf58b195f | |
11 | SHA1 (patch-af) = 9e3ebe7eb161c7ed27bf13f1fb4969ac923ae859 | 11 | SHA1 (patch-af) = ed4a2fc3ed01b114157b20952ec4dbf2cf3d73b8 | |
12 | SHA1 (patch-ag) = dea43cde5695c04b1b9a9e919828d97d3e049c08 | 12 | SHA1 (patch-ag) = dea43cde5695c04b1b9a9e919828d97d3e049c08 | |
13 | SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7 | 13 | SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7 | |
14 | SHA1 (patch-ai) = 317c20011478c631b7d150bf84e82c9c5fbb0a76 | 14 | SHA1 (patch-ai) = 317c20011478c631b7d150bf84e82c9c5fbb0a76 | |
15 | SHA1 (patch-aj) = d3618dba74d97223e108b8b4a4ef2b5498d1c9b5 | 15 | SHA1 (patch-aj) = d3618dba74d97223e108b8b4a4ef2b5498d1c9b5 | |
16 | SHA1 (patch-al) = e028251a147246a2aa18ec6185bb2b160727a7f0 | 16 | SHA1 (patch-al) = e028251a147246a2aa18ec6185bb2b160727a7f0 | |
17 | SHA1 (patch-am) = 7fc6533477e6a0e826765106dd8d1b27cbc5695e | 17 | SHA1 (patch-am) = 7fc6533477e6a0e826765106dd8d1b27cbc5695e | |
18 | SHA1 (patch-an) = 49d1c45e549c7f39a2830401621458f9a5eb46bc | 18 | SHA1 (patch-an) = 49d1c45e549c7f39a2830401621458f9a5eb46bc | |
19 | SHA1 (patch-ao) = f69d47177787bd4b69fc8f81344b6e43fcdc5d88 | 19 | SHA1 (patch-ao) = f69d47177787bd4b69fc8f81344b6e43fcdc5d88 | |
20 | SHA1 (patch-ap) = fc4246e829a3b53b27ff2c6f5572eb4b13a277e5 | 20 | SHA1 (patch-ap) = fc4246e829a3b53b27ff2c6f5572eb4b13a277e5 | |
21 | SHA1 (patch-aq) = 18ed036f2df801124b8c717822ffc9c1224b27e3 | 21 | SHA1 (patch-aq) = 18ed036f2df801124b8c717822ffc9c1224b27e3 | |
22 | SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923 | 22 | SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923 | |
23 | SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d | 23 | SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d | |
24 | SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156 | 24 | SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156 |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: patch-ad,v 1.7 2007/10/12 14:32:46 rillig Exp $ | 1 | $NetBSD: patch-ad,v 1.8 2011/02/26 02:58:55 taca Exp $ | |
2 | 2 | |||
3 | --- Makefile.in.orig 2007-07-04 14:10:07.000000000 +0100 | 3 | --- Makefile.in.orig 2011-01-25 11:32:06.000000000 +0000 | |
4 | +++ Makefile.in 2007-07-15 17:20:48.000000000 +0100 | 4 | +++ Makefile.in | |
5 | @@ -374,12 +374,7 @@ | 5 | @@ -376,12 +376,7 @@ AUTOMAKE_OPTIONS = foreign | |
6 | EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ | 6 | EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ | |
7 | README COPYING EXCEPTIONS-CLIENT CMakeLists.txt | 7 | README COPYING CMakeLists.txt | |
8 | 8 | |||
9 | -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ | 9 | -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ | |
10 | - @readline_topdir@ sql-common scripts \ | 10 | - @readline_topdir@ sql-common scripts \ | |
11 | - @thread_dirs@ pstack \ | 11 | - @thread_dirs@ pstack \ | |
12 | - @sql_union_dirs@ @man_dirs@ tests \ | 12 | - @sql_union_dirs@ @man_dirs@ tests \ | |
13 | - netware @libmysqld_dirs@ \ | 13 | - netware @libmysqld_dirs@ \ | |
14 | - @bench_dirs@ support-files @tools_dirs@ | 14 | - @bench_dirs@ support-files @tools_dirs@ | |
15 | +SUBDIRS = . include @docs_dirs@ strings @sql_client_dirs@ scripts man | 15 | +SUBDIRS = . include @docs_dirs@ strings @sql_client_dirs@ scripts man | |
16 | 16 | |||
17 | DIST_SUBDIRS = . include @docs_dirs@ zlib \ | 17 | DIST_SUBDIRS = . include @docs_dirs@ zlib \ | |
18 | @readline_topdir@ sql-common \ | 18 | @readline_topdir@ sql-common \ |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-af,v 1.8 2010/02/18 15:46:10 taca Exp $ | 1 | $NetBSD: patch-af,v 1.9 2011/02/26 02:58:55 taca Exp $ | |
2 | 2 | |||
3 | --- man/Makefile.in.orig 2010-01-15 09:53:44.000000000 +0000 | 3 | --- man/Makefile.in.orig 2011-01-25 11:31:45.000000000 +0000 | |
4 | +++ man/Makefile.in | 4 | +++ man/Makefile.in | |
5 | @@ -349,8 +349,9 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@ | 5 | @@ -350,8 +350,9 @@ yassl_libs = @yassl_libs@ | |
6 | yassl_libs = @yassl_libs@ | |||
7 | yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ | 6 | yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ | |
7 | yassl_thread_cxxflags = @yassl_thread_cxxflags@ | |||
8 | zlib_dir = @zlib_dir@ | 8 | zlib_dir = @zlib_dir@ | |
9 | -man1_MANS = @man1_files@ | 9 | -man1_MANS = @man1_files@ | |
10 | -man8_MANS = @man8_files@ | 10 | -man8_MANS = @man8_files@ | |
11 | +man1_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \ | 11 | +man1_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \ | |
12 | + mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1 | 12 | + mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1 | |
13 | +man8_MANS = | 13 | +man8_MANS = | |
14 | EXTRA_DIST = $(man1_MANS) $(man8_MANS) | 14 | EXTRA_DIST = $(man1_MANS) $(man8_MANS) | |
15 | all: all-am | 15 | all: all-am | |
16 | 16 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.16 2010/02/18 15:46:10 taca Exp $ | 1 | @comment $NetBSD: PLIST,v 1.17 2011/02/26 02:58:55 taca Exp $ | |
2 | bin/comp_err | 2 | bin/comp_err | |
3 | bin/innochecksum | 3 | bin/innochecksum | |
4 | bin/my_print_defaults | 4 | bin/my_print_defaults | |
5 | bin/myisam_ftdump | 5 | bin/myisam_ftdump | |
6 | bin/myisamchk | 6 | bin/myisamchk | |
7 | bin/myisamlog | 7 | bin/myisamlog | |
8 | bin/myisampack | 8 | bin/myisampack | |
9 | bin/mysql.server | 9 | bin/mysql.server | |
10 | bin/mysql_client_test | 10 | bin/mysql_client_test | |
11 | bin/mysql_install_db | 11 | bin/mysql_install_db | |
12 | bin/mysql_secure_installation | 12 | bin/mysql_secure_installation | |
13 | bin/mysql_tzinfo_to_sql | 13 | bin/mysql_tzinfo_to_sql | |
14 | bin/mysql_waitpid | 14 | bin/mysql_waitpid | |
@@ -263,26 +263,27 @@ share/mysql-test/r/distinct.result | @@ -263,26 +263,27 @@ share/mysql-test/r/distinct.result | |||
263 | share/mysql-test/r/drop.result | 263 | share/mysql-test/r/drop.result | |
264 | share/mysql-test/r/drop_temp_table.result | 264 | share/mysql-test/r/drop_temp_table.result | |
265 | share/mysql-test/r/empty_table.result | 265 | share/mysql-test/r/empty_table.result | |
266 | share/mysql-test/r/endspace.result | 266 | share/mysql-test/r/endspace.result | |
267 | share/mysql-test/r/error_simulation.result | 267 | share/mysql-test/r/error_simulation.result | |
268 | share/mysql-test/r/errors.result | 268 | share/mysql-test/r/errors.result | |
269 | share/mysql-test/r/exampledb.result | 269 | share/mysql-test/r/exampledb.result | |
270 | share/mysql-test/r/execution_constants.result | 270 | share/mysql-test/r/execution_constants.result | |
271 | share/mysql-test/r/explain.result | 271 | share/mysql-test/r/explain.result | |
272 | share/mysql-test/r/federated.result | 272 | share/mysql-test/r/federated.result | |
273 | share/mysql-test/r/federated_archive.result | 273 | share/mysql-test/r/federated_archive.result | |
274 | share/mysql-test/r/federated_bug_13118.result | 274 | share/mysql-test/r/federated_bug_13118.result | |
275 | share/mysql-test/r/federated_bug_25714.result | 275 | share/mysql-test/r/federated_bug_25714.result | |
276 | share/mysql-test/r/federated_bug_35333.result | |||
276 | share/mysql-test/r/federated_debug.result | 277 | share/mysql-test/r/federated_debug.result | |
277 | share/mysql-test/r/federated_disabled.result | 278 | share/mysql-test/r/federated_disabled.result | |
278 | share/mysql-test/r/federated_innodb.result | 279 | share/mysql-test/r/federated_innodb.result | |
279 | share/mysql-test/r/fix_priv_tables.result | 280 | share/mysql-test/r/fix_priv_tables.result | |
280 | share/mysql-test/r/flush.result | 281 | share/mysql-test/r/flush.result | |
281 | share/mysql-test/r/flush2.result | 282 | share/mysql-test/r/flush2.result | |
282 | share/mysql-test/r/flush_block_commit.result | 283 | share/mysql-test/r/flush_block_commit.result | |
283 | share/mysql-test/r/flush_block_commit_notembedded.result | 284 | share/mysql-test/r/flush_block_commit_notembedded.result | |
284 | share/mysql-test/r/flush_read_lock_kill.result | 285 | share/mysql-test/r/flush_read_lock_kill.result | |
285 | share/mysql-test/r/flush_table.result | 286 | share/mysql-test/r/flush_table.result | |
286 | share/mysql-test/r/foreign_key.result | 287 | share/mysql-test/r/foreign_key.result | |
287 | share/mysql-test/r/fulltext.result | 288 | share/mysql-test/r/fulltext.result | |
288 | share/mysql-test/r/fulltext2.result | 289 | share/mysql-test/r/fulltext2.result | |
@@ -1535,26 +1536,27 @@ share/mysql-test/t/drop.test | @@ -1535,26 +1536,27 @@ share/mysql-test/t/drop.test | |||
1535 | share/mysql-test/t/drop_temp_table.test | 1536 | share/mysql-test/t/drop_temp_table.test | |
1536 | share/mysql-test/t/empty_table.test | 1537 | share/mysql-test/t/empty_table.test | |
1537 | share/mysql-test/t/endspace.test | 1538 | share/mysql-test/t/endspace.test | |
1538 | share/mysql-test/t/error_simulation-master.opt | 1539 | share/mysql-test/t/error_simulation-master.opt | |
1539 | share/mysql-test/t/error_simulation.test | 1540 | share/mysql-test/t/error_simulation.test | |
1540 | share/mysql-test/t/errors.test | 1541 | share/mysql-test/t/errors.test | |
1541 | share/mysql-test/t/exampledb.test | 1542 | share/mysql-test/t/exampledb.test | |
1542 | share/mysql-test/t/execution_constants.test | 1543 | share/mysql-test/t/execution_constants.test | |
1543 | share/mysql-test/t/explain.test | 1544 | share/mysql-test/t/explain.test | |
1544 | share/mysql-test/t/federated.test | 1545 | share/mysql-test/t/federated.test | |
1545 | share/mysql-test/t/federated_archive.test | 1546 | share/mysql-test/t/federated_archive.test | |
1546 | share/mysql-test/t/federated_bug_13118.test | 1547 | share/mysql-test/t/federated_bug_13118.test | |
1547 | share/mysql-test/t/federated_bug_25714.test | 1548 | share/mysql-test/t/federated_bug_25714.test | |
1549 | share/mysql-test/t/federated_bug_35333.test | |||
1548 | share/mysql-test/t/federated_debug-master.opt | 1550 | share/mysql-test/t/federated_debug-master.opt | |
1549 | share/mysql-test/t/federated_debug.test | 1551 | share/mysql-test/t/federated_debug.test | |
1550 | share/mysql-test/t/federated_disabled-master.opt | 1552 | share/mysql-test/t/federated_disabled-master.opt | |
1551 | share/mysql-test/t/federated_disabled.test | 1553 | share/mysql-test/t/federated_disabled.test | |
1552 | share/mysql-test/t/federated_innodb-slave.opt | 1554 | share/mysql-test/t/federated_innodb-slave.opt | |
1553 | share/mysql-test/t/federated_innodb.test | 1555 | share/mysql-test/t/federated_innodb.test | |
1554 | share/mysql-test/t/fix_priv_tables.test | 1556 | share/mysql-test/t/fix_priv_tables.test | |
1555 | share/mysql-test/t/flush.test | 1557 | share/mysql-test/t/flush.test | |
1556 | share/mysql-test/t/flush2-master.opt | 1558 | share/mysql-test/t/flush2-master.opt | |
1557 | share/mysql-test/t/flush2.test | 1559 | share/mysql-test/t/flush2.test | |
1558 | share/mysql-test/t/flush_block_commit.test | 1560 | share/mysql-test/t/flush_block_commit.test | |
1559 | share/mysql-test/t/flush_block_commit_notembedded.test | 1561 | share/mysql-test/t/flush_block_commit_notembedded.test | |
1560 | share/mysql-test/t/flush_read_lock_kill-master.opt | 1562 | share/mysql-test/t/flush_read_lock_kill-master.opt |
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | $NetBSD: distinfo,v 1.25 2010/06/02 13:34:45 taca Exp $ | 1 | $NetBSD: distinfo,v 1.26 2011/02/26 02:58:56 taca Exp $ | |
2 | 2 | |||
3 | SHA1 (mysql-5.0.91.tar.gz) = 14a79138a1296ce6ebb681fceba622d870feba3e | 3 | SHA1 (mysql-5.0.92.tar.gz) = 10fffc7672a469af4a7fd980922b04d7ba0143ba | |
4 | RMD160 (mysql-5.0.91.tar.gz) = 3aaa638172f6916d3698c5421b24a01647f7e9db | 4 | RMD160 (mysql-5.0.92.tar.gz) = 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 | |
5 | Size (mysql-5.0.91.tar.gz) = 22340514 bytes | 5 | Size (mysql-5.0.92.tar.gz) = 22440590 bytes | |
6 | SHA1 (patch-aa) = f52745512abfb2c2d43715975f76c2f454ed93e5 | 6 | SHA1 (patch-aa) = 4517f9e7445ccb6e7cdd6eee44af4fe3d8dc9513 | |
7 | SHA1 (patch-ab) = 7c51a0214c3e6205605047c72b07eac6792600db | 7 | SHA1 (patch-ab) = 7c51a0214c3e6205605047c72b07eac6792600db | |
8 | SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71 | 8 | SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71 | |
9 | SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec | 9 | SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec | |
10 | SHA1 (patch-ag) = abc6b85dd7d72b980f0768166eb77618d50e5102 | 10 | SHA1 (patch-ag) = 9b859106d70e266147a31abf4554312269aa799c | |
11 | SHA1 (patch-ah) = 822f1f0eace49ff44f03e708056b88e480443c15 | 11 | SHA1 (patch-ah) = 4a4f0071a9eab19eec3dcfb2e2cc7bbcf4849c20 | |
12 | SHA1 (patch-ai) = 56d3f66a903224b8d27213480e7ea3e485e52f1d | 12 | SHA1 (patch-ai) = 56d3f66a903224b8d27213480e7ea3e485e52f1d | |
13 | SHA1 (patch-aj) = b8516c18b1c2be5b3492ece583e9b8a85b89331a | 13 | SHA1 (patch-aj) = b8516c18b1c2be5b3492ece583e9b8a85b89331a | |
14 | SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea | 14 | SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea | |
15 | SHA1 (patch-al) = a8232565e70d199b77e044152dee3df52564724b | 15 | SHA1 (patch-al) = a8232565e70d199b77e044152dee3df52564724b | |
16 | SHA1 (patch-am) = cc551d150c5b0adee8906d428b87bdc88ea47a05 | 16 | SHA1 (patch-am) = cc551d150c5b0adee8906d428b87bdc88ea47a05 | |
17 | SHA1 (patch-an) = 1f7ede981f2e7a846f49a5cfd443051acf9f3a02 | 17 | SHA1 (patch-an) = 1f7ede981f2e7a846f49a5cfd443051acf9f3a02 | |
18 | SHA1 (patch-ap) = 70049d00e30d89201dd8d9fc0ace4e6edfcffae7 | 18 | SHA1 (patch-ap) = 70049d00e30d89201dd8d9fc0ace4e6edfcffae7 | |
19 | SHA1 (patch-aq) = e63b5be7cb1cb2e8ca8ee52e7e42632c05804959 | 19 | SHA1 (patch-aq) = e63b5be7cb1cb2e8ca8ee52e7e42632c05804959 | |
20 | SHA1 (patch-bf) = 180aefb012a0d17269654ba0aeb71ec74ea98e6c | 20 | SHA1 (patch-bf) = 180aefb012a0d17269654ba0aeb71ec74ea98e6c | |
21 | SHA1 (patch-ca) = 8d3f658a44a8d225a362b7f6135c772ee53ba5e3 | 21 | SHA1 (patch-ca) = 8d3f658a44a8d225a362b7f6135c772ee53ba5e3 | |
22 | SHA1 (patch-cb) = b3a6bcc6f201b3ba1068ebe2d0cef3fbb22ab621 | 22 | SHA1 (patch-cb) = b3a6bcc6f201b3ba1068ebe2d0cef3fbb22ab621 | |
23 | SHA1 (patch-cc) = 2d1347ba57e35da484edd4fa3c764441ec6a80ed | 23 | SHA1 (patch-cc) = 2d1347ba57e35da484edd4fa3c764441ec6a80ed |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: patch-aa,v 1.6 2010/02/18 15:46:10 taca Exp $ | 1 | $NetBSD: patch-aa,v 1.7 2011/02/26 02:58:56 taca Exp $ | |
2 | 2 | |||
3 | --- Makefile.in.orig 2010-01-15 09:54:05.000000000 +0000 | 3 | --- Makefile.in.orig 2011-01-25 11:32:06.000000000 +0000 | |
4 | +++ Makefile.in | 4 | +++ Makefile.in | |
5 | @@ -375,12 +375,8 @@ AUTOMAKE_OPTIONS = foreign | 5 | @@ -376,12 +376,8 @@ AUTOMAKE_OPTIONS = foreign | |
6 | EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ | 6 | EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ | |
7 | README COPYING EXCEPTIONS-CLIENT CMakeLists.txt | 7 | README COPYING CMakeLists.txt | |
8 | 8 | |||
9 | -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ | 9 | -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ | |
10 | - @readline_topdir@ sql-common scripts \ | 10 | - @readline_topdir@ sql-common scripts \ | |
11 | - @thread_dirs@ pstack \ | 11 | - @thread_dirs@ pstack \ | |
12 | - @sql_union_dirs@ @man_dirs@ tests \ | 12 | - @sql_union_dirs@ @man_dirs@ tests \ | |
13 | - netware @libmysqld_dirs@ \ | 13 | - netware @libmysqld_dirs@ \ | |
14 | - @bench_dirs@ support-files @tools_dirs@ | 14 | - @bench_dirs@ support-files @tools_dirs@ | |
15 | +SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \ | 15 | +SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \ | |
16 | + @bench_dirs@ support-files | 16 | + @bench_dirs@ support-files | |
17 | 17 | |||
18 | DIST_SUBDIRS = . include @docs_dirs@ zlib \ | 18 | DIST_SUBDIRS = . include @docs_dirs@ zlib \ | |
19 | @readline_topdir@ sql-common \ | 19 | @readline_topdir@ sql-common \ |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ag,v 1.8 2010/02/18 15:46:10 taca Exp $ | 1 | $NetBSD: patch-ag,v 1.9 2011/02/26 02:58:56 taca Exp $ | |
2 | 2 | |||
3 | --- man/Makefile.in.orig 2010-01-15 09:53:44.000000000 +0000 | 3 | --- man/Makefile.in.orig 2011-01-25 11:31:45.000000000 +0000 | |
4 | +++ man/Makefile.in | 4 | +++ man/Makefile.in | |
5 | @@ -349,7 +349,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@ | 5 | @@ -350,7 +350,7 @@ yassl_libs = @yassl_libs@ | |
6 | yassl_libs = @yassl_libs@ | |||
7 | yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ | 6 | yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ | |
7 | yassl_thread_cxxflags = @yassl_thread_cxxflags@ | |||
8 | zlib_dir = @zlib_dir@ | 8 | zlib_dir = @zlib_dir@ | |
9 | -man1_MANS = @man1_files@ | 9 | -man1_MANS = @man1_files@ | |
10 | +man1_MANS = mysqld_multi.1 | 10 | +man1_MANS = mysqld_multi.1 | |
11 | man8_MANS = @man8_files@ | 11 | man8_MANS = @man8_files@ | |
12 | EXTRA_DIST = $(man1_MANS) $(man8_MANS) | 12 | EXTRA_DIST = $(man1_MANS) $(man8_MANS) | |
13 | all: all-am | 13 | all: all-am |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: patch-ah,v 1.7 2010/02/18 15:46:10 taca Exp $ | 1 | $NetBSD: patch-ah,v 1.8 2011/02/26 02:58:56 taca Exp $ | |
2 | 2 | |||
3 | --- include/Makefile.in.orig 2010-01-15 09:53:42.000000000 +0000 | 3 | --- include/Makefile.in.orig 2011-01-25 11:31:43.000000000 +0000 | |
4 | +++ include/Makefile.in | 4 | +++ include/Makefile.in | |
5 | @@ -363,13 +363,7 @@ HEADERS_GEN = mysql_version.h my_config. | 5 | @@ -364,13 +364,7 @@ HEADERS_GEN = mysql_version.h my_config. | |
6 | HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ | 6 | HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ | |
7 | my_list.h my_alloc.h typelib.h | 7 | my_list.h my_alloc.h typelib.h | |
8 | 8 | |||
9 | -pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ | 9 | -pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ | |
10 | - my_xml.h mysql_embed.h \ | 10 | - my_xml.h mysql_embed.h \ | |
11 | - my_pthread.h my_no_pthread.h raid.h \ | 11 | - my_pthread.h my_no_pthread.h raid.h \ | |
12 | - decimal.h errmsg.h my_global.h my_net.h \ | 12 | - decimal.h errmsg.h my_global.h my_net.h \ | |
13 | - my_getopt.h sslopt-longopts.h my_dir.h \ | 13 | - my_getopt.h sslopt-longopts.h my_dir.h \ | |
14 | - sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ | 14 | - sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ | |
15 | - m_ctype.h my_attribute.h $(HEADERS_GEN) | 15 | - m_ctype.h my_attribute.h $(HEADERS_GEN) | |
16 | +pkginclude_HEADERS = | 16 | +pkginclude_HEADERS = | |
17 | 17 | |||
18 | noinst_HEADERS = config-win.h config-os2.h config-netware.h \ | 18 | noinst_HEADERS = config-win.h config-netware.h \ | |
19 | heap.h my_bitmap.h\ | 19 | heap.h my_bitmap.h\ |