Commit 8f09d1e7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/wax/mysql/mysql-4.1 

into mysql.com:/home/wax/mysql/mysql-4.1smemory
parents 20c04345 7199d9f4

mysql-test/mysql-test-run.sh

+2 −1
Original line number Diff line number Diff line
@@ -596,7 +596,8 @@ MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password= 
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 --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"

export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES CLIENT_BINDIR TESTS_BINDIR

export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES

export CLIENT_BINDIR TESTS_BINDIR CHARSETSDIR

export NDB_TOOLS_DIR



MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \

mysql-test/t/mysqldump.test

+5 −5
Original line number Diff line number Diff line
@@ -147,9 +147,9 @@ drop database mysqldump_test_db; 


CREATE TABLE t1 (a  CHAR(10));

INSERT INTO t1  VALUES (_latin1 '');

--exec $MYSQL_DUMP --skip-comments test t1

--exec $MYSQL_DUMP --skip-comments --compatible=mysql323 test t1

--exec $MYSQL_DUMP --skip-comments --compatible=mysql323 --default-character-set=cp850 test t1

--exec $MYSQL_DUMP --skip-comments --default-character-set=cp850 --compatible=mysql323 test t1

--exec $MYSQL_DUMP --skip-comments --default-character-set=utf8 --compatible=mysql323 test t1

--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments test t1

--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --compatible=mysql323 test t1

--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --compatible=mysql323 --default-character-set=cp850 test t1

--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=cp850 --compatible=mysql323 test t1

--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=utf8 --compatible=mysql323 test t1

DROP TABLE t1;