Wed Apr 21 06:30:05 2010 UTC ()
Pullup ticket 3086 - requested by taca
security update

Revisions pulled up:
- pkgsrc/databases/mysql51-client/Makefile		1.4
- pkgsrc/databases/mysql51-client/Makefile.common	1.5
- pkgsrc/databases/mysql51-client/distinfo		1.2
- pkgsrc/databases/mysql51-server/Makefile		1.4
- pkgsrc/databases/mysql51-server/PLIST			1.3
- pkgsrc/databases/mysql51-server/distinfo		1.3

Files added:
pkgsrc/databases/mysql51-server/patches/patch-av

   --------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Tue Apr 20 22:58:10 UTC 2010

   Modified Files:
           pkgsrc/databases/mysql51-client: Makefile Makefile.common distinfo
           pkgsrc/databases/mysql51-server: Makefile PLIST distinfo
   Added Files:
           pkgsrc/databases/mysql51-server/patches: patch-av

   Log Message:
   Update mysql51-client/mysql51-server package to 5.1.45.
   This is maintainous release and please refer for full changes:

           http://dev.mysql.com/doc/refman/5.1/en/news-5-1-45.html

   Added a patch for recent security problem to mysql51-server, too.

           http://secunia.com/advisories/39454

   To generate a diff of this commit:
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mysql51-client/Makefile
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mysql51-client/Makefile.common
   cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/distinfo
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mysql51-server/Makefile
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mysql51-server/PLIST \
       pkgsrc/databases


