mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Post-merge fixes:

Browse source 
- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc


client/Makefile.am:
  Post-merge fix
mysql-test/include/loaddata_autocom.inc:
  Add dummy primary key to test table, because NDB doesn't like BLOB w/ no PK
mysql-test/r/loaddata_autocom_innodb.result:
  Adapt test results to modified loaddata_autocom.inc
mysql-test/r/loaddata_autocom_ndb.result:
  Adapt test results to modified loaddata_autocom.inc
server-tools/instance-manager/Makefile.am:
  Post-merge fix
sql/log.h:
  Post-merge fix
storage/innobase/Makefile.am:
  Post-merge fix
This commit is contained in:
unknown 2006-09-13 15:37:35 -06:00
commit 3f2f1c2bfd
7 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/r/loaddata_autocom_innodb.result
View file

@ -1,8 +1,8 @@
SET SESSION STORAGE_ENGINE = InnoDB;
drop table if exists t1;
create table t1 (a text, b text);
create table t1 (id int unsigned not null auto_increment primary key, a text, b text);
start transaction;
load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b);
Warnings:
Warning 1261 Row 3 doesn't contain data for all columns
commit;
@ -11,7 +11,7 @@ count(*)
4
truncate table t1;
start transaction;
load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b);
Warnings:
Warning 1261 Row 3 doesn't contain data for all columns
rollback;

6
mysql-test/r/loaddata_autocom_ndb.result
View file

@ -1,8 +1,8 @@
SET SESSION STORAGE_ENGINE = ndbcluster;
drop table if exists t1;
create table t1 (a text, b text);
create table t1 (id int unsigned not null auto_increment primary key, a text, b text);
start transaction;
load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b);
Warnings:
Warning 1261 Row 3 doesn't contain data for all columns
commit;
@ -11,7 +11,7 @@ count(*)
4
truncate table t1;
start transaction;
load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b);
Warnings:
Warning 1261 Row 3 doesn't contain data for all columns
rollback;