diff options
author | unknown <monty@mashka.mysql.fi> | 2003-02-17 05:43:37 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-02-17 05:43:37 +0200 |
commit | e793dfe95e70c60af4a517ba7a5255ad15d48d95 (patch) | |
tree | a3fbfddbae0d5a6e600e68942bb243fadb5269aa /mysql-test/t/rpl000001.test | |
parent | 77f5c5a7cf4e99fa3d760f1541bafec3b182def3 (diff) | |
parent | 300b3fb64280ae3d982745b683029a2722b3daef (diff) | |
download | mariadb-git-e793dfe95e70c60af4a517ba7a5255ad15d48d95.tar.gz |
Merge with 4.0.11 tree to get latest bug fixes
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/rpl000004.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/structs.h:
Auto merged
Makefile.am:
Merge with 4.0.11
mysql-test/mysql-test-run.sh:
Merge with 4.0.11
mysql-test/r/rpl_log.result:
Use local version (needs to be updated)
mysql-test/t/type_blob.test:
Merge with 4.0.11
sql/mysqld.cc:
Merge with 4.0.11
sql/protocol.cc:
Use local version
Diffstat (limited to 'mysql-test/t/rpl000001.test')
-rw-r--r-- | mysql-test/t/rpl000001.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test index 3975f14e523..d562a47ef90 100644 --- a/mysql-test/t/rpl000001.test +++ b/mysql-test/t/rpl000001.test @@ -4,7 +4,7 @@ create table t1 (word char(20) not null); load data infile '../../std_data/words.dat' into table t1; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR eval load data local infile '$MYSQL_TEST_DIR/std_data/words.dat' into table t1; -select * from t1; +select * from t1 limit 10; # # Test slave with wrong password |