(spz)
diff -r1.3 -r1.3.2.1 pkgsrc/databases/mysql51-client/Makefile
diff -r1.4 -r1.4.2.1 pkgsrc/databases/mysql51-client/Makefile.common
diff -r1.1.1.1 -r1.1.1.1.2.1 pkgsrc/databases/mysql51-client/distinfo
diff -r1.3 -r1.3.2.1 pkgsrc/databases/mysql51-server/Makefile
diff -r1.2 -r1.2.2.1 pkgsrc/databases/mysql51-server/PLIST
diff -r1.2 -r1.2.2.1 pkgsrc/databases/mysql51-server/distinfo
diff -r0 -r1.1.2.2 pkgsrc/databases/mysql51-server/patches/patch-av
cvs diff -r1.3 -r1.3.2.1 pkgsrc/databases/mysql51-client/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/Makefile 2010/03/21 14:39:27 1.3
+++ pkgsrc/databases/mysql51-client/Attic/Makefile 2010/04/21 06:30:04 1.3.2.1
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2010/03/21 14:39:27 taca Exp $ 1# $NetBSD: Makefile,v 1.3.2.1 2010/04/21 06:30:04 spz Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4PKGREVISION= 1 
5SVR4_PKGNAME= mysqc 4SVR4_PKGNAME= mysqc
6COMMENT= MySQL 5, a free SQL database (client) 5COMMENT= MySQL 5, a free SQL database (client)
7 6
8CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} 7CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
9 8
10PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
11 10
12.include "Makefile.common" 11.include "Makefile.common"
13 12
14CONFIGURE_ARGS+= --without-extra-tools 13CONFIGURE_ARGS+= --without-extra-tools
15CONFIGURE_ARGS+= --without-server 14CONFIGURE_ARGS+= --without-server
16UNWRAP_FILES+= scripts/mysql_config 15UNWRAP_FILES+= scripts/mysql_config
17INFO_FILES= yes 16INFO_FILES= yes
cvs diff -r1.4 -r1.4.2.1 pkgsrc/databases/mysql51-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/Makefile.common 2010/04/08 15:31:55 1.4
+++ pkgsrc/databases/mysql51-client/Attic/Makefile.common 2010/04/21 06:30:05 1.4.2.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.common,v 1.4 2010/04/08 15:31:55 taca Exp $ 1# $NetBSD: Makefile.common,v 1.4.2.1 2010/04/21 06:30:05 spz Exp $
2# 2#
3# used by databases/mysql51-client/Makefile 3# used by databases/mysql51-client/Makefile
4# used by databases/mysql51-server/Makefile 4# used by databases/mysql51-server/Makefile
5# 5#
6 6
7DISTNAME= mysql-5.1.44 7DISTNAME= mysql-5.1.45
8CATEGORIES= databases 8CATEGORIES= databases
9MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/} 9MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/}
10 10
11MAINTAINER= sketch@NetBSD.org 11MAINTAINER= sketch@NetBSD.org
12HOMEPAGE= http://www.mysql.com/ 12HOMEPAGE= http://www.mysql.com/
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19.include "options.mk" 19.include "options.mk"
20 20
cvs diff -r1.1.1.1 -r1.1.1.1.2.1 pkgsrc/databases/mysql51-client/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/distinfo 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/Attic/distinfo 2010/04/21 06:30:05 1.1.1.1.2.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: distinfo,v 1.1.1.1.2.1 2010/04/21 06:30:05 spz Exp $
2 2
3SHA1 (mysql-5.1.44.tar.gz) = 265fbca02b2ef62926e2845d5fdf394298eb3206 3SHA1 (mysql-5.1.45.tar.gz) = 2a34650dc1a7e056788882522211d07791e0b352
4RMD160 (mysql-5.1.44.tar.gz) = f98d25322893b422ee708d683ee73ec9e17ad40a 4RMD160 (mysql-5.1.45.tar.gz) = 2fd173ac4484ae7a742f06d8d0cdb1c807c02bba
5Size (mysql-5.1.44.tar.gz) = 23400457 bytes 5Size (mysql-5.1.45.tar.gz) = 22457274 bytes
6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
7SHA1 (patch-ab) = 8bbbb84d659810031162475917ec233951c67ca4 7SHA1 (patch-ab) = 8bbbb84d659810031162475917ec233951c67ca4
8SHA1 (patch-ac) = 5d5f1b67eb96254b821cf4a3e99eec26dd703bf6 8SHA1 (patch-ac) = 5d5f1b67eb96254b821cf4a3e99eec26dd703bf6
9SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c 9SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c
10SHA1 (patch-ae) = c74481e5856cbd73662495630c73baec93586e9b 10SHA1 (patch-ae) = c74481e5856cbd73662495630c73baec93586e9b
11SHA1 (patch-af) = 399a55ac369831757fad5aec4dbd8b76050276e4 11SHA1 (patch-af) = 399a55ac369831757fad5aec4dbd8b76050276e4
12SHA1 (patch-ag) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c 12SHA1 (patch-ag) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
13SHA1 (patch-ah) = 5fd4db0e04a97289f38a5467bbae5041f4082b51 13SHA1 (patch-ah) = 5fd4db0e04a97289f38a5467bbae5041f4082b51
14SHA1 (patch-ai) = 722364e59070ab2d3377a694698f32bf25427bf2 14SHA1 (patch-ai) = 722364e59070ab2d3377a694698f32bf25427bf2
15SHA1 (patch-aj) = 476384877154dd8d2465c6c9a0e411c220d405e4 15SHA1 (patch-aj) = 476384877154dd8d2465c6c9a0e411c220d405e4
16SHA1 (patch-ak) = 5dd0982e9c9b2d0199a3a148a12a4dd219533e9d 16SHA1 (patch-ak) = 5dd0982e9c9b2d0199a3a148a12a4dd219533e9d
17SHA1 (patch-al) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec 17SHA1 (patch-al) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec
18SHA1 (patch-am) = 7cced70246776a64e782e0c7d335d5948a2189f1 18SHA1 (patch-am) = 7cced70246776a64e782e0c7d335d5948a2189f1
cvs diff -r1.3 -r1.3.2.1 pkgsrc/databases/mysql51-server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/Makefile 2010/03/21 14:41:41 1.3
+++ pkgsrc/databases/mysql51-server/Attic/Makefile 2010/04/21 06:30:05 1.3.2.1
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2010/03/21 14:41:41 taca Exp $ 1# $NetBSD: Makefile,v 1.3.2.1 2010/04/21 06:30:05 spz Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 2 
5SVR4_PKGNAME= mysqs 4SVR4_PKGNAME= mysqs
6COMMENT= MySQL 5, a free SQL database (server) 5COMMENT= MySQL 5, a free SQL database (server)
7 6
8CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} 7CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
9 8
10PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
11 10
12.include "../../databases/mysql51-client/Makefile.common" 11.include "../../databases/mysql51-client/Makefile.common"
13 12
14MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
15 14
16CONFIGURE_ARGS+= --with-libwrap 15CONFIGURE_ARGS+= --with-libwrap
17CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER} 16CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER}
cvs diff -r1.2 -r1.2.2.1 pkgsrc/databases/mysql51-server/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/PLIST 2010/03/21 14:41:41 1.2
+++ pkgsrc/databases/mysql51-server/Attic/PLIST 2010/04/21 06:30:05 1.2.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2010/03/21 14:41:41 taca Exp $ 1@comment $NetBSD: PLIST,v 1.2.2.1 2010/04/21 06:30:05 spz Exp $
2bin/innochecksum 2bin/innochecksum
3bin/my_print_defaults 3bin/my_print_defaults
4bin/myisam_ftdump 4bin/myisam_ftdump
5bin/myisamchk 5bin/myisamchk
6bin/myisamlog 6bin/myisamlog
7bin/myisampack 7bin/myisampack
8bin/mysql.server 8bin/mysql.server
9bin/mysql_client_test 9bin/mysql_client_test
10${PLIST.embedded}bin/mysql_client_test_embedded 10${PLIST.embedded}bin/mysql_client_test_embedded
11bin/mysql_install_db 11bin/mysql_install_db
12bin/mysql_secure_installation 12bin/mysql_secure_installation
13bin/mysql_tzinfo_to_sql 13bin/mysql_tzinfo_to_sql
14bin/mysql_waitpid 14bin/mysql_waitpid
@@ -300,26 +300,27 @@ share/mysql-test/include/ndb_backup.inc @@ -300,26 +300,27 @@ share/mysql-test/include/ndb_backup.inc
300share/mysql-test/include/ndb_backup_print.inc 300share/mysql-test/include/ndb_backup_print.inc
301share/mysql-test/include/ndb_default_cluster.inc 301share/mysql-test/include/ndb_default_cluster.inc
302share/mysql-test/include/ndb_master-slave.inc 302share/mysql-test/include/ndb_master-slave.inc
303share/mysql-test/include/ndb_master-slave_2ch.inc 303share/mysql-test/include/ndb_master-slave_2ch.inc
304share/mysql-test/include/ndb_not_readonly.inc 304share/mysql-test/include/ndb_not_readonly.inc
305share/mysql-test/include/ndb_restore_master.inc 305share/mysql-test/include/ndb_restore_master.inc
306share/mysql-test/include/ndb_restore_slave_eoption.inc 306share/mysql-test/include/ndb_restore_slave_eoption.inc
307share/mysql-test/include/ndb_setup_slave.inc 307share/mysql-test/include/ndb_setup_slave.inc
308share/mysql-test/include/ndb_wait_connected.inc 308share/mysql-test/include/ndb_wait_connected.inc
309share/mysql-test/include/no_running_event_scheduler.inc 309share/mysql-test/include/no_running_event_scheduler.inc
310share/mysql-test/include/no_running_events.inc 310share/mysql-test/include/no_running_events.inc
311share/mysql-test/include/no_valgrind_without_big.inc 311share/mysql-test/include/no_valgrind_without_big.inc
312share/mysql-test/include/not_as_root.inc 312share/mysql-test/include/not_as_root.inc
 313share/mysql-test/include/not_binlog_format_row.inc
313share/mysql-test/include/not_embedded.inc 314share/mysql-test/include/not_embedded.inc
314share/mysql-test/include/not_ndb.inc 315share/mysql-test/include/not_ndb.inc
315share/mysql-test/include/not_ndb_default.inc 316share/mysql-test/include/not_ndb_default.inc
316share/mysql-test/include/not_openssl.inc 317share/mysql-test/include/not_openssl.inc
317share/mysql-test/include/not_valgrind.inc 318share/mysql-test/include/not_valgrind.inc
318share/mysql-test/include/not_windows.inc 319share/mysql-test/include/not_windows.inc
319share/mysql-test/include/not_windows_embedded.inc 320share/mysql-test/include/not_windows_embedded.inc
320share/mysql-test/include/one_thread_per_connection.inc 321share/mysql-test/include/one_thread_per_connection.inc
321share/mysql-test/include/parser_bug21114.inc 322share/mysql-test/include/parser_bug21114.inc
322share/mysql-test/include/partition_date_range.inc 323share/mysql-test/include/partition_date_range.inc
323share/mysql-test/include/ps_conv.inc 324share/mysql-test/include/ps_conv.inc
324share/mysql-test/include/ps_create.inc 325share/mysql-test/include/ps_create.inc
325share/mysql-test/include/ps_ddl_1.inc 326share/mysql-test/include/ps_ddl_1.inc
@@ -450,26 +451,27 @@ share/mysql-test/r/ansi.result @@ -450,26 +451,27 @@ share/mysql-test/r/ansi.result
450share/mysql-test/r/archive-big.result 451share/mysql-test/r/archive-big.result
451share/mysql-test/r/archive.result 452share/mysql-test/r/archive.result
452share/mysql-test/r/archive_bitfield.result 453share/mysql-test/r/archive_bitfield.result
453share/mysql-test/r/archive_gis.result 454share/mysql-test/r/archive_gis.result
454share/mysql-test/r/auto_increment.result 455share/mysql-test/r/auto_increment.result
455share/mysql-test/r/backup.result 456share/mysql-test/r/backup.result
456share/mysql-test/r/bench_count_distinct.result 457share/mysql-test/r/bench_count_distinct.result
457share/mysql-test/r/big_test.require 458share/mysql-test/r/big_test.require
458share/mysql-test/r/bigint.result 459share/mysql-test/r/bigint.result
459share/mysql-test/r/binary.result 460share/mysql-test/r/binary.result
460share/mysql-test/r/binlog_tx_isolation.result 461share/mysql-test/r/binlog_tx_isolation.result
461share/mysql-test/r/bool.result 462share/mysql-test/r/bool.result
462share/mysql-test/r/bootstrap.result 463share/mysql-test/r/bootstrap.result
 464share/mysql-test/r/bug39022.result
