diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-13 13:26:52 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-13 13:26:52 +0300 |
| commit | 5c9e0cdc5309a7f16aa57a9a99e11f0c7740e7ec (patch) | |
| tree | b9a42417de7e14e4868ea1376a4a8fe0bbe85203 /mysql-test/r | |
| parent | 06451ae43751d71ef7e15b48b006853c9d929e59 (diff) | |
| parent | 74bab1fe02254e9fd4624fdc4c8d829a996840a4 (diff) | |
| download | mariadb-git-5c9e0cdc5309a7f16aa57a9a99e11f0c7740e7ec.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 640e6f02103..2798d1a9fab 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -12,7 +12,10 @@ create table t1(n int not null auto_increment primary key); insert into t1 values (NULL); drop table t1; create table t1 (word char(20) not null); -load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; +select count(*) from t1; +count(*) +69 drop table t1; show binlog events; Log_name Pos Event_type Server_id Orig_log_pos Info |