database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Auto merged
mysql-test/r/rpl_loaddata_s.result:
  Auto merged
mysql-test/r/rpl_misc_functions.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_s.test:
  Auto merged
mysql-test/t/rpl_misc_functions.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/r/mysqltest.result:
  Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
  "Use local" when merging 5.0 -> 5.1
This commit is contained in:
unknown
2006-02-07 18:04:50 +01:00
parent 0522905ac3 6af1dca556
commit d942f408bc
77 changed files with 450 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/rpl_loaddata_s.result
View File

@ -6,7 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
reset master;
create table test.t1(a int, b int, unique(b));
load data infile '../../std_data/rpl_loaddata.dat' into table test.t1;
load data infile '../std_data_ln/rpl_loaddata.dat' into table test.t1;
select count(*) from test.t1;
count(*)
2