463share/mysql-test/r/bug46080.result 465share/mysql-test/r/bug46080.result
464share/mysql-test/r/bug46760.result 466share/mysql-test/r/bug46760.result
465share/mysql-test/r/bug47671.result 467share/mysql-test/r/bug47671.result
466share/mysql-test/r/bulk_replace.result 468share/mysql-test/r/bulk_replace.result
467share/mysql-test/r/cache_innodb.result 469share/mysql-test/r/cache_innodb.result
468share/mysql-test/r/case.result 470share/mysql-test/r/case.result
469share/mysql-test/r/case_insensitive_file_system.require 471share/mysql-test/r/case_insensitive_file_system.require
470share/mysql-test/r/case_insensitive_fs.require 472share/mysql-test/r/case_insensitive_fs.require
471share/mysql-test/r/case_sensitive_file_system.require 473share/mysql-test/r/case_sensitive_file_system.require
472share/mysql-test/r/cast.result 474share/mysql-test/r/cast.result
473share/mysql-test/r/change_user.result 475share/mysql-test/r/change_user.result
474share/mysql-test/r/check.result 476share/mysql-test/r/check.result
475share/mysql-test/r/check_var_limit.require 477share/mysql-test/r/check_var_limit.require
@@ -793,26 +795,27 @@ share/mysql-test/r/mysqlbinlog_row_trans @@ -793,26 +795,27 @@ share/mysql-test/r/mysqlbinlog_row_trans
793share/mysql-test/r/mysqlcheck.result 795share/mysql-test/r/mysqlcheck.result
794share/mysql-test/r/mysqldump-compat.result 796share/mysql-test/r/mysqldump-compat.result
795share/mysql-test/r/mysqldump-max.result 797share/mysql-test/r/mysqldump-max.result
796share/mysql-test/r/mysqldump-no-binlog.result 798share/mysql-test/r/mysqldump-no-binlog.result
797share/mysql-test/r/mysqldump.result 799share/mysql-test/r/mysqldump.result
798share/mysql-test/r/mysqldump_restore.result 800share/mysql-test/r/mysqldump_restore.result
799share/mysql-test/r/mysqlshow.result 801share/mysql-test/r/mysqlshow.result
800share/mysql-test/r/mysqlslap.result 802share/mysql-test/r/mysqlslap.result
801share/mysql-test/r/mysqltest.result 803share/mysql-test/r/mysqltest.result
802share/mysql-test/r/named_pipe.result 804share/mysql-test/r/named_pipe.result
803share/mysql-test/r/ndb_default_cluster.require 805share/mysql-test/r/ndb_default_cluster.require
804share/mysql-test/r/negation_elimination.result 806share/mysql-test/r/negation_elimination.result
805share/mysql-test/r/no-threads.result 807share/mysql-test/r/no-threads.result
 808share/mysql-test/r/no_binlog.result
806share/mysql-test/r/not_embedded.require 809share/mysql-test/r/not_embedded.require
807share/mysql-test/r/not_embedded_server.result 810share/mysql-test/r/not_embedded_server.result
808share/mysql-test/r/not_ndb.require 811share/mysql-test/r/not_ndb.require
809share/mysql-test/r/not_ndb_default.require 812share/mysql-test/r/not_ndb_default.require
810share/mysql-test/r/not_openssl.require 813share/mysql-test/r/not_openssl.require
811share/mysql-test/r/not_partition.require 814share/mysql-test/r/not_partition.require
812share/mysql-test/r/not_partition.result 815share/mysql-test/r/not_partition.result
813share/mysql-test/r/not_true.require 816share/mysql-test/r/not_true.require
814share/mysql-test/r/not_valgrind.require 817share/mysql-test/r/not_valgrind.require
815share/mysql-test/r/not_windows.require 818share/mysql-test/r/not_windows.require
816share/mysql-test/r/null.result 819share/mysql-test/r/null.result
817share/mysql-test/r/null_key.result 820share/mysql-test/r/null_key.result
818share/mysql-test/r/odbc.result 821share/mysql-test/r/odbc.result
@@ -827,26 +830,27 @@ share/mysql-test/r/overflow.result @@ -827,26 +830,27 @@ share/mysql-test/r/overflow.result
827share/mysql-test/r/packet.result 830share/mysql-test/r/packet.result
828share/mysql-test/r/parser.result 831share/mysql-test/r/parser.result
829share/mysql-test/r/parser_bug21114_innodb.result 832share/mysql-test/r/parser_bug21114_innodb.result
830share/mysql-test/r/parser_not_embedded.result 833share/mysql-test/r/parser_not_embedded.result
831share/mysql-test/r/parser_precedence.result 834share/mysql-test/r/parser_precedence.result
832share/mysql-test/r/parser_stack.result 835share/mysql-test/r/parser_stack.result
833share/mysql-test/r/partition.result 836share/mysql-test/r/partition.result
834share/mysql-test/r/partition_archive.result 837share/mysql-test/r/partition_archive.result
835share/mysql-test/r/partition_blackhole.result 838share/mysql-test/r/partition_blackhole.result
836share/mysql-test/r/partition_bug18198.result 839share/mysql-test/r/partition_bug18198.result
837share/mysql-test/r/partition_charset.result 840share/mysql-test/r/partition_charset.result
838share/mysql-test/r/partition_csv.result 841share/mysql-test/r/partition_csv.result
839share/mysql-test/r/partition_datatype.result 842share/mysql-test/r/partition_datatype.result
 843share/mysql-test/r/partition_debug_sync.result
