diff options
| -rw-r--r-- | databases/mysql51-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/mysql51-client/distinfo | 8 | ||||
| -rw-r--r-- | databases/mysql51-server/PLIST | 148 | ||||
| -rw-r--r-- | databases/mysql51-server/distinfo | 9 | ||||
| -rw-r--r-- | databases/mysql51-server/patches/patch-ay | 22 |
5 files changed, 92 insertions, 99 deletions
diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common index a37e84029db..7ab3cfbe9a4 100644 --- a/databases/mysql51-client/Makefile.common +++ b/databases/mysql51-client/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.7 2010/04/30 06:03:36 obache Exp $ +# $NetBSD: Makefile.common,v 1.8 2010/05/26 01:52:21 taca Exp $ # # used by databases/mysql51-client/Makefile # used by databases/mysql51-server/Makefile # -DISTNAME= mysql-5.1.46 +DISTNAME= mysql-5.1.47 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/} diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo index bfb1a3b8093..5ea95d6e8c7 100644 --- a/databases/mysql51-client/distinfo +++ b/databases/mysql51-client/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2010/04/24 15:59:23 taca Exp $ +$NetBSD: distinfo,v 1.4 2010/05/26 01:52:21 taca Exp $ -SHA1 (mysql-5.1.46.tar.gz) = 5df6cf8a24b80cb74301c8275b26391262c5ff76 -RMD160 (mysql-5.1.46.tar.gz) = 1237834db314282f6213724ed3f249d1443c41ad -Size (mysql-5.1.46.tar.gz) = 23510197 bytes +SHA1 (mysql-5.1.47.tar.gz) = 9ea8b2cfedb366b884eaeb37757de1cdbbd85b45 +RMD160 (mysql-5.1.47.tar.gz) = ee399fe1ba393c9cd4c19ec43ccea68a6a9f43e3 +Size (mysql-5.1.47.tar.gz) = 23817441 bytes SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 SHA1 (patch-ab) = 8bbbb84d659810031162475917ec233951c67ca4 SHA1 (patch-ac) = 5d5f1b67eb96254b821cf4a3e99eec26dd703bf6 diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST index 8877f7b4432..3bbca287b00 100644 --- a/databases/mysql51-server/PLIST +++ b/databases/mysql51-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2010/04/24 15:59:23 taca Exp $ +@comment $NetBSD: PLIST,v 1.5 2010/05/26 01:52:22 taca Exp $ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump @@ -247,6 +247,7 @@ share/mysql-test/include/have_gb2312.inc share/mysql-test/include/have_gbk.inc share/mysql-test/include/have_geometry.inc share/mysql-test/include/have_innodb.inc +share/mysql-test/include/have_innodb_plugin.inc share/mysql-test/include/have_koi8r.inc share/mysql-test/include/have_latin2_ch.inc share/mysql-test/include/have_local_infile.inc @@ -465,6 +466,7 @@ share/mysql-test/r/bool.result share/mysql-test/r/bootstrap.result share/mysql-test/r/bug39022.result share/mysql-test/r/bug46080.result +share/mysql-test/r/bug46261.result share/mysql-test/r/bug46760.result share/mysql-test/r/bug47671.result share/mysql-test/r/bulk_replace.result @@ -683,31 +685,11 @@ 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-44030.result share/mysql-test/r/innodb-autoinc-optimize.result -share/mysql-test/r/innodb-autoinc.result -share/mysql-test/r/innodb-lock.result -share/mysql-test/r/innodb-replace.result -share/mysql-test/r/innodb-semi-consistent.result share/mysql-test/r/innodb-ucs2.result -share/mysql-test/r/innodb.result share/mysql-test/r/innodb_autoinc_lock_mode_zero.result -share/mysql-test/r/innodb_bug21704.result share/mysql-test/r/innodb_bug30919.result -share/mysql-test/r/innodb_bug34053.result -share/mysql-test/r/innodb_bug34300.result -share/mysql-test/r/innodb_bug35220.result -share/mysql-test/r/innodb_bug38231.result -share/mysql-test/r/innodb_bug39438.result -share/mysql-test/r/innodb_bug40565.result -share/mysql-test/r/innodb_bug42101-nonzero.result -share/mysql-test/r/innodb_bug42101.result share/mysql-test/r/innodb_bug42419.result -share/mysql-test/r/innodb_bug44369.result -share/mysql-test/r/innodb_bug45357.result -share/mysql-test/r/innodb_bug46000.result -share/mysql-test/r/innodb_bug47621.result -share/mysql-test/r/innodb_bug47777.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 @@ -715,7 +697,6 @@ share/mysql-test/r/innodb_mysql.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/innodb_trx_weight.result share/mysql-test/r/insert.result share/mysql-test/r/insert_notembedded.result share/mysql-test/r/insert_select.result @@ -2618,49 +2599,61 @@ share/mysql-test/suite/funcs_2/t/memory_charset.test 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/include/have_innodb_plugin.inc -share/mysql-test/suite/innodb/include/innodb-index.inc -share/mysql-test/suite/innodb/r/innodb-analyze.result -share/mysql-test/suite/innodb/r/innodb-consistent.result -share/mysql-test/suite/innodb/r/innodb-index.result -share/mysql-test/suite/innodb/r/innodb-index_ucs2.result -share/mysql-test/suite/innodb/r/innodb-timeout.result -share/mysql-test/suite/innodb/r/innodb-use-sys-malloc.result -share/mysql-test/suite/innodb/r/innodb-zip.result -share/mysql-test/suite/innodb/r/innodb_bug36169.result -share/mysql-test/suite/innodb/r/innodb_bug36172.result -share/mysql-test/suite/innodb/r/innodb_bug40360.result -share/mysql-test/suite/innodb/r/innodb_bug41904.result -share/mysql-test/suite/innodb/r/innodb_bug44032.result -share/mysql-test/suite/innodb/r/innodb_bug44571.result -share/mysql-test/suite/innodb/r/innodb_bug46676.result -share/mysql-test/suite/innodb/r/innodb_bug47167.result -share/mysql-test/suite/innodb/r/innodb_bug47622.result -share/mysql-test/suite/innodb/r/innodb_bug51378.result -share/mysql-test/suite/innodb/r/innodb_file_format.result -share/mysql-test/suite/innodb/r/innodb_information_schema.result +share/mysql-test/suite/innodb/r/innodb-autoinc-44030.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.result +share/mysql-test/suite/innodb/r/innodb_bug21704.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 +share/mysql-test/suite/innodb/r/innodb_bug38231.result +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_bug44369.result +share/mysql-test/suite/innodb/r/innodb_bug45357.result +share/mysql-test/suite/innodb/r/innodb_bug46000.result +share/mysql-test/suite/innodb/r/innodb_bug47621.result +share/mysql-test/suite/innodb/r/innodb_bug47777.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_misc1.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-analyze.test -share/mysql-test/suite/innodb/t/innodb-consistent-master.opt -share/mysql-test/suite/innodb/t/innodb-consistent.test -share/mysql-test/suite/innodb/t/innodb-index.test -share/mysql-test/suite/innodb/t/innodb-index_ucs2.test -share/mysql-test/suite/innodb/t/innodb-timeout.test -share/mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt -share/mysql-test/suite/innodb/t/innodb-use-sys-malloc.test -share/mysql-test/suite/innodb/t/innodb-zip.test -share/mysql-test/suite/innodb/t/innodb_bug36169.test -share/mysql-test/suite/innodb/t/innodb_bug36172.test -share/mysql-test/suite/innodb/t/innodb_bug40360.test -share/mysql-test/suite/innodb/t/innodb_bug41904.test -share/mysql-test/suite/innodb/t/innodb_bug44032.test -share/mysql-test/suite/innodb/t/innodb_bug44571.test -share/mysql-test/suite/innodb/t/innodb_bug46676.test -share/mysql-test/suite/innodb/t/innodb_bug47167.test -share/mysql-test/suite/innodb/t/innodb_bug47622.test -share/mysql-test/suite/innodb/t/innodb_bug51378.test -share/mysql-test/suite/innodb/t/innodb_file_format.test -share/mysql-test/suite/innodb/t/innodb_information_schema.test +share/mysql-test/suite/innodb/t/innodb-autoinc-44030.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.test +share/mysql-test/suite/innodb/t/innodb_bug21704.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 +share/mysql-test/suite/innodb/t/innodb_bug38231.test +share/mysql-test/suite/innodb/t/innodb_bug39438-master.opt +share/mysql-test/suite/innodb/t/innodb_bug39438.test +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_bug44369.test +share/mysql-test/suite/innodb/t/innodb_bug45357.test +share/mysql-test/suite/innodb/t/innodb_bug46000.test +share/mysql-test/suite/innodb/t/innodb_bug47621.test +share/mysql-test/suite/innodb/t/innodb_bug47777.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_misc1-master.opt +share/mysql-test/suite/innodb/t/innodb_misc1.test +share/mysql-test/suite/innodb/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 @@ -4098,6 +4091,8 @@ share/mysql-test/t/bootstrap.test share/mysql-test/t/bug39022.test share/mysql-test/t/bug46080-master.opt share/mysql-test/t/bug46080.test +share/mysql-test/t/bug46261-master.opt +share/mysql-test/t/bug46261.test share/mysql-test/t/bug46760-master.opt share/mysql-test/t/bug46760.test share/mysql-test/t/bug47671-master.opt @@ -4293,37 +4288,13 @@ 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-44030.test share/mysql-test/t/innodb-autoinc-optimize.test -share/mysql-test/t/innodb-autoinc.test -share/mysql-test/t/innodb-lock.test -share/mysql-test/t/innodb-master.opt -share/mysql-test/t/innodb-replace.test -share/mysql-test/t/innodb-semi-consistent-master.opt -share/mysql-test/t/innodb-semi-consistent.test share/mysql-test/t/innodb-ucs2.test -share/mysql-test/t/innodb.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_bug21704.test share/mysql-test/t/innodb_bug30919-master.opt share/mysql-test/t/innodb_bug30919.test -share/mysql-test/t/innodb_bug34053.test -share/mysql-test/t/innodb_bug34300.test -share/mysql-test/t/innodb_bug35220.test -share/mysql-test/t/innodb_bug38231.test -share/mysql-test/t/innodb_bug39438-master.opt -share/mysql-test/t/innodb_bug39438.test -share/mysql-test/t/innodb_bug40565.test -share/mysql-test/t/innodb_bug42101-nonzero-master.opt -share/mysql-test/t/innodb_bug42101-nonzero.test -share/mysql-test/t/innodb_bug42101.test share/mysql-test/t/innodb_bug42419.test -share/mysql-test/t/innodb_bug44369.test -share/mysql-test/t/innodb_bug45357.test -share/mysql-test/t/innodb_bug46000.test -share/mysql-test/t/innodb_bug47621.test -share/mysql-test/t/innodb_bug47777.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 @@ -4336,7 +4307,6 @@ 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/innodb_trx_weight.test share/mysql-test/t/insert.test share/mysql-test/t/insert_notembedded.test share/mysql-test/t/insert_select.test diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index 3d12a05f4a8..58f39f6d1ad 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2010/05/08 20:48:37 wiz Exp $ +$NetBSD: distinfo,v 1.6 2010/05/26 01:52:22 taca Exp $ -SHA1 (mysql-5.1.46.tar.gz) = 5df6cf8a24b80cb74301c8275b26391262c5ff76 -RMD160 (mysql-5.1.46.tar.gz) = 1237834db314282f6213724ed3f249d1443c41ad -Size (mysql-5.1.46.tar.gz) = 23510197 bytes +SHA1 (mysql-5.1.47.tar.gz) = 9ea8b2cfedb366b884eaeb37757de1cdbbd85b45 +RMD160 (mysql-5.1.47.tar.gz) = ee399fe1ba393c9cd4c19ec43ccea68a6a9f43e3 +Size (mysql-5.1.47.tar.gz) = 23817441 bytes SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c @@ -25,3 +25,4 @@ SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631 SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68 SHA1 (patch-aw) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a +SHA1 (patch-ay) = df6c75d7a1b27a046dac7467fb5e44be4e35281c diff --git a/databases/mysql51-server/patches/patch-ay b/databases/mysql51-server/patches/patch-ay new file mode 100644 index 00000000000..d48cee69596 --- /dev/null +++ b/databases/mysql51-server/patches/patch-ay @@ -0,0 +1,22 @@ +$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); + } |