diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index 772324b4ffac..a4cf585a14d5 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2009/05/20 00:58:10 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/11/26 16:33:29 tron Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
-PKGREVISION= 3
SVR4_PKGNAME= mysqc
COMMENT= MySQL 5, a free SQL database (client)
@@ -21,7 +20,12 @@ AUTO_MKDIRS= yes
REPLACE_PERL= scripts/mysql_convert_table_format.sh \
scripts/mysql_explain_log.sh \
+ scripts/mysql_find_rows.sh \
+ scripts/mysql_fix_extensions.sh \
+ scripts/mysql_setpermission.sh \
scripts/mysql_tableinfo.sh \
+ scripts/mysql_zap.sh \
+ scripts/mysqlaccess.sh \
scripts/mysqldumpslow.sh \
scripts/mysqlhotcopy.sh
@@ -34,8 +38,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
.endfor
- ${INSTALL_DATA} ${WRKSRC}/Docs/manual.chm \
- ${DESTDIR}${PREFIX}/share/doc/mysql/
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index dd64186440c9..085cdfa817a1 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.35 2009/07/19 13:14:21 tron Exp $
+# $NetBSD: Makefile.common,v 1.36 2009/11/26 16:33:29 tron Exp $
#
# used by databases/mysql5-client/Makefile
# used by databases/mysql5-server/Makefile
#
-DISTNAME= mysql-5.0.67
+DISTNAME= mysql-5.0.88
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.0/}
@@ -40,6 +40,7 @@ MYSQL_EXTRA_CHARSET?= all
CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q}
CONFIGURE_ARGS+= --with-named-z-libs=z
CONFIGURE_ARGS+= --without-libwrap
+CONFIG_SHELL= ${TOOLS_PATH.bash}
.if ${OPSYS} == "IRIX"
CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H
@@ -98,7 +99,7 @@ CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
.endif
USE_LANGUAGES= c c++
-USE_TOOLS+= autoconf autoheader gmake perl:run
+USE_TOOLS+= autoconf bash autoheader gmake perl:run
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
SUBST_CLASSES= mk
diff --git a/databases/mysql5-client/PLIST b/databases/mysql5-client/PLIST
index ba20648a3969..543d374654a0 100644
--- a/databases/mysql5-client/PLIST
+++ b/databases/mysql5-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:43:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/11/26 16:33:29 tron Exp $
bin/msql2mysql
bin/mysql
bin/mysql_config
@@ -67,7 +67,6 @@ man/man1/mysqlaccess.1
man/man1/mysqladmin.1
man/man1/mysqldump.1
man/man1/mysqlshow.1
-share/doc/mysql/manual.chm
share/examples/mysql/my-huge.cnf
share/examples/mysql/my-innodb-heavy-4G.cnf
share/examples/mysql/my-large.cnf
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index 90b41d7b653a..cc3ac329bcbb 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2009/01/28 10:30:53 he Exp $
+$NetBSD: distinfo,v 1.27 2009/11/26 16:33:29 tron Exp $
-SHA1 (mysql-5.0.67.tar.gz) = 168090a4698a3a5efa2f2c9380a4352d4433d377
-RMD160 (mysql-5.0.67.tar.gz) = 05d38a5f8d91cb4dac1ee446af96b28163bd3722
-Size (mysql-5.0.67.tar.gz) = 28370810 bytes
+SHA1 (mysql-5.0.88.tar.gz) = 2dc7a462eaca1452eefd334888a6c40022deb352
+RMD160 (mysql-5.0.88.tar.gz) = a3ba4bd04e573b4a0bab073f36eec3ff44348ae6
+Size (mysql-5.0.88.tar.gz) = 22932765 bytes
SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7
SHA1 (patch-ac) = 7e7034f64f8337e459fe16611db8d7854c02931e
@@ -23,6 +23,3 @@ SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923
SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d
SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156
SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
-SHA1 (patch-bh) = 83f6f7f29636265e987fb00897a55290e2434643
-SHA1 (patch-bi) = 5d0132f4e053abfc6210cd2dc425186765acaad3
-SHA1 (patch-bj) = 1e00fab7db2f5ea04802053d41dedd2a356ea9ed
diff --git a/databases/mysql5-client/patches/patch-bh b/databases/mysql5-client/patches/patch-bh
deleted file mode 100644
index 40020c876204..000000000000
--- a/databases/mysql5-client/patches/patch-bh
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-bh,v 1.3 2009/01/28 09:44:34 he Exp $
-
-What was here before: workaround for our use of -ledit instead
-of the real readline (?).
-
-New: add patch from http://bugs.mysql.com/file.php?id=9232,
-referenced on http://bugs.mysql.com/bug.php?id=27884, to fix the
-vulnerability recorded in
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-4456.
-
---- client/mysql.cc.orig 2008-08-04 12:19:04.000000000 +0000
-+++ client/mysql.cc
-@@ -2263,7 +2263,11 @@ static char **new_mysql_completion (cons
- */
-
- #if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
-+# if defined(__NetBSD__) || defined(__DragonFly__)
-+int no_completion(const char *, int)
-+# else
- char *no_completion(const char*,int)
-+# endif
- #else
- char *no_completion()
- #endif
-@@ -3361,9 +3365,12 @@ print_table_data_html(MYSQL_RES *result)
- {
- while((field = mysql_fetch_field(result)))
- {
-- tee_fprintf(PAGER, "| %s | ", (field->name ?
-- (field->name[0] ? field->name :
-- " ") : "NULL"));
-+ tee_fputs("", PAGER);
-+ if (field->name && field->name[0])
-+ xmlencode_print(field->name, field->name_length);
-+ else
-+ tee_fputs(field->name ? " " : "NULL", PAGER);
-+ tee_fputs(" | ", PAGER);
- }
- (void) tee_fputs("", PAGER);
- }
-@@ -3374,7 +3381,7 @@ print_table_data_html(MYSQL_RES *result)
- for (uint i=0; i < mysql_num_fields(result); i++)
- {
- (void) tee_fputs("", PAGER);
-- safe_put_field(cur[i],lengths[i]);
-+ xmlencode_print(cur[i], lengths[i]);
- (void) tee_fputs(" | ", PAGER);
- }
- (void) tee_fputs("", PAGER);
diff --git a/databases/mysql5-client/patches/patch-bi b/databases/mysql5-client/patches/patch-bi
deleted file mode 100644
index 2693b7556331..000000000000
--- a/databases/mysql5-client/patches/patch-bi
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2009/01/28 09:44:34 he Exp $
-
-Add patch from http://bugs.mysql.com/file.php?id=9232,
-referenced on http://bugs.mysql.com/bug.php?id=27884, to fix the
-vulnerability recorded in
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-4456.
-
---- mysql-test/r/mysql.result.orig 2008-08-04 12:32:17.000000000 +0000
-+++ mysql-test/r/mysql.result
-@@ -180,4 +180,6 @@ ERROR at line 1: DELIMITER cannot contai
- 1
- This is a file starting with UTF8 BOM 0xEFBBBF
- This is a file starting with UTF8 BOM 0xEFBBBF
-+
-+End of 5.1 tests
- End of 5.0 tests
diff --git a/databases/mysql5-client/patches/patch-bj b/databases/mysql5-client/patches/patch-bj
deleted file mode 100644
index e58236ae038c..000000000000
--- a/databases/mysql5-client/patches/patch-bj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bj,v 1.1 2009/01/28 09:44:34 he Exp $
-
-Add patch from http://bugs.mysql.com/file.php?id=9232,
-referenced on http://bugs.mysql.com/bug.php?id=27884, to fix the
-vulnerability recorded in
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-4456.
-
---- mysql-test/t/mysql.test.orig 2008-08-04 12:32:17.000000000 +0000
-+++ mysql-test/t/mysql.test
-@@ -290,4 +290,12 @@ EOF
- --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug29323.sql 2>&1
- remove_file $MYSQLTEST_VARDIR/tmp/bug29323.sql;
-
-+
-+#
-+# Bug #27884: mysql --html does not quote HTML special characters in output
-+#
-+--exec $MYSQL --html test -e "select '< & >' as \`<\`"
-+
-+--echo
-+--echo End of 5.1 tests
- --echo End of 5.0 tests
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index 911eef9623c3..20ec511e6c82 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2009/07/19 13:50:20 tron Exp $
+# $NetBSD: Makefile,v 1.29 2009/11/26 16:33:29 tron Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 3
SVR4_PKGNAME= mysqs
COMMENT= MySQL 5, a free SQL database (server)
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index 56eea85bbfe6..862e773617f4 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:43:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/11/26 16:33:29 tron Exp $
bin/comp_err
bin/innochecksum
bin/my_print_defaults
@@ -36,6 +36,7 @@ share/mysql-test/include/big_test.inc
share/mysql-test/include/check-testcase.test
share/mysql-test/include/check_var_limit.inc
share/mysql-test/include/common-tests.inc
+share/mysql-test/include/count_sessions.inc
share/mysql-test/include/ctype_common.inc
share/mysql-test/include/ctype_filesort.inc
share/mysql-test/include/ctype_innodb_like.inc
@@ -43,6 +44,8 @@ share/mysql-test/include/ctype_like_escape.inc
share/mysql-test/include/ctype_like_range_f1f2.inc
share/mysql-test/include/ctype_regex.inc
share/mysql-test/include/delete_anonymous_users.inc
+share/mysql-test/include/diff_master_slave.inc
+share/mysql-test/include/diff_tables.inc
share/mysql-test/include/endspace.inc
share/mysql-test/include/federated.inc
share/mysql-test/include/federated_cleanup.inc
@@ -54,7 +57,9 @@ share/mysql-test/include/have_bdb.inc
share/mysql-test/include/have_big5.inc
share/mysql-test/include/have_blackhole.inc
share/mysql-test/include/have_bug25714.inc
+share/mysql-test/include/have_case_insensitive_fs.inc
share/mysql-test/include/have_case_sensitive_file_system.inc
+share/mysql-test/include/have_community_features.inc
share/mysql-test/include/have_compress.inc
share/mysql-test/include/have_cp1250_ch.inc
share/mysql-test/include/have_cp932.inc
@@ -77,6 +82,7 @@ share/mysql-test/include/have_lowercase1.inc
share/mysql-test/include/have_multi_ndb.inc
share/mysql-test/include/have_ndb.inc
share/mysql-test/include/have_outfile.inc
+share/mysql-test/include/have_profiling.inc
share/mysql-test/include/have_query_cache.inc
share/mysql-test/include/have_sjis.inc
share/mysql-test/include/have_ssl.inc
@@ -86,8 +92,12 @@ share/mysql-test/include/have_udf.inc
share/mysql-test/include/have_ujis.inc
share/mysql-test/include/im_check_env.inc
share/mysql-test/include/innodb_rollback_on_timeout.inc
+share/mysql-test/include/kill_query.inc
+share/mysql-test/include/kill_query_and_diff_master_slave.inc
share/mysql-test/include/loaddata_autocom.inc
+share/mysql-test/include/master-slave-end.inc
share/mysql-test/include/master-slave.inc
+share/mysql-test/include/mysqldump.inc
share/mysql-test/include/mysqltest-x.inc
share/mysql-test/include/ndb_backup.inc
share/mysql-test/include/ndb_backup_print.inc
@@ -104,13 +114,17 @@ share/mysql-test/include/ps_modify1.inc
share/mysql-test/include/ps_query.inc
share/mysql-test/include/ps_renew.inc
share/mysql-test/include/report-features.test
+share/mysql-test/include/rpl_loaddata_charset.inc
share/mysql-test/include/rpl_stmt_seq.inc
+share/mysql-test/include/rpl_trigger_common.inc
share/mysql-test/include/show_binary_logs.inc
share/mysql-test/include/show_binlog_events.inc
share/mysql-test/include/show_binlog_events2.inc
share/mysql-test/include/show_msg.inc
share/mysql-test/include/show_msg80.inc
share/mysql-test/include/sp-vars.inc
+share/mysql-test/include/start_slave.inc
+share/mysql-test/include/stop_slave.inc
share/mysql-test/include/strict_autoinc.inc
share/mysql-test/include/system_db_struct.inc
share/mysql-test/include/test_outfile.inc
@@ -121,11 +135,16 @@ share/mysql-test/include/wait_condition.inc
share/mysql-test/include/wait_for_query_to_suceed.inc
share/mysql-test/include/wait_for_slave_io_to_stop.inc
share/mysql-test/include/wait_for_slave_param.inc
+share/mysql-test/include/wait_for_slave_sql_error.inc
+share/mysql-test/include/wait_for_slave_sql_error_and_skip.inc
share/mysql-test/include/wait_for_slave_sql_to_stop.inc
share/mysql-test/include/wait_for_slave_to_start.inc
share/mysql-test/include/wait_for_slave_to_stop.inc
+share/mysql-test/include/wait_show_condition.inc
share/mysql-test/include/wait_show_pattern.inc
share/mysql-test/include/wait_slave_status.inc
+share/mysql-test/include/wait_until_count_sessions.inc
+share/mysql-test/include/wait_until_disconnected.inc
share/mysql-test/include/windows.inc
share/mysql-test/install_test_db
share/mysql-test/lib/mtr_cases.pl
@@ -179,8 +198,12 @@ share/mysql-test/r/binlog_start_comment.result
share/mysql-test/r/blackhole.result
share/mysql-test/r/bool.result
share/mysql-test/r/bootstrap.result
+share/mysql-test/r/bug40113.result
+share/mysql-test/r/bug41756.result
+share/mysql-test/r/bug46080.result
share/mysql-test/r/bulk_replace.result
share/mysql-test/r/case.result
+share/mysql-test/r/case_insensitive_fs.require
share/mysql-test/r/case_sensitive_file_system.require
share/mysql-test/r/cast.result
share/mysql-test/r/check.result
@@ -209,6 +232,7 @@ share/mysql-test/r/ctype_cp932_binlog.result
share/mysql-test/r/ctype_create.result
share/mysql-test/r/ctype_eucjpms.result
share/mysql-test/r/ctype_euckr.result
+share/mysql-test/r/ctype_filesystem.result
share/mysql-test/r/ctype_gb2312.result
share/mysql-test/r/ctype_gbk.result
share/mysql-test/r/ctype_hebrew.result
@@ -248,6 +272,7 @@ share/mysql-test/r/federated.result
share/mysql-test/r/federated_archive.result
share/mysql-test/r/federated_bug_13118.result
share/mysql-test/r/federated_bug_25714.result
+share/mysql-test/r/federated_debug.result
share/mysql-test/r/federated_disabled.result
share/mysql-test/r/federated_innodb.result
share/mysql-test/r/fix_priv_tables.result
@@ -301,6 +326,7 @@ share/mysql-test/r/grant.result
share/mysql-test/r/grant2.result
share/mysql-test/r/grant3.result
share/mysql-test/r/grant_cache.result
+share/mysql-test/r/grant_lowercase_fs.result
share/mysql-test/r/greedy_optimizer.result
share/mysql-test/r/group_by.result
share/mysql-test/r/group_min_max.result
@@ -310,6 +336,7 @@ share/mysql-test/r/have_bdb.require
share/mysql-test/r/have_big5.require
share/mysql-test/r/have_blackhole.require
share/mysql-test/r/have_bug25714.require
+share/mysql-test/r/have_community_features.require
share/mysql-test/r/have_compress.require
share/mysql-test/r/have_cp1250_ch.require
share/mysql-test/r/have_cp932.require
@@ -334,6 +361,7 @@ share/mysql-test/r/have_ndb.require
share/mysql-test/r/have_ndb_status_ok.require
share/mysql-test/r/have_outfile.require
share/mysql-test/r/have_perror.require
+share/mysql-test/r/have_profiling.require
share/mysql-test/r/have_query_cache.require
share/mysql-test/r/have_raid.require
share/mysql-test/r/have_sjis.require
@@ -363,16 +391,21 @@ share/mysql-test/r/index_merge_ror.result
share/mysql-test/r/index_merge_ror_cpk.result
share/mysql-test/r/information_schema.result
share/mysql-test/r/information_schema_chmod.result
+share/mysql-test/r/information_schema_community.result
share/mysql-test/r/information_schema_db.result
share/mysql-test/r/information_schema_inno.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-big.result
share/mysql-test/r/innodb-deadlock.result
share/mysql-test/r/innodb-lock.result
share/mysql-test/r/innodb-replace.result
share/mysql-test/r/innodb-ucs2.result
share/mysql-test/r/innodb.result
+share/mysql-test/r/innodb_bug35220.result
+share/mysql-test/r/innodb_bug40565.result
+share/mysql-test/r/innodb_bug42419.result
share/mysql-test/r/innodb_cache.result
share/mysql-test/r/innodb_gis.result
share/mysql-test/r/innodb_handler.result
@@ -403,6 +436,8 @@ share/mysql-test/r/loaddata_autocom_innodb.result
share/mysql-test/r/loaddata_autocom_ndb.result
share/mysql-test/r/lock.result
share/mysql-test/r/lock_multi.result
+share/mysql-test/r/lock_multi_bug38499.result
+share/mysql-test/r/lock_multi_bug38691.result
share/mysql-test/r/lock_tables_lost_commit.result
share/mysql-test/r/long_tmpdir.result
share/mysql-test/r/lowercase0.require
@@ -415,16 +450,20 @@ share/mysql-test/r/lowercase_table2.result
share/mysql-test/r/lowercase_table3.result
share/mysql-test/r/lowercase_table_grant.result
share/mysql-test/r/lowercase_table_qcache.result
+share/mysql-test/r/lowercase_utf8.result
share/mysql-test/r/lowercase_view.result
share/mysql-test/r/merge.result
share/mysql-test/r/metadata.result
share/mysql-test/r/mix_innodb_myisam_binlog.result
share/mysql-test/r/multi_statement.result
share/mysql-test/r/multi_update.result
+share/mysql-test/r/multi_update2.result
share/mysql-test/r/multi_update_tiny_hash.result
share/mysql-test/r/myisam-blob.result
share/mysql-test/r/myisam.result
share/mysql-test/r/myisampack.result
+share/mysql-test/r/mysql-bug41486.result
+share/mysql-test/r/mysql-bug45236.result
share/mysql-test/r/mysql.result
share/mysql-test/r/mysql_client_test.result
share/mysql-test/r/mysql_comments.result
@@ -439,6 +478,7 @@ share/mysql-test/r/mysqldump-compat.result
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/mysqlshow.result
share/mysql-test/r/mysqltest.result
share/mysql-test/r/named_pipe.result
@@ -507,6 +547,8 @@ share/mysql-test/r/overflow.result
share/mysql-test/r/packet.result
share/mysql-test/r/parser.result
share/mysql-test/r/parser_precedence.result
+share/mysql-test/r/parser_stack.result
+share/mysql-test/r/perror-win.result
share/mysql-test/r/perror.result
share/mysql-test/r/preload.result
share/mysql-test/r/profiling.result
@@ -558,7 +600,9 @@ share/mysql-test/r/rpl_alter.result
share/mysql-test/r/rpl_auto_increment.result
share/mysql-test/r/rpl_auto_increment_11932.result
share/mysql-test/r/rpl_auto_increment_bug33029.result
+share/mysql-test/r/rpl_begin_commit_rollback.result
share/mysql-test/r/rpl_bug33931.result
+share/mysql-test/r/rpl_bug38694.result
share/mysql-test/r/rpl_change_master.result
share/mysql-test/r/rpl_charset.result
share/mysql-test/r/rpl_charset_sjis.result
@@ -571,12 +615,14 @@ share/mysql-test/r/rpl_delete_all.result
share/mysql-test/r/rpl_do_grant.result
share/mysql-test/r/rpl_drop.result
share/mysql-test/r/rpl_drop_db.result
+share/mysql-test/r/rpl_drop_if_exists.result
share/mysql-test/r/rpl_drop_temp.result
share/mysql-test/r/rpl_drop_view.result
share/mysql-test/r/rpl_dual_pos_advance.result
share/mysql-test/r/rpl_empty_master_crash.result
share/mysql-test/r/rpl_error_ignored_table.result
share/mysql-test/r/rpl_failed_optimize.result
+share/mysql-test/r/rpl_filter_tables_not_exist.result
share/mysql-test/r/rpl_flush_log_loop.result
share/mysql-test/r/rpl_flush_tables.result
share/mysql-test/r/rpl_free_items.result
@@ -591,6 +637,7 @@ share/mysql-test/r/rpl_insert_delayed.result
share/mysql-test/r/rpl_insert_id.result
share/mysql-test/r/rpl_insert_ignore.result
share/mysql-test/r/rpl_insert_select.result
+share/mysql-test/r/rpl_killed_ddl.result
share/mysql-test/r/rpl_known_bugs_detection.result
share/mysql-test/r/rpl_loaddata.result
share/mysql-test/r/rpl_loaddata_charset.result
@@ -613,6 +660,7 @@ share/mysql-test/r/rpl_multi_update2.result
share/mysql-test/r/rpl_multi_update3.result
share/mysql-test/r/rpl_multi_update4.result
share/mysql-test/r/rpl_mystery22.result
+share/mysql-test/r/rpl_name_const.result
share/mysql-test/r/rpl_ndb_innodb_trans.result
share/mysql-test/r/rpl_openssl.result
share/mysql-test/r/rpl_optimize.result
@@ -641,7 +689,8 @@ share/mysql-test/r/rpl_start_stop_slave.result
share/mysql-test/r/rpl_temporary.result
share/mysql-test/r/rpl_timezone.result
share/mysql-test/r/rpl_transaction.result
-share/mysql-test/r/rpl_trigger.result
+share/mysql-test/r/rpl_trigger_not_windows.result
+share/mysql-test/r/rpl_trigger_windows.result
share/mysql-test/r/rpl_trunc_temp.result
share/mysql-test/r/rpl_until.result
share/mysql-test/r/rpl_user.result
@@ -665,6 +714,7 @@ share/mysql-test/r/sp-code.result
share/mysql-test/r/sp-destruct.result
share/mysql-test/r/sp-dynamic.result
share/mysql-test/r/sp-error.result
+share/mysql-test/r/sp-fib.result
share/mysql-test/r/sp-prelocking.result
share/mysql-test/r/sp-security.result
share/mysql-test/r/sp-threads.result
@@ -682,6 +732,7 @@ share/mysql-test/r/ssl_8k_key.result
share/mysql-test/r/ssl_compress.result
share/mysql-test/r/ssl_connect.result
share/mysql-test/r/status.result
+share/mysql-test/r/status2.result
share/mysql-test/r/strict.result
share/mysql-test/r/strict_autoinc_1myisam.result
share/mysql-test/r/strict_autoinc_2innodb.result
@@ -691,6 +742,7 @@ share/mysql-test/r/strict_autoinc_5ndb.result
share/mysql-test/r/subselect.result
share/mysql-test/r/subselect2.result
share/mysql-test/r/subselect3.result
+share/mysql-test/r/subselect4.result
share/mysql-test/r/subselect_gis.result
share/mysql-test/r/subselect_innodb.result
share/mysql-test/r/subselect_notembedded.result
@@ -754,6 +806,7 @@ share/mysql-test/std_data/14897.frm
share/mysql-test/std_data/Index.xml
share/mysql-test/std_data/Moscow_leap
share/mysql-test/std_data/bad_gis_data.dat
+share/mysql-test/std_data/binlog_transaction.000001
share/mysql-test/std_data/bug15328.cnf
share/mysql-test/std_data/bug16266.000001
share/mysql-test/std_data/bug19371.MYD
@@ -793,6 +846,7 @@ share/mysql-test/std_data/loaddata5.dat
share/mysql-test/std_data/loaddata6.dat
share/mysql-test/std_data/loaddata_dq.dat
share/mysql-test/std_data/loaddata_pair.dat
+share/mysql-test/std_data/loaddata_utf8.dat
share/mysql-test/std_data/master-bin.000001
share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data
share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data
@@ -811,9 +865,7 @@ share/mysql-test/std_data/ndb_config_mycnf2.cnf
share/mysql-test/std_data/rpl_loaddata.dat
share/mysql-test/std_data/rpl_loaddata2.dat
share/mysql-test/std_data/rpl_timezone.dat
-share/mysql-test/std_data/server-cert-des.pem
share/mysql-test/std_data/server-cert.pem
-share/mysql-test/std_data/server-key-des.pem
share/mysql-test/std_data/server-key.pem
share/mysql-test/std_data/server8k-cert.pem
share/mysql-test/std_data/server8k-key.pem
@@ -828,7 +880,6 @@ share/mysql-test/suite/funcs_1/cursors/cursors_master.test
share/mysql-test/suite/funcs_1/datadict/basics_mixed1.inc
share/mysql-test/suite/funcs_1/datadict/basics_mixed2.inc
share/mysql-test/suite/funcs_1/datadict/basics_mixed3.inc
-share/mysql-test/suite/funcs_1/datadict/charset_collation.inc
share/mysql-test/suite/funcs_1/datadict/columns.inc
share/mysql-test/suite/funcs_1/datadict/datadict.pre
share/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
@@ -864,9 +915,7 @@ share/mysql-test/suite/funcs_1/include/sp_tb.inc
share/mysql-test/suite/funcs_1/include/tb3.inc
share/mysql-test/suite/funcs_1/lib/DataGen_local.pl
share/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
-share/mysql-test/suite/funcs_1/r/charset_collation_1.result
-share/mysql-test/suite/funcs_1/r/charset_collation_2.result
-share/mysql-test/suite/funcs_1/r/charset_collation_3.result
+share/mysql-test/suite/funcs_1/r/charset_collation.result
share/mysql-test/suite/funcs_1/r/innodb_bitdata.result
share/mysql-test/suite/funcs_1/r/innodb_cursors.result
share/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -891,7 +940,7 @@ share/mysql-test/suite/funcs_1/r/is_cml_innodb.result
share/mysql-test/suite/funcs_1/r/is_cml_memory.result
share/mysql-test/suite/funcs_1/r/is_cml_myisam.result
share/mysql-test/suite/funcs_1/r/is_cml_ndb.result
-share/mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result
+share/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
share/mysql-test/suite/funcs_1/r/is_collations.result
share/mysql-test/suite/funcs_1/r/is_column_privileges.result
share/mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result
@@ -988,9 +1037,7 @@ share/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
share/mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
share/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
share/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
-share/mysql-test/suite/funcs_1/t/charset_collation_1.test
-share/mysql-test/suite/funcs_1/t/charset_collation_2.test
-share/mysql-test/suite/funcs_1/t/charset_collation_3.test
+share/mysql-test/suite/funcs_1/t/charset_collation.test
share/mysql-test/suite/funcs_1/t/disabled.def
share/mysql-test/suite/funcs_1/t/innodb_bitdata.test
share/mysql-test/suite/funcs_1/t/innodb_cursors.test
@@ -1016,7 +1063,7 @@ share/mysql-test/suite/funcs_1/t/is_cml_innodb.test
share/mysql-test/suite/funcs_1/t/is_cml_memory.test
share/mysql-test/suite/funcs_1/t/is_cml_myisam.test
share/mysql-test/suite/funcs_1/t/is_cml_ndb.test
-share/mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test
+share/mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
share/mysql-test/suite/funcs_1/t/is_collations.test
share/mysql-test/suite/funcs_1/t/is_column_privileges.test
share/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
@@ -1412,6 +1459,12 @@ share/mysql-test/t/binlog_start_comment.test
share/mysql-test/t/blackhole.test
share/mysql-test/t/bool.test
share/mysql-test/t/bootstrap.test
+share/mysql-test/t/bug40113-master.opt
+share/mysql-test/t/bug40113.test
+share/mysql-test/t/bug41756-master.opt
+share/mysql-test/t/bug41756.test
+share/mysql-test/t/bug46080-master.opt
+share/mysql-test/t/bug46080.test
share/mysql-test/t/bulk_replace.test
share/mysql-test/t/case.test
share/mysql-test/t/cast.test
@@ -1441,6 +1494,8 @@ share/mysql-test/t/ctype_cp932_binlog.test
share/mysql-test/t/ctype_create.test
share/mysql-test/t/ctype_eucjpms.test
share/mysql-test/t/ctype_euckr.test
+share/mysql-test/t/ctype_filesystem-master.opt
+share/mysql-test/t/ctype_filesystem.test
share/mysql-test/t/ctype_gb2312.test
share/mysql-test/t/ctype_gbk.test
share/mysql-test/t/ctype_hebrew.test
@@ -1486,6 +1541,8 @@ share/mysql-test/t/federated.test
share/mysql-test/t/federated_archive.test
share/mysql-test/t/federated_bug_13118.test
share/mysql-test/t/federated_bug_25714.test
+share/mysql-test/t/federated_debug-master.opt
+share/mysql-test/t/federated_debug.test
share/mysql-test/t/federated_disabled-master.opt
share/mysql-test/t/federated_disabled.test
share/mysql-test/t/federated_innodb-slave.opt
@@ -1545,6 +1602,7 @@ share/mysql-test/t/grant2.test
share/mysql-test/t/grant3-master.opt
share/mysql-test/t/grant3.test
share/mysql-test/t/grant_cache.test
+share/mysql-test/t/grant_lowercase_fs.test
share/mysql-test/t/greedy_optimizer.test
share/mysql-test/t/group_by.test
share/mysql-test/t/group_min_max.test
@@ -1571,12 +1629,14 @@ share/mysql-test/t/index_merge_ror.test
share/mysql-test/t/index_merge_ror_cpk.test
share/mysql-test/t/information_schema.test
share/mysql-test/t/information_schema_chmod.test
+share/mysql-test/t/information_schema_community.test
share/mysql-test/t/information_schema_db.test
share/mysql-test/t/information_schema_inno.test
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-big.test
share/mysql-test/t/innodb-deadlock.test
share/mysql-test/t/innodb-lock.test
@@ -1584,6 +1644,9 @@ share/mysql-test/t/innodb-master.opt
share/mysql-test/t/innodb-replace.test
share/mysql-test/t/innodb-ucs2.test
share/mysql-test/t/innodb.test
+share/mysql-test/t/innodb_bug35220.test
+share/mysql-test/t/innodb_bug40565.test
+share/mysql-test/t/innodb_bug42419.test
share/mysql-test/t/innodb_cache-master.opt
share/mysql-test/t/innodb_cache.test
share/mysql-test/t/innodb_gis.test
@@ -1618,6 +1681,8 @@ share/mysql-test/t/loaddata_autocom_innodb.test
share/mysql-test/t/loaddata_autocom_ndb.test
share/mysql-test/t/lock.test
share/mysql-test/t/lock_multi.test
+share/mysql-test/t/lock_multi_bug38499.test
+share/mysql-test/t/lock_multi_bug38691.test
share/mysql-test/t/lock_tables_lost_commit-master.opt
share/mysql-test/t/lock_tables_lost_commit.test
share/mysql-test/t/log.sh
@@ -1637,6 +1702,8 @@ share/mysql-test/t/lowercase_table_grant-master.opt
share/mysql-test/t/lowercase_table_grant.test
share/mysql-test/t/lowercase_table_qcache-master.opt
share/mysql-test/t/lowercase_table_qcache.test
+share/mysql-test/t/lowercase_utf8-master.opt
+share/mysql-test/t/lowercase_utf8.test
share/mysql-test/t/lowercase_view-master.opt
share/mysql-test/t/lowercase_view.test
share/mysql-test/t/merge.test
@@ -1647,12 +1714,16 @@ share/mysql-test/t/multi_statement-master.opt
share/mysql-test/t/multi_statement.test
share/mysql-test/t/multi_update-master.opt
share/mysql-test/t/multi_update.test
+share/mysql-test/t/multi_update2-master.opt
+share/mysql-test/t/multi_update2.test
share/mysql-test/t/multi_update_tiny_hash-master.opt
share/mysql-test/t/multi_update_tiny_hash.test
share/mysql-test/t/myisam-blob-master.opt
share/mysql-test/t/myisam-blob.test
share/mysql-test/t/myisam.test
share/mysql-test/t/myisampack.test
+share/mysql-test/t/mysql-bug41486.test
+share/mysql-test/t/mysql-bug45236.test
share/mysql-test/t/mysql.test
share/mysql-test/t/mysql_client_test.opt
share/mysql-test/t/mysql_client_test.test
@@ -1676,6 +1747,7 @@ share/mysql-test/t/mysqldump-max.test
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/mysqlshow.test
share/mysql-test/t/mysqltest.test
share/mysql-test/t/named_pipe-master.opt
@@ -1742,6 +1814,8 @@ share/mysql-test/t/overflow.test
share/mysql-test/t/packet.test
share/mysql-test/t/parser.test
share/mysql-test/t/parser_precedence.test
+share/mysql-test/t/parser_stack.test
+share/mysql-test/t/perror-win.test
share/mysql-test/t/perror.test
share/mysql-test/t/preload.test
share/mysql-test/t/profiling.test
@@ -1802,8 +1876,12 @@ share/mysql-test/t/rpl_auto_increment-master.opt
share/mysql-test/t/rpl_auto_increment.test
share/mysql-test/t/rpl_auto_increment_11932.test
share/mysql-test/t/rpl_auto_increment_bug33029.test
+share/mysql-test/t/rpl_begin_commit_rollback-slave.opt
+share/mysql-test/t/rpl_begin_commit_rollback.test
share/mysql-test/t/rpl_bug33931-slave.opt
share/mysql-test/t/rpl_bug33931.test
+share/mysql-test/t/rpl_bug38694-slave.opt
+share/mysql-test/t/rpl_bug38694.test
share/mysql-test/t/rpl_change_master.test
share/mysql-test/t/rpl_charset.test
share/mysql-test/t/rpl_charset_sjis.test
@@ -1819,6 +1897,7 @@ share/mysql-test/t/rpl_delete_all.test
share/mysql-test/t/rpl_do_grant.test
share/mysql-test/t/rpl_drop.test
share/mysql-test/t/rpl_drop_db.test
+share/mysql-test/t/rpl_drop_if_exists.test
share/mysql-test/t/rpl_drop_temp-slave.opt
share/mysql-test/t/rpl_drop_temp.test
share/mysql-test/t/rpl_drop_view.test
@@ -1831,6 +1910,8 @@ share/mysql-test/t/rpl_error_ignored_table-slave.opt
share/mysql-test/t/rpl_error_ignored_table.test
share/mysql-test/t/rpl_failed_optimize-master.opt
share/mysql-test/t/rpl_failed_optimize.test
+share/mysql-test/t/rpl_filter_tables_not_exist-slave.opt
+share/mysql-test/t/rpl_filter_tables_not_exist.test
share/mysql-test/t/rpl_flush_log_loop-master.opt
share/mysql-test/t/rpl_flush_log_loop-master.sh
share/mysql-test/t/rpl_flush_log_loop-slave.opt
@@ -1856,6 +1937,8 @@ share/mysql-test/t/rpl_insert_id.test
share/mysql-test/t/rpl_insert_ignore-slave.opt
share/mysql-test/t/rpl_insert_ignore.test
share/mysql-test/t/rpl_insert_select.test
+share/mysql-test/t/rpl_killed_ddl-master.opt
+share/mysql-test/t/rpl_killed_ddl.test
share/mysql-test/t/rpl_known_bugs_detection-master.opt
share/mysql-test/t/rpl_known_bugs_detection.test
share/mysql-test/t/rpl_loaddata.test
@@ -1890,6 +1973,7 @@ share/mysql-test/t/rpl_multi_update3.test
share/mysql-test/t/rpl_multi_update4-slave.opt
share/mysql-test/t/rpl_multi_update4.test
share/mysql-test/t/rpl_mystery22.test
+share/mysql-test/t/rpl_name_const.test
share/mysql-test/t/rpl_ndb_innodb_trans-slave.opt
share/mysql-test/t/rpl_ndb_innodb_trans.test
share/mysql-test/t/rpl_openssl.test
@@ -1940,14 +2024,14 @@ share/mysql-test/t/rpl_timezone.test
share/mysql-test/t/rpl_transaction-master.opt
share/mysql-test/t/rpl_transaction-slave.opt
share/mysql-test/t/rpl_transaction.test
-share/mysql-test/t/rpl_trigger.test
+share/mysql-test/t/rpl_trigger_not_windows.test
+share/mysql-test/t/rpl_trigger_windows.test
share/mysql-test/t/rpl_trunc_temp.test
share/mysql-test/t/rpl_until.test
share/mysql-test/t/rpl_user.test
share/mysql-test/t/rpl_user_variables.test
share/mysql-test/t/rpl_variables-master.opt
share/mysql-test/t/rpl_variables.test
-share/mysql-test/t/rpl_view-slave.opt
share/mysql-test/t/rpl_view.test
share/mysql-test/t/schema.test
share/mysql-test/t/select.test
@@ -1966,6 +2050,7 @@ share/mysql-test/t/sp-code.test
share/mysql-test/t/sp-destruct.test
share/mysql-test/t/sp-dynamic.test
share/mysql-test/t/sp-error.test
+share/mysql-test/t/sp-fib.test
share/mysql-test/t/sp-prelocking.test
share/mysql-test/t/sp-security.test
share/mysql-test/t/sp-threads.test
@@ -1983,6 +2068,7 @@ share/mysql-test/t/ssl_8k_key.test
share/mysql-test/t/ssl_compress.test
share/mysql-test/t/ssl_connect.test
share/mysql-test/t/status.test
+share/mysql-test/t/status2.test
share/mysql-test/t/strict.test
share/mysql-test/t/strict_autoinc_1myisam.test
share/mysql-test/t/strict_autoinc_2innodb.test
@@ -1992,6 +2078,7 @@ share/mysql-test/t/strict_autoinc_5ndb.test
share/mysql-test/t/subselect.test
share/mysql-test/t/subselect2.test
share/mysql-test/t/subselect3.test
+share/mysql-test/t/subselect4.test
share/mysql-test/t/subselect_gis.test
share/mysql-test/t/subselect_innodb.test
share/mysql-test/t/subselect_notembedded.test
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index 47b693fe708d..f4d7b9b40e74 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.22 2009/07/19 13:50:20 tron Exp $
+$NetBSD: distinfo,v 1.23 2009/11/26 16:33:29 tron Exp $
-SHA1 (mysql-5.0.67.tar.gz) = 168090a4698a3a5efa2f2c9380a4352d4433d377
-RMD160 (mysql-5.0.67.tar.gz) = 05d38a5f8d91cb4dac1ee446af96b28163bd3722
-Size (mysql-5.0.67.tar.gz) = 28370810 bytes
+SHA1 (mysql-5.0.88.tar.gz) = 2dc7a462eaca1452eefd334888a6c40022deb352
+RMD160 (mysql-5.0.88.tar.gz) = a3ba4bd04e573b4a0bab073f36eec3ff44348ae6
+Size (mysql-5.0.88.tar.gz) = 22932765 bytes
SHA1 (patch-aa) = 913ffbbd5ce8496f412d30515fb5ecef23854023
-SHA1 (patch-ab) = 7d3ff56e929f93b4843d62014a3f5f37cc1e84bc
-SHA1 (patch-ac) = e35a56fd1cae5c471d51b52b2949406be891580c
-SHA1 (patch-ad) = b3246e3b2a666dffb72830c3ca30050a1e1263ca
+SHA1 (patch-ab) = 7c51a0214c3e6205605047c72b07eac6792600db
SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
SHA1 (patch-ag) = 6412da46f0d891b64d90c2e3f9b79a1ec442d617
@@ -14,9 +12,9 @@ SHA1 (patch-ah) = 7f0a59e03ced1f0c5947a807d99cb6fad64be597
SHA1 (patch-ai) = 56d3f66a903224b8d27213480e7ea3e485e52f1d
SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55
SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea
-SHA1 (patch-al) = 3b58ef9a835dc9cf39ff720516e5319d332f08f1
+SHA1 (patch-al) = a8232565e70d199b77e044152dee3df52564724b
SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5
-SHA1 (patch-an) = 4017b68e0b67c07810f756a2bfbc138ede5c954d
+SHA1 (patch-an) = c4f856a64ac7e2cadecf594744176d09736468d5
SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
SHA1 (patch-ca) = 97fe10dc40c5995b174f8e07dc5e22a72b9913f4
SHA1 (patch-cb) = f7dbc53f2405bf8a38c3d307dc68560a1b79ed01
diff --git a/databases/mysql5-server/patches/patch-ab b/databases/mysql5-server/patches/patch-ab
index 16e0f059a271..04596442b0f4 100644
--- a/databases/mysql5-server/patches/patch-ab
+++ b/databases/mysql5-server/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2007/12/14 13:36:54 tron Exp $
+$NetBSD: patch-ab,v 1.6 2009/11/26 16:33:29 tron Exp $
---- tests/Makefile.in.orig 2007-11-15 14:08:50.000000000 +0000
-+++ tests/Makefile.in 2007-12-13 23:57:31.000000000 +0000
-@@ -96,7 +96,7 @@
+--- tests/Makefile.in.orig 2009-11-09 18:38:12.000000000 +0000
++++ tests/Makefile.in 2009-11-26 14:43:24.000000000 +0000
+@@ -92,7 +92,7 @@
am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
my_memmem.$(OBJEXT)
mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
@@ -11,16 +11,16 @@ $NetBSD: patch-ab,v 1.5 2007/12/14 13:36:54 tron Exp $
am__DEPENDENCIES_2 =
mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2)
-@@ -106,7 +106,7 @@
+@@ -102,7 +102,7 @@
thread_test_SOURCES = thread_test.c
thread_test_OBJECTS = thread_test.$(OBJEXT)
thread_test_LDADD = $(LDADD)
-thread_test_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
+thread_test_DEPENDENCIES =
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -404,8 +404,7 @@
+@@ -403,8 +403,7 @@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes)
diff --git a/databases/mysql5-server/patches/patch-ac b/databases/mysql5-server/patches/patch-ac
deleted file mode 100644
index 012071f7e211..000000000000
--- a/databases/mysql5-server/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2009/07/19 13:50:20 tron Exp $
-
-Patch for CVE-2009-2446.
-
---- libmysqld/sql_parse.cc.orig 2008-08-04 13:20:10.000000000 +0100
-+++ libmysqld/sql_parse.cc 2009-07-19 14:07:08.000000000 +0100
-@@ -2028,7 +2028,7 @@
- }
- if (check_access(thd,CREATE_ACL,db,0,1,0,is_schema_db(db)))
- break;
-- mysql_log.write(thd,command,packet);
-+ mysql_log.write(thd,command,"%s",packet);
- bzero(&create_info, sizeof(create_info));
- mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db),
- &create_info, 0);
-@@ -2053,7 +2053,7 @@
- ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
- break;
- }
-- mysql_log.write(thd,command,db);
-+ mysql_log.write(thd,command,"%s",db);
- mysql_rm_db(thd, db, 0, 0);
- break;
- }
diff --git a/databases/mysql5-server/patches/patch-ad b/databases/mysql5-server/patches/patch-ad
deleted file mode 100644
index be6b60f53fba..000000000000
--- a/databases/mysql5-server/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2008/09/18 11:51:37 taca Exp $
-
---- sql/mysqld.cc.orig 2008-08-04 15:20:07.000000000 +0300
-+++ sql/mysqld.cc 2008-09-16 13:46:29.000000000 +0300
-@@ -181,7 +181,7 @@
- int initgroups(const char *,unsigned int);
- #endif
-
--#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
-+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
- #include
- #ifdef HAVE_FP_EXCEPT // Fix type conflict
- typedef fp_except fp_except_t;
-@@ -3705,7 +3705,7 @@
- init_ssl();
-
- #ifdef HAVE_LIBWRAP
-- libwrapName= my_progname+dirname_length(my_progname);
-+ libwrapName= (char *)my_progname+dirname_length(my_progname);
- openlog(libwrapName, LOG_PID, LOG_AUTH);
- #endif
-
diff --git a/databases/mysql5-server/patches/patch-al b/databases/mysql5-server/patches/patch-al
index 7b96ff492963..4b5d2c89d7bf 100644
--- a/databases/mysql5-server/patches/patch-al
+++ b/databases/mysql5-server/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.3 2007/03/11 18:42:50 adam Exp $
+$NetBSD: patch-al,v 1.4 2009/11/26 16:33:29 tron Exp $
---- myisam/Makefile.in.orig 2007-03-05 20:22:55.000000000 +0100
-+++ myisam/Makefile.in
-@@ -156,7 +156,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
+--- myisam/Makefile.in.orig 2009-11-09 18:37:52.000000000 +0000
++++ myisam/Makefile.in 2009-11-26 14:26:06.000000000 +0000
+@@ -152,7 +152,7 @@
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
+CCLD = $(CXX)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
diff --git a/databases/mysql5-server/patches/patch-an b/databases/mysql5-server/patches/patch-an
index 51b353b2ea42..057b01998b53 100644
--- a/databases/mysql5-server/patches/patch-an
+++ b/databases/mysql5-server/patches/patch-an
@@ -1,37 +1,13 @@
-$NetBSD: patch-an,v 1.5 2008/09/18 11:51:37 taca Exp $
+$NetBSD: patch-an,v 1.6 2009/11/26 16:33:29 tron Exp $
---- mysql-test/Makefile.in.orig 2008-08-04 15:22:09.000000000 +0300
-+++ mysql-test/Makefile.in 2008-09-16 13:52:20.000000000 +0300
-@@ -371,7 +371,7 @@
+--- mysql-test/Makefile.in.orig 2009-11-09 18:37:53.000000000 +0000
++++ mysql-test/Makefile.in 2009-11-26 15:16:50.000000000 +0000
+@@ -368,7 +368,7 @@
@HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
@HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
benchdir_root = $(prefix)
-testdir = $(benchdir_root)/mysql-test
+testdir = $(benchdir_root)/share/mysql-test
EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
- EXTRA_DIST = $(EXTRA_SCRIPTS) suite
+ EXTRA_DIST = $(EXTRA_SCRIPTS) suite collections
GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr
-@@ -749,15 +749,14 @@
- -rm -rf `find $(distdir)/suite -type d -name SCCS`
-
- install-data-local:
-- $(mkinstalldirs) \
-- $(DESTDIR)$(testdir)/t \
-- $(DESTDIR)$(testdir)/r \
-- $(DESTDIR)$(testdir)/include \
-- $(DESTDIR)$(testdir)/std_data \
-- $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \
-- $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \
-- $(DESTDIR)$(testdir)/lib \
-- $(DESTDIR)$(testdir)/std_data/funcs_1
-+ $(mkinstalldirs) $(DESTDIR)$(testdir)/t
-+ $(mkinstalldirs) $(DESTDIR)$(testdir)/r
-+ $(mkinstalldirs) $(DESTDIR)$(testdir)/include
-+ $(mkinstalldirs) $(DESTDIR)$(testdir)/std_data
-+ $(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be
-+ $(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le
-+ $(mkinstalldirs) $(DESTDIR)$(testdir)/lib
-+ $(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/funcs_1
- $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
- -$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
- $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t