840share/mysql-test/r/partition_disabled.result 844share/mysql-test/r/partition_disabled.result
841share/mysql-test/r/partition_error.result 845share/mysql-test/r/partition_error.result
842share/mysql-test/r/partition_federated.result 846share/mysql-test/r/partition_federated.result
843share/mysql-test/r/partition_grant.result 847share/mysql-test/r/partition_grant.result
844share/mysql-test/r/partition_hash.result 848share/mysql-test/r/partition_hash.result
845share/mysql-test/r/partition_innodb.result 849share/mysql-test/r/partition_innodb.result
846share/mysql-test/r/partition_innodb_builtin.result 850share/mysql-test/r/partition_innodb_builtin.result
847share/mysql-test/r/partition_innodb_plugin.result 851share/mysql-test/r/partition_innodb_plugin.result
848share/mysql-test/r/partition_innodb_semi_consistent.result 852share/mysql-test/r/partition_innodb_semi_consistent.result
849share/mysql-test/r/partition_innodb_stmt.result 853share/mysql-test/r/partition_innodb_stmt.result
850share/mysql-test/r/partition_list.result 854share/mysql-test/r/partition_list.result
851share/mysql-test/r/partition_mgm.result 855share/mysql-test/r/partition_mgm.result
852share/mysql-test/r/partition_mgm_err.result 856share/mysql-test/r/partition_mgm_err.result
@@ -994,30 +998,30 @@ share/mysql-test/r/type_timestamp.result @@ -994,30 +998,30 @@ share/mysql-test/r/type_timestamp.result
994share/mysql-test/r/type_uint.result 998share/mysql-test/r/type_uint.result
995share/mysql-test/r/type_varchar.result 999share/mysql-test/r/type_varchar.result
996share/mysql-test/r/type_year.result 1000share/mysql-test/r/type_year.result
997share/mysql-test/r/udf.result 1001share/mysql-test/r/udf.result
998share/mysql-test/r/udf_skip_grants.result 1002share/mysql-test/r/udf_skip_grants.result
999share/mysql-test/r/union.result 1003share/mysql-test/r/union.result
1000share/mysql-test/r/unsafe_binlog_innodb.result 1004share/mysql-test/r/unsafe_binlog_innodb.result
1001share/mysql-test/r/update.result 1005share/mysql-test/r/update.result
1002share/mysql-test/r/upgrade.result 1006share/mysql-test/r/upgrade.result
1003share/mysql-test/r/user_limits.result 1007share/mysql-test/r/user_limits.result
1004share/mysql-test/r/user_var-binlog.result 1008share/mysql-test/r/user_var-binlog.result
1005share/mysql-test/r/user_var.result 1009share/mysql-test/r/user_var.result
1006share/mysql-test/r/varbinary.result 1010share/mysql-test/r/varbinary.result
1007share/mysql-test/r/variables+c.result 
1008share/mysql-test/r/variables-big.result 1011share/mysql-test/r/variables-big.result
1009share/mysql-test/r/variables-notembedded.result 1012share/mysql-test/r/variables-notembedded.result
1010share/mysql-test/r/variables.result 1013share/mysql-test/r/variables.result
 1014share/mysql-test/r/variables_community.result
1011share/mysql-test/r/variables_debug.result 1015share/mysql-test/r/variables_debug.result
1012share/mysql-test/r/view.result 1016share/mysql-test/r/view.result
1013share/mysql-test/r/view_grant.result 1017share/mysql-test/r/view_grant.result
1014share/mysql-test/r/wait_timeout.result 1018share/mysql-test/r/wait_timeout.result
1015share/mysql-test/r/warnings.result 1019share/mysql-test/r/warnings.result
1016share/mysql-test/r/warnings_engine_disabled.result 1020share/mysql-test/r/warnings_engine_disabled.result
1017share/mysql-test/r/windows.require 1021share/mysql-test/r/windows.require
1018share/mysql-test/r/windows.result 1022share/mysql-test/r/windows.result
1019share/mysql-test/r/xa.result 1023share/mysql-test/r/xa.result
1020share/mysql-test/r/xml.result 1024share/mysql-test/r/xml.result
1021share/mysql-test/std_data/14897.frm 1025share/mysql-test/std_data/14897.frm
1022share/mysql-test/std_data/Index.xml 1026share/mysql-test/std_data/Index.xml
1023share/mysql-test/std_data/Moscow_leap 1027share/mysql-test/std_data/Moscow_leap
@@ -1033,26 +1037,27 @@ share/mysql-test/std_data/bug30435_5k.tx @@ -1033,26 +1037,27 @@ share/mysql-test/std_data/bug30435_5k.tx
1033share/mysql-test/std_data/bug33029-slave-relay-bin.000001 1037share/mysql-test/std_data/bug33029-slave-relay-bin.000001
1034share/mysql-test/std_data/bug35469.dat 1038share/mysql-test/std_data/bug35469.dat
1035share/mysql-test/std_data/bug36055.MYD 1039share/mysql-test/std_data/bug36055.MYD
1036share/mysql-test/std_data/bug36055.MYI 1040share/mysql-test/std_data/bug36055.MYI
1037share/mysql-test/std_data/bug36055.frm 1041share/mysql-test/std_data/bug36055.frm
1038share/mysql-test/std_data/bug37631.MYD 1042share/mysql-test/std_data/bug37631.MYD
1039share/mysql-test/std_data/bug37631.MYI 1043share/mysql-test/std_data/bug37631.MYI
1040share/mysql-test/std_data/bug37631.frm 1044share/mysql-test/std_data/bug37631.frm
1041share/mysql-test/std_data/bug40482-bin.000001 1045share/mysql-test/std_data/bug40482-bin.000001
1042share/mysql-test/std_data/bug47012.ARM 1046share/mysql-test/std_data/bug47012.ARM
1043share/mysql-test/std_data/bug47012.ARZ 1047share/mysql-test/std_data/bug47012.ARZ
1044share/mysql-test/std_data/bug47012.frm 1048share/mysql-test/std_data/bug47012.frm
1045share/mysql-test/std_data/bug47142_master-bin.000001 1049share/mysql-test/std_data/bug47142_master-bin.000001
 1050share/mysql-test/std_data/bug48449.frm
