mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge rama.(none):/home/jimw/my/mysql-5.0-clean
into rama.(none):/home/jimw/my/mysql-5.1-clean mysqldump.result is wrong, will need to be cleaned up. client/mysqldump.c: Auto merged mysql-test/r/mysqldump.result: Resolve conflict (probably wrong) mysql-test/t/mysqldump.test: Resolve conflicts, make sure all tests new to 5.1 come after 'End of 5.0 tests'
This commit is contained in:
@ -1682,6 +1682,7 @@ select * from t1;
|
||||
a b
|
||||
Osnabr<EFBFBD>ck K<>ln
|
||||
drop table t1;
|
||||
--fields-optionally-enclosed-by="
|
||||
create table `t1` (
|
||||
t1_name varchar(255) default null,
|
||||
t1_id int(10) unsigned not null auto_increment,
|
||||
|
Reference in New Issue
Block a user