Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into ramayana.hindu.god:/home/tsmith/m/bk/maint/51

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
27ef9523 · tsmith@ramayana.hindu.god · 4463163c · f4309e17 · 27ef9523 · 27ef9523
Commit 27ef9523 authored Jul 18, 2007 by tsmith@ramayana.hindu.god
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

mysql-test/t/ddl_i18n_koi8r.test mysql-test/t/ddl_i18n_koi8r.test +2 -0

mysql-test/t/ddl_i18n_utf8.test mysql-test/t/ddl_i18n_utf8.test +2 -0

No files found.
--- a/mysql-test/t/ddl_i18n_koi8r.test
+++ b/mysql-test/t/ddl_i18n_koi8r.test
@@ -30,6 +30,8 @@
 #
 ###########################################################################
+# Test requires server to accept client connections (for mysqldump portions)
+--source include/not_embedded.inc
 --source include/have_utf8.inc
 --source include/have_cp866.inc
 --source include/have_cp1251.inc

--- a/mysql-test/t/ddl_i18n_utf8.test
+++ b/mysql-test/t/ddl_i18n_utf8.test
@@ -30,6 +30,8 @@
 #
 ###########################################################################
+# Test requires server to accept client connections (for mysqldump portions)
+--source include/not_embedded.inc
 --source include/have_utf8.inc
 --source include/have_cp866.inc
 --source include/have_cp1251.inc