1046share/mysql-test/std_data/cacert.pem 1051share/mysql-test/std_data/cacert.pem
1047share/mysql-test/std_data/charset_utf8.txt 1052share/mysql-test/std_data/charset_utf8.txt
1048share/mysql-test/std_data/client-cert.pem 1053share/mysql-test/std_data/client-cert.pem
1049share/mysql-test/std_data/client-key.pem 1054share/mysql-test/std_data/client-key.pem
1050share/mysql-test/std_data/corrupt-relay-bin.000624 1055share/mysql-test/std_data/corrupt-relay-bin.000624
1051share/mysql-test/std_data/corrupt_t1#P#p1.MYI 1056share/mysql-test/std_data/corrupt_t1#P#p1.MYI
1052share/mysql-test/std_data/corrupt_t1.MYI 1057share/mysql-test/std_data/corrupt_t1.MYI
1053share/mysql-test/std_data/des_key_file 1058share/mysql-test/std_data/des_key_file
1054share/mysql-test/std_data/funcs_1/innodb_tb1.txt 1059share/mysql-test/std_data/funcs_1/innodb_tb1.txt
1055share/mysql-test/std_data/funcs_1/innodb_tb2.txt 1060share/mysql-test/std_data/funcs_1/innodb_tb2.txt
1056share/mysql-test/std_data/funcs_1/innodb_tb3.txt 1061share/mysql-test/std_data/funcs_1/innodb_tb3.txt
1057share/mysql-test/std_data/funcs_1/innodb_tb4.txt 1062share/mysql-test/std_data/funcs_1/innodb_tb4.txt
1058share/mysql-test/std_data/funcs_1/load_file.txt 1063share/mysql-test/std_data/funcs_1/load_file.txt
@@ -2597,26 +2602,27 @@ share/mysql-test/suite/rpl/r/rpl_server_ @@ -2597,26 +2602,27 @@ share/mysql-test/suite/rpl/r/rpl_server_
2597share/mysql-test/suite/rpl/r/rpl_server_id2.result 2602share/mysql-test/suite/rpl/r/rpl_server_id2.result
2598share/mysql-test/suite/rpl/r/rpl_session_var.result 2603share/mysql-test/suite/rpl/r/rpl_session_var.result
2599share/mysql-test/suite/rpl/r/rpl_set_charset.result 2604share/mysql-test/suite/rpl/r/rpl_set_charset.result
2600share/mysql-test/suite/rpl/r/rpl_set_null_innodb.result 2605share/mysql-test/suite/rpl/r/rpl_set_null_innodb.result
2601share/mysql-test/suite/rpl/r/rpl_set_null_myisam.result 2606share/mysql-test/suite/rpl/r/rpl_set_null_myisam.result
2602share/mysql-test/suite/rpl/r/rpl_sf.result 2607share/mysql-test/suite/rpl/r/rpl_sf.result
2603share/mysql-test/suite/rpl/r/rpl_skip_error.result 2608share/mysql-test/suite/rpl/r/rpl_skip_error.result
2604share/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result 2609share/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result
2605share/mysql-test/suite/rpl/r/rpl_slave_load_in.result 2610share/mysql-test/suite/rpl/r/rpl_slave_load_in.result
2606share/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result 2611share/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
2607share/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result 2612share/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
2608share/mysql-test/suite/rpl/r/rpl_slave_skip.result 2613share/mysql-test/suite/rpl/r/rpl_slave_skip.result
2609share/mysql-test/suite/rpl/r/rpl_slave_status.result 2614share/mysql-test/suite/rpl/r/rpl_slave_status.result
 2615share/mysql-test/suite/rpl/r/rpl_slow_query_log.result
2610share/mysql-test/suite/rpl/r/rpl_sp.result 2616share/mysql-test/suite/rpl/r/rpl_sp.result
2611share/mysql-test/suite/rpl/r/rpl_sp004.result 2617share/mysql-test/suite/rpl/r/rpl_sp004.result
2612share/mysql-test/suite/rpl/r/rpl_sp_effects.result 2618share/mysql-test/suite/rpl/r/rpl_sp_effects.result
2613share/mysql-test/suite/rpl/r/rpl_sporadic_master.result 2619share/mysql-test/suite/rpl/r/rpl_sporadic_master.result
2614share/mysql-test/suite/rpl/r/rpl_ssl.result 2620share/mysql-test/suite/rpl/r/rpl_ssl.result
2615share/mysql-test/suite/rpl/r/rpl_ssl1.result 2621share/mysql-test/suite/rpl/r/rpl_ssl1.result
2616share/mysql-test/suite/rpl/r/rpl_start_stop_slave.result 2622share/mysql-test/suite/rpl/r/rpl_start_stop_slave.result
2617share/mysql-test/suite/rpl/r/rpl_stm_000001.result 2623share/mysql-test/suite/rpl/r/rpl_stm_000001.result
2618share/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result 2624share/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
2619share/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result 2625share/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
2620share/mysql-test/suite/rpl/r/rpl_stm_binlog_direct.result 2626share/mysql-test/suite/rpl/r/rpl_stm_binlog_direct.result
2621share/mysql-test/suite/rpl/r/rpl_stm_conflicts.result 2627share/mysql-test/suite/rpl/r/rpl_stm_conflicts.result
2622share/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result 2628share/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
@@ -2920,26 +2926,28 @@ share/mysql-test/suite/rpl/t/rpl_set_cha @@ -2920,26 +2926,28 @@ share/mysql-test/suite/rpl/t/rpl_set_cha
2920share/mysql-test/suite/rpl/t/rpl_set_null_innodb.test 2926share/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
2921share/mysql-test/suite/rpl/t/rpl_set_null_myisam.test 2927share/mysql-test/suite/rpl/t/rpl_set_null_myisam.test
2922share/mysql-test/suite/rpl/t/rpl_sf.test 2928share/mysql-test/suite/rpl/t/rpl_sf.test
2923share/mysql-test/suite/rpl/t/rpl_skip_error-slave.opt 2929share/mysql-test/suite/rpl/t/rpl_skip_error-slave.opt
2924share/mysql-test/suite/rpl/t/rpl_skip_error.test 2930share/mysql-test/suite/rpl/t/rpl_skip_error.test
2925share/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test 2931share/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
2926share/mysql-test/suite/rpl/t/rpl_slave_load_in.test 2932share/mysql-test/suite/rpl/t/rpl_slave_load_in.test
2927share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt 2933share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt
2928share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test 2934share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
2929share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt 2935share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
2930share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test 2936share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
2931share/mysql-test/suite/rpl/t/rpl_slave_skip.test 2937share/mysql-test/suite/rpl/t/rpl_slave_skip.test
2932share/mysql-test/suite/rpl/t/rpl_slave_status.test 2938share/mysql-test/suite/rpl/t/rpl_slave_status.test
 2939share/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt
 2940share/mysql-test/suite/rpl/t/rpl_slow_query_log.test
