diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql51-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/mysql51-client/distinfo | 10 | ||||
| -rw-r--r-- | databases/mysql51-client/patches/patch-ap | 8 | ||||
| -rw-r--r-- | databases/mysql51-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql51-server/PLIST | 216 | ||||
| -rw-r--r-- | databases/mysql51-server/distinfo | 19 | ||||
| -rw-r--r-- | databases/mysql51-server/patches/patch-ae | 17 | ||||
| -rw-r--r-- | databases/mysql51-server/patches/patch-aj | 8 | ||||
| -rw-r--r-- | databases/mysql51-server/patches/patch-ak | 8 | ||||
| -rw-r--r-- | databases/mysql51-server/patches/patch-ay | 22 | ||||
| -rw-r--r-- | databases/mysql51-server/patches/patch-az | 26 | ||||
| -rw-r--r-- | databases/mysql51-server/patches/patch-ba | 22 | ||||
| -rw-r--r-- | databases/mysql51-server/patches/patch-bb | 25 |
13 files changed, 304 insertions, 84 deletions
diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common index 7d136e8044a..98b85034414 100644 --- a/databases/mysql51-client/Makefile.common +++ b/databases/mysql51-client/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.8.2.1 2010/07/05 08:59:29 tron Exp $ +# $NetBSD: Makefile.common,v 1.8.2.2 2010/08/19 16:42:17 tron Exp $ # # used by databases/mysql51-client/Makefile # used by databases/mysql51-server/Makefile # -DISTNAME= mysql-5.1.48 +DISTNAME= mysql-5.1.49 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/} diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo index 3e899362ae1..1acdfb531e0 100644 --- a/databases/mysql51-client/distinfo +++ b/databases/mysql51-client/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4.2.1 2010/07/05 08:59:29 tron Exp $ +$NetBSD: distinfo,v 1.4.2.2 2010/08/19 16:42:17 tron Exp $ -SHA1 (mysql-5.1.48.tar.gz) = 61327d8588a73eb1ca61a91eefad9ce571bac588 -RMD160 (mysql-5.1.48.tar.gz) = 783575f5dc4ef004c8256878e6619d23cc33aae4 -Size (mysql-5.1.48.tar.gz) = 23362742 bytes +SHA1 (mysql-5.1.49.tar.gz) = c173614fa307eeed34607292205290715f20bcd5 +RMD160 (mysql-5.1.49.tar.gz) = e4d43fa48f1c2ffe16c16119422fd9f3d1c812b2 +Size (mysql-5.1.49.tar.gz) = 23687599 bytes SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 SHA1 (patch-ab) = 8bbbb84d659810031162475917ec233951c67ca4 SHA1 (patch-ac) = 5d5f1b67eb96254b821cf4a3e99eec26dd703bf6 @@ -18,7 +18,7 @@ SHA1 (patch-al) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec SHA1 (patch-am) = 7cced70246776a64e782e0c7d335d5948a2189f1 SHA1 (patch-an) = a608060cee7aadaf8bcde84016a73131a75dea32 SHA1 (patch-ao) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a -SHA1 (patch-ap) = 88dd29051ee68775cf15f3618a16c4f994e5e104 +SHA1 (patch-ap) = 187a956b4aa7ddbf7cb80d02d1c902757b0749be SHA1 (patch-aq) = d04016a2ab84709aee0c08aef71c2f79e82fc6f3 SHA1 (patch-ar) = bc0e2083ec285be8adac1027e63bf076e4c57211 SHA1 (patch-as) = 5eb3a9308b13a25fa813db0ed4a06f8e43db74f6 diff --git a/databases/mysql51-client/patches/patch-ap b/databases/mysql51-client/patches/patch-ap index c0ca8749743..1745ca3f97d 100644 --- a/databases/mysql51-client/patches/patch-ap +++ b/databases/mysql51-client/patches/patch-ap @@ -1,10 +1,10 @@ -$NetBSD: patch-ap,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ +$NetBSD: patch-ap,v 1.1.1.1.4.1 2010/08/19 16:42:18 tron Exp $ ---- man/Makefile.in.orig 2010-02-04 11:46:19.000000000 +0000 +--- man/Makefile.in.orig 2010-07-09 12:38:13.000000000 +0000 +++ man/Makefile.in -@@ -380,8 +380,9 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@ - yassl_libs = @yassl_libs@ +@@ -381,8 +381,9 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ + yassl_thread_cxxflags = @yassl_thread_cxxflags@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ -man8_MANS = @man8_files@ diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index d5cdb7ff40f..e16c2a9c0c6 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2010/04/24 15:59:23 taca Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2010/08/19 16:42:18 tron Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} +PKGREVISION= 1 SVR4_PKGNAME= mysqs COMMENT= MySQL 5, a free SQL database (server) diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST index 417c1c0a185..cc74a776022 100644 --- a/databases/mysql51-server/PLIST +++ b/databases/mysql51-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5.2.1 2010/07/05 08:59:29 tron Exp $ +@comment $NetBSD: PLIST,v 1.5.2.2 2010/08/19 16:42:18 tron Exp $ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump @@ -306,6 +306,7 @@ share/mysql-test/include/mtr_check.sql share/mysql-test/include/mtr_warnings.sql share/mysql-test/include/mysqlbinlog_row_engine.inc share/mysql-test/include/mysqldump.inc +share/mysql-test/include/mysqlhotcopy.inc share/mysql-test/include/mysqltest-x.inc share/mysql-test/include/ndb_backup.inc share/mysql-test/include/ndb_backup_print.inc @@ -693,19 +694,8 @@ share/mysql-test/r/information_schema_inno.result share/mysql-test/r/information_schema_part.result share/mysql-test/r/init_connect.result share/mysql-test/r/init_file.result -share/mysql-test/r/innodb-autoinc-optimize.result -share/mysql-test/r/innodb-ucs2.result -share/mysql-test/r/innodb_autoinc_lock_mode_zero.result -share/mysql-test/r/innodb_bug30919.result -share/mysql-test/r/innodb_bug42419.result -share/mysql-test/r/innodb_gis.result share/mysql-test/r/innodb_ignore_builtin.result -share/mysql-test/r/innodb_lock_wait_timeout_1.result -share/mysql-test/r/innodb_mysql.result share/mysql-test/r/innodb_mysql_lock2.result -share/mysql-test/r/innodb_mysql_rbk.result -share/mysql-test/r/innodb_notembedded.result -share/mysql-test/r/innodb_timeout_rollback.result share/mysql-test/r/insert.result share/mysql-test/r/insert_notembedded.result share/mysql-test/r/insert_select.result @@ -793,6 +783,8 @@ share/mysql-test/r/mysqldump-max.result share/mysql-test/r/mysqldump-no-binlog.result share/mysql-test/r/mysqldump.result share/mysql-test/r/mysqldump_restore.result +share/mysql-test/r/mysqlhotcopy_archive.result +share/mysql-test/r/mysqlhotcopy_myisam.result share/mysql-test/r/mysqlshow.result share/mysql-test/r/mysqlslap.result share/mysql-test/r/mysqltest.result @@ -1082,6 +1074,7 @@ share/mysql-test/std_data/funcs_1/t4.txt share/mysql-test/std_data/funcs_1/t7.txt share/mysql-test/std_data/funcs_1/t9.txt share/mysql-test/std_data/init_file.dat +share/mysql-test/std_data/intersect-bug50389.tsv share/mysql-test/std_data/latin1.xml share/mysql-test/std_data/loaddata1.dat share/mysql-test/std_data/loaddata2.dat @@ -2610,12 +2603,16 @@ share/mysql-test/suite/funcs_2/t/myisam_charset.test share/mysql-test/suite/funcs_2/t/ndb_charset.test share/mysql-test/suite/funcs_2/t/suite.opt share/mysql-test/suite/innodb/r/innodb-autoinc-44030.result +share/mysql-test/suite/innodb/r/innodb-autoinc-optimize.result share/mysql-test/suite/innodb/r/innodb-autoinc.result share/mysql-test/suite/innodb/r/innodb-lock.result share/mysql-test/suite/innodb/r/innodb-replace.result share/mysql-test/suite/innodb/r/innodb-semi-consistent.result +share/mysql-test/suite/innodb/r/innodb-ucs2.result share/mysql-test/suite/innodb/r/innodb.result +share/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result share/mysql-test/suite/innodb/r/innodb_bug21704.result +share/mysql-test/suite/innodb/r/innodb_bug30919.result share/mysql-test/suite/innodb/r/innodb_bug34053.result share/mysql-test/suite/innodb/r/innodb_bug34300.result share/mysql-test/suite/innodb/r/innodb_bug35220.result @@ -2624,6 +2621,7 @@ share/mysql-test/suite/innodb/r/innodb_bug39438.result share/mysql-test/suite/innodb/r/innodb_bug40565.result share/mysql-test/suite/innodb/r/innodb_bug42101-nonzero.result share/mysql-test/suite/innodb/r/innodb_bug42101.result +share/mysql-test/suite/innodb/r/innodb_bug42419.result share/mysql-test/suite/innodb/r/innodb_bug44369.result share/mysql-test/suite/innodb/r/innodb_bug45357.result share/mysql-test/suite/innodb/r/innodb_bug46000.result @@ -2633,19 +2631,33 @@ share/mysql-test/suite/innodb/r/innodb_bug48024.result share/mysql-test/suite/innodb/r/innodb_bug49164.result share/mysql-test/suite/innodb/r/innodb_bug51920.result share/mysql-test/suite/innodb/r/innodb_bug52663.result +share/mysql-test/suite/innodb/r/innodb_bug53674.result +share/mysql-test/suite/innodb/r/innodb_bug54044.result +share/mysql-test/suite/innodb/r/innodb_gis.result +share/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result share/mysql-test/suite/innodb/r/innodb_misc1.result share/mysql-test/suite/innodb/r/innodb_multi_update.result +share/mysql-test/suite/innodb/r/innodb_mysql.result +share/mysql-test/suite/innodb/r/innodb_mysql_rbk.result +share/mysql-test/suite/innodb/r/innodb_notembedded.result +share/mysql-test/suite/innodb/r/innodb_timeout_rollback.result share/mysql-test/suite/innodb/r/innodb_trx_weight.result share/mysql-test/suite/innodb/t/disabled.def share/mysql-test/suite/innodb/t/innodb-autoinc-44030.test +share/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test share/mysql-test/suite/innodb/t/innodb-autoinc.test share/mysql-test/suite/innodb/t/innodb-lock.test share/mysql-test/suite/innodb/t/innodb-master.opt share/mysql-test/suite/innodb/t/innodb-replace.test share/mysql-test/suite/innodb/t/innodb-semi-consistent-master.opt share/mysql-test/suite/innodb/t/innodb-semi-consistent.test +share/mysql-test/suite/innodb/t/innodb-ucs2.test share/mysql-test/suite/innodb/t/innodb.test +share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt +share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test share/mysql-test/suite/innodb/t/innodb_bug21704.test +share/mysql-test/suite/innodb/t/innodb_bug30919-master.opt +share/mysql-test/suite/innodb/t/innodb_bug30919.test share/mysql-test/suite/innodb/t/innodb_bug34053.test share/mysql-test/suite/innodb/t/innodb_bug34300.test share/mysql-test/suite/innodb/t/innodb_bug35220.test @@ -2656,6 +2668,7 @@ share/mysql-test/suite/innodb/t/innodb_bug40565.test share/mysql-test/suite/innodb/t/innodb_bug42101-nonzero-master.opt share/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test share/mysql-test/suite/innodb/t/innodb_bug42101.test +share/mysql-test/suite/innodb/t/innodb_bug42419.test share/mysql-test/suite/innodb/t/innodb_bug44369.test share/mysql-test/suite/innodb/t/innodb_bug45357.test share/mysql-test/suite/innodb/t/innodb_bug46000.test @@ -2666,10 +2679,166 @@ share/mysql-test/suite/innodb/t/innodb_bug49164.test share/mysql-test/suite/innodb/t/innodb_bug51920.test share/mysql-test/suite/innodb/t/innodb_bug52663-master.opt share/mysql-test/suite/innodb/t/innodb_bug52663.test +share/mysql-test/suite/innodb/t/innodb_bug53674-master.opt +share/mysql-test/suite/innodb/t/innodb_bug53674.test +share/mysql-test/suite/innodb/t/innodb_bug54044.test +share/mysql-test/suite/innodb/t/innodb_gis.test +share/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt +share/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test share/mysql-test/suite/innodb/t/innodb_misc1-master.opt share/mysql-test/suite/innodb/t/innodb_misc1.test share/mysql-test/suite/innodb/t/innodb_multi_update.test +share/mysql-test/suite/innodb/t/innodb_mysql-master.opt +share/mysql-test/suite/innodb/t/innodb_mysql.test +share/mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt +share/mysql-test/suite/innodb/t/innodb_mysql_rbk.test +share/mysql-test/suite/innodb/t/innodb_notembedded.test +share/mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt +share/mysql-test/suite/innodb/t/innodb_timeout_rollback.test share/mysql-test/suite/innodb/t/innodb_trx_weight.test +share/mysql-test/suite/innodb_plugin/include/ctype_innodb_like.inc +share/mysql-test/suite/innodb_plugin/include/innodb-index.inc +share/mysql-test/suite/innodb_plugin/include/innodb_trx_weight.inc +share/mysql-test/suite/innodb_plugin/r/innodb-analyze.result +share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-44030.result +share/mysql-test/suite/innodb_plugin/r/innodb-autoinc-optimize.result +share/mysql-test/suite/innodb_plugin/r/innodb-autoinc.result +share/mysql-test/suite/innodb_plugin/r/innodb-consistent.result +share/mysql-test/suite/innodb_plugin/r/innodb-index.result +share/mysql-test/suite/innodb_plugin/r/innodb-index_ucs2.result +share/mysql-test/suite/innodb_plugin/r/innodb-lock.result +share/mysql-test/suite/innodb_plugin/r/innodb-replace.result +share/mysql-test/suite/innodb_plugin/r/innodb-semi-consistent.result +share/mysql-test/suite/innodb_plugin/r/innodb-timeout.result +share/mysql-test/suite/innodb_plugin/r/innodb-ucs2.result +share/mysql-test/suite/innodb_plugin/r/innodb-use-sys-malloc.result +share/mysql-test/suite/innodb_plugin/r/innodb-zip.result +share/mysql-test/suite/innodb_plugin/r/innodb.result +share/mysql-test/suite/innodb_plugin/r/innodb_autoinc_lock_mode_zero.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug21704.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug30919.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug34053.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug34300.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug35220.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug36169.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug36172.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug38231.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug39438.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug40360.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug40565.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug41904.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug42101-nonzero.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug42101.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug42419.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug44032.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug44369.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug44571.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug45357.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug46000.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug46676.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug47167.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug47621.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug47622.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug47777.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug48024.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug49164.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug51378.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug51920.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug52663.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug52745.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug53290.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug53591.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug53592.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug53674.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug54044.result +share/mysql-test/suite/innodb_plugin/r/innodb_bug54679.result +share/mysql-test/suite/innodb_plugin/r/innodb_file_format.result +share/mysql-test/suite/innodb_plugin/r/innodb_gis.result +share/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result +share/mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result +share/mysql-test/suite/innodb_plugin/r/innodb_multi_update.result +share/mysql-test/suite/innodb_plugin/r/innodb_mysql.result +share/mysql-test/suite/innodb_plugin/r/innodb_mysql_rbk.result +share/mysql-test/suite/innodb_plugin/r/innodb_notembedded.result +share/mysql-test/suite/innodb_plugin/r/innodb_timeout_rollback.result +share/mysql-test/suite/innodb_plugin/r/innodb_trx_weight.result +share/mysql-test/suite/innodb_plugin/t/disabled.def +share/mysql-test/suite/innodb_plugin/t/innodb-analyze.test +share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test +share/mysql-test/suite/innodb_plugin/t/innodb-autoinc-optimize.test +share/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test +share/mysql-test/suite/innodb_plugin/t/innodb-consistent-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb-consistent.test +share/mysql-test/suite/innodb_plugin/t/innodb-index.test +share/mysql-test/suite/innodb_plugin/t/innodb-index_ucs2.test +share/mysql-test/suite/innodb_plugin/t/innodb-lock.test +share/mysql-test/suite/innodb_plugin/t/innodb-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb-replace.test +share/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent.test +share/mysql-test/suite/innodb_plugin/t/innodb-timeout.test +share/mysql-test/suite/innodb_plugin/t/innodb-ucs2.test +share/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test +share/mysql-test/suite/innodb_plugin/t/innodb-zip.test +share/mysql-test/suite/innodb_plugin/t/innodb.test +share/mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb_autoinc_lock_mode_zero.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug21704.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug30919-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb_bug30919.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug34053.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug34300.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug35220.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug36169.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug36172.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug38231.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug39438-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb_bug39438.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug40360.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug40565.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug41904.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug42101-nonzero-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb_bug42101-nonzero.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug42101.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug42419.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug44032.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug44369.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug44571.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug45357.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug46000.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug46676.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug47621.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug47622.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug47777.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug48024.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug49164.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug51378.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug52663.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug52745.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug53290.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug53591.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug53592.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug53674-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb_bug53674.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug54044.test +share/mysql-test/suite/innodb_plugin/t/innodb_bug54679.test +share/mysql-test/suite/innodb_plugin/t/innodb_file_format.test +share/mysql-test/suite/innodb_plugin/t/innodb_gis.test +share/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test +share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test +share/mysql-test/suite/innodb_plugin/t/innodb_multi_update.test +share/mysql-test/suite/innodb_plugin/t/innodb_mysql-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb_mysql.test +share/mysql-test/suite/innodb_plugin/t/innodb_mysql_rbk-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb_mysql_rbk.test +share/mysql-test/suite/innodb_plugin/t/innodb_notembedded.test +share/mysql-test/suite/innodb_plugin/t/innodb_timeout_rollback-master.opt +share/mysql-test/suite/innodb_plugin/t/innodb_timeout_rollback.test +share/mysql-test/suite/innodb_plugin/t/innodb_trx_weight.test share/mysql-test/suite/jp/include/trim_sjis.inc share/mysql-test/suite/jp/r/jp_alter_sjis.result share/mysql-test/suite/jp/r/jp_alter_ucs2.result @@ -3498,9 +3667,9 @@ share/mysql-test/suite/rpl/r/rpl_row_colSize.result share/mysql-test/suite/rpl/r/rpl_row_conflicts.result share/mysql-test/suite/rpl/r/rpl_row_create_table.result share/mysql-test/suite/rpl/r/rpl_row_delayed_ins.result -share/mysql-test/suite/rpl/r/rpl_row_disabled_slave_key.result share/mysql-test/suite/rpl/r/rpl_row_drop.result share/mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result +share/mysql-test/suite/rpl/r/rpl_row_find_row.result share/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result share/mysql-test/suite/rpl/r/rpl_row_func001.result share/mysql-test/suite/rpl/r/rpl_row_func002.result @@ -3817,10 +3986,10 @@ share/mysql-test/suite/rpl/t/rpl_row_colSize.test share/mysql-test/suite/rpl/t/rpl_row_conflicts.test share/mysql-test/suite/rpl/t/rpl_row_create_table.test share/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test -share/mysql-test/suite/rpl/t/rpl_row_disabled_slave_key.test share/mysql-test/suite/rpl/t/rpl_row_drop.test share/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt share/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt +share/mysql-test/suite/rpl/t/rpl_row_find_row.test share/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test share/mysql-test/suite/rpl/t/rpl_row_func001.test share/mysql-test/suite/rpl/t/rpl_row_func002.test @@ -4311,26 +4480,9 @@ share/mysql-test/t/init_connect-master.opt share/mysql-test/t/init_connect.test share/mysql-test/t/init_file-master.opt share/mysql-test/t/init_file.test -share/mysql-test/t/innodb-autoinc-optimize.test -share/mysql-test/t/innodb-ucs2.test -share/mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt -share/mysql-test/t/innodb_autoinc_lock_mode_zero.test -share/mysql-test/t/innodb_bug30919-master.opt -share/mysql-test/t/innodb_bug30919.test -share/mysql-test/t/innodb_bug42419.test -share/mysql-test/t/innodb_gis.test share/mysql-test/t/innodb_ignore_builtin-master.opt share/mysql-test/t/innodb_ignore_builtin.test -share/mysql-test/t/innodb_lock_wait_timeout_1-master.opt -share/mysql-test/t/innodb_lock_wait_timeout_1.test -share/mysql-test/t/innodb_mysql-master.opt -share/mysql-test/t/innodb_mysql.test share/mysql-test/t/innodb_mysql_lock2.test -share/mysql-test/t/innodb_mysql_rbk-master.opt -share/mysql-test/t/innodb_mysql_rbk.test -share/mysql-test/t/innodb_notembedded.test -share/mysql-test/t/innodb_timeout_rollback-master.opt -share/mysql-test/t/innodb_timeout_rollback.test share/mysql-test/t/insert.test share/mysql-test/t/insert_notembedded.test share/mysql-test/t/insert_select.test @@ -4444,6 +4596,8 @@ share/mysql-test/t/mysqldump-no-binlog-master.opt share/mysql-test/t/mysqldump-no-binlog.test share/mysql-test/t/mysqldump.test share/mysql-test/t/mysqldump_restore.test +share/mysql-test/t/mysqlhotcopy_archive.test +share/mysql-test/t/mysqlhotcopy_myisam.test share/mysql-test/t/mysqlshow.test share/mysql-test/t/mysqlslap.test share/mysql-test/t/mysqltest.test diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index 7e98b542d98..675c7380dc7 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1,19 +1,19 @@ -$NetBSD: distinfo,v 1.6.2.1 2010/07/05 08:59:29 tron Exp $ +$NetBSD: distinfo,v 1.6.2.2 2010/08/19 16:42:18 tron Exp $ -SHA1 (mysql-5.1.48.tar.gz) = 61327d8588a73eb1ca61a91eefad9ce571bac588 -RMD160 (mysql-5.1.48.tar.gz) = 783575f5dc4ef004c8256878e6619d23cc33aae4 -Size (mysql-5.1.48.tar.gz) = 23362742 bytes +SHA1 (mysql-5.1.49.tar.gz) = c173614fa307eeed34607292205290715f20bcd5 +RMD160 (mysql-5.1.49.tar.gz) = e4d43fa48f1c2ffe16c16119422fd9f3d1c812b2 +Size (mysql-5.1.49.tar.gz) = 23687599 bytes SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51 -SHA1 (patch-ae) = c7f8c12c64835650b80aed4fef44d44b15f3f11e +SHA1 (patch-ae) = e682e8c7a260706cbfd802885bfe100c0e0d31be SHA1 (patch-af) = 1e13ba542b4fc2a1d59fc822d06c76bc4e92dc23 SHA1 (patch-ag) = c510685dd71e4e3a632c9bf01e4e36eb42945d9e SHA1 (patch-ah) = a608060cee7aadaf8bcde84016a73131a75dea32 SHA1 (patch-ai) = 4c5acf2b0e05765a1fe9e30558d163886e1aa492 -SHA1 (patch-aj) = 6dd73cd38840e1faf103ffb02ae7c0e53475ee04 -SHA1 (patch-ak) = 5c0bd81635dcea038499f1b03180c22220b0009e +SHA1 (patch-aj) = b8f35d3a1bc45eb5336ae6a842898b257d2660db +SHA1 (patch-ak) = 3c740b78afacfe05aa082c5b235c10c51ac94641 SHA1 (patch-am) = 2cf10915f5dc3caf11bb8c7c7255842da646b247 SHA1 (patch-an) = 7b627ceb6212641b7e0de9fd7142bc95e4dcb8cb SHA1 (patch-ao) = 7895abad117d5c6901c2241209c5747e6c490e7d @@ -25,4 +25,7 @@ SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631 SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68 SHA1 (patch-aw) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a -SHA1 (patch-ay) = df6c75d7a1b27a046dac7467fb5e44be4e35281c +SHA1 (patch-ay) = f70896ae71e0ca7840e9966f43c757dd5b6c87b9 +SHA1 (patch-az) = cfe77df58645dfad65ce4ff8eae868f059231233 +SHA1 (patch-ba) = f595d2063ff18c0afb7e45c41d84a22ca9c99b44 +SHA1 (patch-bb) = 11f23c63a14d301a7dfa67d6c399a748ec5631b2 diff --git a/databases/mysql51-server/patches/patch-ae b/databases/mysql51-server/patches/patch-ae index f12aa2585a6..6f9dba8824b 100644 --- a/databases/mysql51-server/patches/patch-ae +++ b/databases/mysql51-server/patches/patch-ae @@ -1,8 +1,19 @@ -$NetBSD: patch-ae,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $ +$NetBSD: patch-ae,v 1.1.1.1.4.1 2010/08/19 16:42:18 tron Exp $ ---- configure.in.orig 2010-02-04 11:36:59.000000000 +0000 +* check sizeof time_t. +* check existence of sigsend(). + +--- configure.in.orig 2010-07-09 12:34:57.000000000 +0000 +++ configure.in -@@ -2023,7 +2023,7 @@ AC_CHECK_HEADERS(varargs.h stdarg.h dire +@@ -1946,6 +1946,7 @@ if test "$ac_cv_sizeof_off_t" -eq 0 + then + AC_MSG_ERROR("MySQL needs a off_t type.") + fi ++AC_CHECK_SIZEOF(time_t, 4) + + dnl + dnl check if time_t is unsigned +@@ -2039,7 +2040,7 @@ AC_CHECK_HEADERS(varargs.h stdarg.h dire paths.h semaphore.h) # Already-done: strcasecmp diff --git a/databases/mysql51-server/patches/patch-aj b/databases/mysql51-server/patches/patch-aj index dc8ea084f9f..66b7b5f2ecb 100644 --- a/databases/mysql51-server/patches/patch-aj +++ b/databases/mysql51-server/patches/patch-aj @@ -1,10 +1,10 @@ -$NetBSD: patch-aj,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $ +$NetBSD: patch-aj,v 1.1.1.1.4.1 2010/08/19 16:42:18 tron Exp $ ---- man/Makefile.in.orig 2010-02-04 11:46:19.000000000 +0000 +--- man/Makefile.in.orig 2010-07-09 12:38:13.000000000 +0000 +++ man/Makefile.in -@@ -380,7 +380,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@ - yassl_libs = @yassl_libs@ +@@ -381,7 +381,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ + yassl_thread_cxxflags = @yassl_thread_cxxflags@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ +man1_MANS = mysqld_multi.1 diff --git a/databases/mysql51-server/patches/patch-ak b/databases/mysql51-server/patches/patch-ak index ff85e1277f7..7e82a6310db 100644 --- a/databases/mysql51-server/patches/patch-ak +++ b/databases/mysql51-server/patches/patch-ak @@ -1,9 +1,9 @@ -$NetBSD: patch-ak,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $ +$NetBSD: patch-ak,v 1.1.1.1.4.1 2010/08/19 16:42:18 tron Exp $ ---- mysql-test/Makefile.in.orig 2010-02-04 11:46:20.000000000 +0000 +--- mysql-test/Makefile.in.orig 2010-07-09 12:38:13.000000000 +0000 +++ mysql-test/Makefile.in -@@ -401,7 +401,7 @@ yassl_libs = @yassl_libs@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ +@@ -402,7 +402,7 @@ yassl_taocrypt_extra_cxxflags = @yassl_t + yassl_thread_cxxflags = @yassl_thread_cxxflags@ zlib_dir = @zlib_dir@ testroot = $(prefix) -testdir = $(testroot)/mysql-test diff --git a/databases/mysql51-server/patches/patch-ay b/databases/mysql51-server/patches/patch-ay deleted file mode 100644 index d48cee69596..00000000000 --- a/databases/mysql51-server/patches/patch-ay +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ay,v 1.1 2010/05/26 01:52:22 taca Exp $ - -Fix build problem. - ---- sql/sql_connect.cc.orig 2010-05-06 15:27:31.000000000 +0000 -+++ sql/sql_connect.cc -@@ -471,6 +471,7 @@ check_user(THD *thd, enum enum_server_co - } - my_ok(thd); - thd->password= test(passwd_len); // remember for error messages -+#ifndef EMBEDDED_LIBRARY - /* - Allow the network layer to skip big packets. Although a malicious - authenticated session might use this to trick the server to read -@@ -478,6 +479,7 @@ check_user(THD *thd, enum enum_server_co - that needs to be preserved as to not break backwards compatibility. - */ - thd->net.skip_big_packet= TRUE; -+#endif - /* Ready to handle queries */ - DBUG_RETURN(0); - } diff --git a/databases/mysql51-server/patches/patch-az b/databases/mysql51-server/patches/patch-az new file mode 100644 index 00000000000..18d423019a0 --- /dev/null +++ b/databases/mysql51-server/patches/patch-az @@ -0,0 +1,26 @@ +$NetBSD: patch-az,v 1.1.2.2 2010/08/19 16:42:18 tron Exp $ + +* if long is int64_t and time_t is int32_t, "(time_t) MY_TIME_T_MAX" + results -1 and server_start_time is always parsed as exceeding limit. + So, use TIMESTAMP_MAX_VALUE which is INT_MAX32. +* if time_t is int32_t, comparsion with TIMESTAMP_MAX_VALUE is always + true here. So, limit the comparsion to other cases. + +--- sql/mysqld.cc.orig 2010-07-09 12:34:57.000000000 +0000 ++++ sql/mysqld.cc +@@ -3240,12 +3240,13 @@ static int init_common_variables(const c + + max_system_variables.pseudo_thread_id= (ulong)~0; + server_start_time= flush_status_time= my_time(0); +- /* TODO: remove this when my_time_t is 64 bit compatible */ +- if (server_start_time >= (time_t) MY_TIME_T_MAX) ++#if defined(TIME_T_UNSIGNE) || (SIZEOF_TIME_T > 4) ++ if (server_start_time >= TIMESTAMP_MAX_VALUE) + { + sql_print_error("This MySQL server doesn't support dates later then 2038"); + return 1; + } ++#endif + + rpl_filter= new Rpl_filter; + binlog_filter= new Rpl_filter; diff --git a/databases/mysql51-server/patches/patch-ba b/databases/mysql51-server/patches/patch-ba new file mode 100644 index 00000000000..a4de35dcfa1 --- /dev/null +++ b/databases/mysql51-server/patches/patch-ba @@ -0,0 +1,22 @@ +$NetBSD: patch-ba,v 1.1.2.2 2010/08/19 16:42:18 tron Exp $ + +* if long is int64_t and time_t is int32_t, "(time_t) MY_TIME_T_MAX" + results -1 and val is always parsed as exceeding limit. + So, use TIMESTAMP_MAX_VALUE which is INT_MAX32 and make val to ulonglong + for safer comparsion. + +--- sql/set_var.cc.orig 2010-07-09 12:34:53.000000000 +0000 ++++ sql/set_var.cc +@@ -2720,10 +2720,9 @@ int set_var_collation_client::update(THD + + bool sys_var_timestamp::check(THD *thd, set_var *var) + { +- time_t val; ++ ulonglong val; + var->save_result.ulonglong_value= var->value->val_int(); +- val= (time_t) var->save_result.ulonglong_value; +- if (val < (time_t) MY_TIME_T_MIN || val > (time_t) MY_TIME_T_MAX) ++ if (val < TIMESTAMP_MIN_VALUE || val > TIMESTAMP_MAX_VALUE) + { + my_message(ER_UNKNOWN_ERROR, + "This version of MySQL doesn't support dates later than 2038", diff --git a/databases/mysql51-server/patches/patch-bb b/databases/mysql51-server/patches/patch-bb new file mode 100644 index 00000000000..18939397bae --- /dev/null +++ b/databases/mysql51-server/patches/patch-bb @@ -0,0 +1,25 @@ +$NetBSD: patch-bb,v 1.1.2.2 2010/08/19 16:42:18 tron Exp $ + +* if long is int64_t and time_t is int32_t, "(time_t) MY_TIME_T_MAX" + results -1 and server_start_time is always parsed as exceeding limit. + So, use TIMESTAMP_MAX_VALUE which is INT_MAX32. +* if time_t is int32_t, comparsion with TIMESTAMP_MAX_VALUE is always + true here. So, limit the comparsion to other cases. + +--- sql/sql_class.h.orig 2010-07-09 12:34:57.000000000 +0000 ++++ sql/sql_class.h +@@ -2031,8 +2031,12 @@ public: + } + /*TODO: this will be obsolete when we have support for 64 bit my_time_t */ + inline bool is_valid_time() +- { +- return (start_time < (time_t) MY_TIME_T_MAX); ++ { ++#if defined(TIME_T_UNSIGNE) || (SIZEOF_TIME_T > 4) ++ return (start_time < TIMESTAMP_MAX_VALUE); ++#else ++ return 1; ++#endif + } + void set_time_after_lock() { utime_after_lock= my_micro_time(); } + ulonglong current_utime() { return my_micro_time(); } |