From cf59103d84e648467f8c95d4804e498b7113e61a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 Oct 2005 14:50:08 -0700 Subject: BUG# 12123 Made change to mysqlimport to set character_set_database to binary to make importing various charsets/columns work correctly. client/mysqlimport.c: BUG# 12123 Added 'set @@character_set_database=binary' to make loading of tables with mixed charset types and non-latin characters load. mysql-test/mysql-test-run.pl: BUG #12123 Added $MYSQL_IMPORT in order to test mysqlimport bug. mysql-test/mysql-test-run.sh: BUG #12123 Added $MYSQL_IMPORT in order to test mysqlimport bug. mysql-test/r/mysqldump.result: BUG #12123 Added dumping and reloading (using mysql, mysqldump, and mysqlimport) to show that this fix handles dumping and reloading of non-latin1 charsets in table with different charset columns (mixing of charsets, also can be a UTF table with latin1 tables). Note the select before and after dump and restore - should be exact. mysql-test/t/mysqldump.test: BUG #12123 Added dumping and reloading (using mysql, mysqldump, and mysqlimport) to show that this fix handles dumping and reloading of non-latin1 charsets in table with different charset columns (mixing of charsets, also can be a UTF table with latin1 tables). Note the select before and after dump and restore - should be exact. (results of this) --- mysql-test/mysql-test-run.pl | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'mysql-test/mysql-test-run.pl') diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 4b055e0bb84..3583d8a7124 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -172,6 +172,7 @@ our $exe_mysqlbinlog; our $exe_mysql_client_test; our $exe_mysqld; our $exe_mysqldump; # Called from test case +our $exe_mysqlimport; # Called from test case our $exe_mysqlshow; # Called from test case our $exe_mysql_fix_system_tables; our $exe_mysqltest; @@ -861,6 +862,7 @@ sub executable_setup () { "/usr/bin/false"); } $exe_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump"); + $exe_mysqlimport= mtr_exe_exists("$path_client_bindir/mysqlimport"); $exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow"); $exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog"); $exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin"); @@ -2076,6 +2078,14 @@ sub run_mysqltest ($) { $cmdline_mysqldump .= " --debug=d:t:A,$opt_vardir/log/mysqldump.trace"; } + my $cmdline_mysqlimport= "$exe_mysqlimport -uroot " . + "--port=$master->[0]->{'path_myport'} " . + "--socket=$master->[0]->{'path_mysock'} --password="; + if ( $opt_debug ) + { + $cmdline_mysqlimport .= + " --debug=d:t:A,$opt_vardir/log/mysqlimport.trace"; + } my $cmdline_mysqlshow= "$exe_mysqlshow -uroot " . "--port=$master->[0]->{'path_myport'} " . @@ -2126,6 +2136,7 @@ sub run_mysqltest ($) { $ENV{'MYSQL'}= $cmdline_mysql; $ENV{'MYSQL_DUMP'}= $cmdline_mysqldump; + $ENV{'MYSQL_IMPORT'}= $cmdline_mysqlimport; $ENV{'MYSQL_SHOW'}= $cmdline_mysqlshow; $ENV{'MYSQL_BINLOG'}= $cmdline_mysqlbinlog; $ENV{'MYSQL_FIX_SYSTEM_TABLES'}= $cmdline_mysql_fix_system_tables; -- cgit v1.2.1