2933share/mysql-test/suite/rpl/t/rpl_sp-master.opt 2941share/mysql-test/suite/rpl/t/rpl_sp-master.opt
2934share/mysql-test/suite/rpl/t/rpl_sp-slave.opt 2942share/mysql-test/suite/rpl/t/rpl_sp-slave.opt
2935share/mysql-test/suite/rpl/t/rpl_sp.test 2943share/mysql-test/suite/rpl/t/rpl_sp.test
2936share/mysql-test/suite/rpl/t/rpl_sp004.test 2944share/mysql-test/suite/rpl/t/rpl_sp004.test
2937share/mysql-test/suite/rpl/t/rpl_sp_effects-master.opt 2945share/mysql-test/suite/rpl/t/rpl_sp_effects-master.opt
2938share/mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt 2946share/mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt
2939share/mysql-test/suite/rpl/t/rpl_sp_effects.test 2947share/mysql-test/suite/rpl/t/rpl_sp_effects.test
2940share/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt 2948share/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt
2941share/mysql-test/suite/rpl/t/rpl_sporadic_master.test 2949share/mysql-test/suite/rpl/t/rpl_sporadic_master.test
2942share/mysql-test/suite/rpl/t/rpl_ssl.test 2950share/mysql-test/suite/rpl/t/rpl_ssl.test
2943share/mysql-test/suite/rpl/t/rpl_ssl1.test 2951share/mysql-test/suite/rpl/t/rpl_ssl1.test
2944share/mysql-test/suite/rpl/t/rpl_start_stop_slave-slave.opt 2952share/mysql-test/suite/rpl/t/rpl_start_stop_slave-slave.opt
2945share/mysql-test/suite/rpl/t/rpl_start_stop_slave.test 2953share/mysql-test/suite/rpl/t/rpl_start_stop_slave.test
@@ -3138,26 +3146,27 @@ share/mysql-test/t/analyze.test @@ -3138,26 +3146,27 @@ share/mysql-test/t/analyze.test
3138share/mysql-test/t/ansi.test 3146share/mysql-test/t/ansi.test
3139share/mysql-test/t/archive-big.test 3147share/mysql-test/t/archive-big.test
3140share/mysql-test/t/archive.test 3148share/mysql-test/t/archive.test
3141share/mysql-test/t/archive_bitfield.test 3149share/mysql-test/t/archive_bitfield.test
3142share/mysql-test/t/archive_gis.test 3150share/mysql-test/t/archive_gis.test
3143share/mysql-test/t/auto_increment.test 3151share/mysql-test/t/auto_increment.test
3144share/mysql-test/t/backup-master.sh 3152share/mysql-test/t/backup-master.sh
3145share/mysql-test/t/backup.test 3153share/mysql-test/t/backup.test
3146share/mysql-test/t/bench_count_distinct.test 3154share/mysql-test/t/bench_count_distinct.test
3147share/mysql-test/t/bigint.test 3155share/mysql-test/t/bigint.test
3148share/mysql-test/t/binary.test 3156share/mysql-test/t/binary.test
3149share/mysql-test/t/bool.test 3157share/mysql-test/t/bool.test
3150share/mysql-test/t/bootstrap.test 3158share/mysql-test/t/bootstrap.test
 3159share/mysql-test/t/bug39022.test
3151share/mysql-test/t/bug46080-master.opt 3160share/mysql-test/t/bug46080-master.opt
3152share/mysql-test/t/bug46080.test 3161share/mysql-test/t/bug46080.test
3153share/mysql-test/t/bug46760-master.opt 3162share/mysql-test/t/bug46760-master.opt
3154share/mysql-test/t/bug46760.test 3163share/mysql-test/t/bug46760.test
3155share/mysql-test/t/bug47671-master.opt 3164share/mysql-test/t/bug47671-master.opt
3156share/mysql-test/t/bug47671.test 3165share/mysql-test/t/bug47671.test
3157share/mysql-test/t/bulk_replace.test 3166share/mysql-test/t/bulk_replace.test
3158share/mysql-test/t/cache_innodb-master.opt 3167share/mysql-test/t/cache_innodb-master.opt
3159share/mysql-test/t/cache_innodb.test 3168share/mysql-test/t/cache_innodb.test
3160share/mysql-test/t/case.test 3169share/mysql-test/t/case.test
3161share/mysql-test/t/cast.test 3170share/mysql-test/t/cast.test
3162share/mysql-test/t/change_user-master.opt 3171share/mysql-test/t/change_user-master.opt
3163share/mysql-test/t/change_user.test 3172share/mysql-test/t/change_user.test
@@ -3497,26 +3506,27 @@ share/mysql-test/t/mysqldump-compat.test @@ -3497,26 +3506,27 @@ share/mysql-test/t/mysqldump-compat.test
3497share/mysql-test/t/mysqldump-max.test 3506share/mysql-test/t/mysqldump-max.test
3498share/mysql-test/t/mysqldump-no-binlog-master.opt 3507share/mysql-test/t/mysqldump-no-binlog-master.opt
3499share/mysql-test/t/mysqldump-no-binlog.test 3508share/mysql-test/t/mysqldump-no-binlog.test
3500share/mysql-test/t/mysqldump.test 3509share/mysql-test/t/mysqldump.test
3501share/mysql-test/t/mysqldump_restore.test 3510share/mysql-test/t/mysqldump_restore.test
3502share/mysql-test/t/mysqlshow.test 3511share/mysql-test/t/mysqlshow.test
3503share/mysql-test/t/mysqlslap.test 3512share/mysql-test/t/mysqlslap.test
3504share/mysql-test/t/mysqltest.test 3513share/mysql-test/t/mysqltest.test
3505share/mysql-test/t/named_pipe-master.opt 3514share/mysql-test/t/named_pipe-master.opt
3506share/mysql-test/t/named_pipe.test 3515share/mysql-test/t/named_pipe.test
3507share/mysql-test/t/negation_elimination.test 3516share/mysql-test/t/negation_elimination.test
3508share/mysql-test/t/no-threads-master.opt 3517share/mysql-test/t/no-threads-master.opt
3509share/mysql-test/t/no-threads.test 3518share/mysql-test/t/no-threads.test
 3519share/mysql-test/t/no_binlog.test
