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.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mysql-test/mysql-test-run.sh') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 3e7a54fdead..259cb8cb5e4 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -546,6 +546,11 @@ if [ x$SOURCE_DIST = x1 ] ; then else MYSQL_DUMP="$BASEDIR/client/mysqldump" fi + if [ -f "$BASEDIR/client/.libs/mysqlimport" ] ; then + MYSQL_IMPORT="$BASEDIR/client/.libs/mysqlimport" + else + MYSQL_IMPORT="$BASEDIR/client/mysqlimport" + fi if [ -f "$BASEDIR/client/.libs/mysqlbinlog" ] ; then MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog" else @@ -614,6 +619,7 @@ else fi MYSQL_TEST="$CLIENT_BINDIR/mysqltest" MYSQL_DUMP="$CLIENT_BINDIR/mysqldump" + MYSQL_IMPORT="$CLIENT_BINDIR/mysqlimport" MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog" MYSQLADMIN="$CLIENT_BINDIR/mysqladmin" WAIT_PID="$CLIENT_BINDIR/mysql_waitpid" @@ -693,10 +699,11 @@ fi MYSQL_DUMP_DIR="$MYSQL_DUMP" export MYSQL_DUMP_DIR MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT" +MYSQL_IMPORT="$MYSQL_IMPORT -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT" MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT" MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose" MYSQL="$MYSQL --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD" -export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES +export MYSQL MYSQL_DUMP MYSQL_IMPORT MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR export NDB_TOOLS_DIR export NDB_MGM -- cgit v1.2.1