3510share/mysql-test/t/not_embedded_server-master.opt 3520share/mysql-test/t/not_embedded_server-master.opt
3511share/mysql-test/t/not_embedded_server.test 3521share/mysql-test/t/not_embedded_server.test
3512share/mysql-test/t/not_partition.test 3522share/mysql-test/t/not_partition.test
3513share/mysql-test/t/null.test 3523share/mysql-test/t/null.test
3514share/mysql-test/t/null_key.test 3524share/mysql-test/t/null_key.test
3515share/mysql-test/t/odbc.test 3525share/mysql-test/t/odbc.test
3516share/mysql-test/t/olap.test 3526share/mysql-test/t/olap.test
3517share/mysql-test/t/openssl_1.test 3527share/mysql-test/t/openssl_1.test
3518share/mysql-test/t/order_by.test 3528share/mysql-test/t/order_by.test
3519share/mysql-test/t/order_fill_sortbuf-master.opt 3529share/mysql-test/t/order_fill_sortbuf-master.opt
3520share/mysql-test/t/order_fill_sortbuf.test 3530share/mysql-test/t/order_fill_sortbuf.test
3521share/mysql-test/t/outfile.test 3531share/mysql-test/t/outfile.test
3522share/mysql-test/t/outfile_loaddata.test 3532share/mysql-test/t/outfile_loaddata.test
@@ -3525,26 +3535,27 @@ share/mysql-test/t/packet.test @@ -3525,26 +3535,27 @@ share/mysql-test/t/packet.test
3525share/mysql-test/t/parser.test 3535share/mysql-test/t/parser.test
3526share/mysql-test/t/parser_bug21114_innodb.test 3536share/mysql-test/t/parser_bug21114_innodb.test
3527share/mysql-test/t/parser_not_embedded.test 3537share/mysql-test/t/parser_not_embedded.test
3528share/mysql-test/t/parser_precedence.test 3538share/mysql-test/t/parser_precedence.test
3529share/mysql-test/t/parser_stack.test 3539share/mysql-test/t/parser_stack.test
3530share/mysql-test/t/partition-master.opt 3540share/mysql-test/t/partition-master.opt
3531share/mysql-test/t/partition.test 3541share/mysql-test/t/partition.test
3532share/mysql-test/t/partition_archive.test 3542share/mysql-test/t/partition_archive.test
3533share/mysql-test/t/partition_blackhole.test 3543share/mysql-test/t/partition_blackhole.test
3534share/mysql-test/t/partition_bug18198.test 3544share/mysql-test/t/partition_bug18198.test
3535share/mysql-test/t/partition_charset.test 3545share/mysql-test/t/partition_charset.test
3536share/mysql-test/t/partition_csv.test 3546share/mysql-test/t/partition_csv.test
3537share/mysql-test/t/partition_datatype.test 3547share/mysql-test/t/partition_datatype.test
 3548share/mysql-test/t/partition_debug_sync.test
3538share/mysql-test/t/partition_disabled-master.opt 3549share/mysql-test/t/partition_disabled-master.opt
3539share/mysql-test/t/partition_disabled.test 3550share/mysql-test/t/partition_disabled.test
3540share/mysql-test/t/partition_error.test 3551share/mysql-test/t/partition_error.test
3541share/mysql-test/t/partition_federated.test 3552share/mysql-test/t/partition_federated.test
3542share/mysql-test/t/partition_grant.test 3553share/mysql-test/t/partition_grant.test
3543share/mysql-test/t/partition_hash.test 3554share/mysql-test/t/partition_hash.test
3544share/mysql-test/t/partition_innodb-master.opt 3555share/mysql-test/t/partition_innodb-master.opt
3545share/mysql-test/t/partition_innodb.test 3556share/mysql-test/t/partition_innodb.test
3546share/mysql-test/t/partition_innodb_builtin.test 3557share/mysql-test/t/partition_innodb_builtin.test
3547share/mysql-test/t/partition_innodb_plugin.test 3558share/mysql-test/t/partition_innodb_plugin.test
3548share/mysql-test/t/partition_innodb_semi_consistent-master.opt 3559share/mysql-test/t/partition_innodb_semi_consistent-master.opt
3549share/mysql-test/t/partition_innodb_semi_consistent.test 3560share/mysql-test/t/partition_innodb_semi_consistent.test
3550share/mysql-test/t/partition_innodb_stmt.test 3561share/mysql-test/t/partition_innodb_stmt.test
@@ -3713,31 +3724,31 @@ share/mysql-test/t/udf-master.opt @@ -3713,31 +3724,31 @@ share/mysql-test/t/udf-master.opt
3713share/mysql-test/t/udf.test 3724share/mysql-test/t/udf.test
3714share/mysql-test/t/udf_skip_grants-master.opt 3725share/mysql-test/t/udf_skip_grants-master.opt
3715share/mysql-test/t/udf_skip_grants.test 3726share/mysql-test/t/udf_skip_grants.test
3716share/mysql-test/t/union-master.opt 3727share/mysql-test/t/union-master.opt
3717share/mysql-test/t/union.test 3728share/mysql-test/t/union.test
3718share/mysql-test/t/unsafe_binlog_innodb-master.opt 3729share/mysql-test/t/unsafe_binlog_innodb-master.opt
3719share/mysql-test/t/unsafe_binlog_innodb.test 3730share/mysql-test/t/unsafe_binlog_innodb.test
3720share/mysql-test/t/update.test 3731share/mysql-test/t/update.test
3721share/mysql-test/t/upgrade.test 3732share/mysql-test/t/upgrade.test
3722share/mysql-test/t/user_limits.test 3733share/mysql-test/t/user_limits.test
3723share/mysql-test/t/user_var-binlog.test 3734share/mysql-test/t/user_var-binlog.test
3724share/mysql-test/t/user_var.test 3735share/mysql-test/t/user_var.test
3725share/mysql-test/t/varbinary.test 3736share/mysql-test/t/varbinary.test
3726share/mysql-test/t/variables+c.test 
3727share/mysql-test/t/variables-big.test 3737share/mysql-test/t/variables-big.test
3728share/mysql-test/t/variables-notembedded-master.opt 3738share/mysql-test/t/variables-notembedded-master.opt
3729share/mysql-test/t/variables-notembedded.test 3739share/mysql-test/t/variables-notembedded.test
3730share/mysql-test/t/variables.test 3740share/mysql-test/t/variables.test
 3741share/mysql-test/t/variables_community.test
3731share/mysql-test/t/variables_debug.test 3742share/mysql-test/t/variables_debug.test
3732share/mysql-test/t/view.test 3743share/mysql-test/t/view.test
3733share/mysql-test/t/view_grant.test 3744share/mysql-test/t/view_grant.test
3734share/mysql-test/t/wait_timeout.test 3745share/mysql-test/t/wait_timeout.test
3735share/mysql-test/t/warnings-master.opt 3746share/mysql-test/t/warnings-master.opt
3736share/mysql-test/t/warnings.test 3747share/mysql-test/t/warnings.test
3737share/mysql-test/t/warnings_engine_disabled-master.opt 3748share/mysql-test/t/warnings_engine_disabled-master.opt
3738share/mysql-test/t/warnings_engine_disabled.test 3749share/mysql-test/t/warnings_engine_disabled.test
3739share/mysql-test/t/windows.test 3750share/mysql-test/t/windows.test
3740share/mysql-test/t/xa.test 3751share/mysql-test/t/xa.test
3741share/mysql-test/t/xml.test 3752share/mysql-test/t/xml.test
3742share/mysql-test/valgrind.supp 3753share/mysql-test/valgrind.supp
3743share/mysql/charsets/Index.xml 3754share/mysql/charsets/Index.xml
cvs diff -r1.2 -r1.2.2.1 pkgsrc/databases/mysql51-server/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/distinfo 2010/03/21 14:41:41 1.2
+++ pkgsrc/databases/mysql51-server/Attic/distinfo 2010/04/21 06:30:05 1.2.2.1
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1$NetBSD: distinfo,v 1.2 2010/03/21 14:41:41 taca Exp $ 1$NetBSD: distinfo,v 1.2.2.1 2010/04/21 06:30:05 spz Exp $
2 2
3SHA1 (mysql-5.1.44.tar.gz) = 265fbca02b2ef62926e2845d5fdf394298eb3206 3SHA1 (mysql-5.1.45.tar.gz) = 2a34650dc1a7e056788882522211d07791e0b352
4RMD160 (mysql-5.1.44.tar.gz) = f98d25322893b422ee708d683ee73ec9e17ad40a 4RMD160 (mysql-5.1.45.tar.gz) = 2fd173ac4484ae7a742f06d8d0cdb1c807c02bba
5Size (mysql-5.1.44.tar.gz) = 23400457 bytes 5Size (mysql-5.1.45.tar.gz) = 22457274 bytes
6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
7SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405 7SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405
8SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c 8SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
9SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51 9SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51
10SHA1 (patch-ae) = c7f8c12c64835650b80aed4fef44d44b15f3f11e 10SHA1 (patch-ae) = c7f8c12c64835650b80aed4fef44d44b15f3f11e
11SHA1 (patch-af) = 1e13ba542b4fc2a1d59fc822d06c76bc4e92dc23 11SHA1 (patch-af) = 1e13ba542b4fc2a1d59fc822d06c76bc4e92dc23
12SHA1 (patch-ag) = c510685dd71e4e3a632c9bf01e4e36eb42945d9e 12SHA1 (patch-ag) = c510685dd71e4e3a632c9bf01e4e36eb42945d9e
13SHA1 (patch-ah) = a608060cee7aadaf8bcde84016a73131a75dea32 13SHA1 (patch-ah) = a608060cee7aadaf8bcde84016a73131a75dea32
14SHA1 (patch-ai) = 4c5acf2b0e05765a1fe9e30558d163886e1aa492 14SHA1 (patch-ai) = 4c5acf2b0e05765a1fe9e30558d163886e1aa492
15SHA1 (patch-aj) = 6dd73cd38840e1faf103ffb02ae7c0e53475ee04 15SHA1 (patch-aj) = 6dd73cd38840e1faf103ffb02ae7c0e53475ee04
16SHA1 (patch-ak) = 5c0bd81635dcea038499f1b03180c22220b0009e 16SHA1 (patch-ak) = 5c0bd81635dcea038499f1b03180c22220b0009e
17SHA1 (patch-al) = f12aeaca414126e190c5324e15ccefc07fc66ba9 17SHA1 (patch-al) = f12aeaca414126e190c5324e15ccefc07fc66ba9
18SHA1 (patch-am) = 2cf10915f5dc3caf11bb8c7c7255842da646b247 18SHA1 (patch-am) = 2cf10915f5dc3caf11bb8c7c7255842da646b247
19SHA1 (patch-an) = 7b627ceb6212641b7e0de9fd7142bc95e4dcb8cb 19SHA1 (patch-an) = 7b627ceb6212641b7e0de9fd7142bc95e4dcb8cb
20SHA1 (patch-ao) = 7895abad117d5c6901c2241209c5747e6c490e7d 20SHA1 (patch-ao) = 7895abad117d5c6901c2241209c5747e6c490e7d
21SHA1 (patch-ap) = f356d4d26acdf0532fe70a49d0292878f600ff51 21SHA1 (patch-ap) = f356d4d26acdf0532fe70a49d0292878f600ff51
22SHA1 (patch-aq) = 8e6029d36b290b9ffd964c38afe4352a9107be40 22SHA1 (patch-aq) = 8e6029d36b290b9ffd964c38afe4352a9107be40
23SHA1 (patch-ar) = ed9c062adce41a840db1e908ab0657db6de540ae 23SHA1 (patch-ar) = ed9c062adce41a840db1e908ab0657db6de540ae
24SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf 24SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf
25SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631 25SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631
26SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68 26SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68
 27SHA1 (patch-av) = 3fb1d881f7d88a72a84abd28d269236b1a84164e
27SHA1 (patch-aw) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec 28SHA1 (patch-aw) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec
28SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a 29SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
File Added: pkgsrc/databases/mysql51-server/patches/Attic/patch-av
$NetBSD: patch-av,v 1.1.2.2 2010/04/21 06:30:05 spz Exp $

Security fix for http://secunia.com/advisories/39454/.

--- sql/sql_plugin.cc.orig	2010-03-01 19:33:41.000000000 +0000
+++ sql/sql_plugin.cc
@@ -1736,6 +1736,8 @@ bool mysql_uninstall_plugin(THD *thd, co
   bzero(&tables, sizeof(tables));
   tables.db= (char *)"mysql";
   tables.table_name= tables.alias= (char *)"plugin";
+  if (check_table_access(thd, DELETE_ACL, &tables, 1, FALSE))
+    DBUG_RETURN(TRUE);
 
   /* need to open before acquiring LOCK_plugin or it will deadlock */
   if (! (table= open_ltable(thd, &tables, TL_WRITE, 0)))