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

Update results after merge

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2003-10-16 08:16:39 +03:00
parent 72f0236336
commit a3707408e8
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/create.result
View File

@ -220,10 +220,12 @@ ERROR 23000: Column 'k1' cannot be null
insert into t1 values (NULL, NULL); insert into t1 values (NULL, NULL);
ERROR 23000: Column 'k1' cannot be null ERROR 23000: Column 'k1' cannot be null
drop table t1; drop table t1;
create table t1 select x'4132';
drop table t1;
create table t1 select 1,2,3; create table t1 select 1,2,3;
create table if not exists t1 select 1,2; create table if not exists t1 select 1,2;
create table if not exists t1 select 1,2,3,4; create table if not exists t1 select 1,2,3,4;
Column count doesn't match value count at row 1 ERROR 21S01: Column count doesn't match value count at row 1
create table if not exists t1 select 1; create table if not exists t1 select 1;
select * from t1; select * from t1;
1 2 3 1 2 3
@ -234,7 +236,7 @@ drop table t1;
create table t1 select 1,2,3; create table t1 select 1,2,3;
create table if not exists t1 select 1,2; create table if not exists t1 select 1,2;
create table if not exists t1 select 1,2,3,4; create table if not exists t1 select 1,2,3,4;
Column count doesn't match value count at row 1 ERROR 21S01: Column count doesn't match value count at row 1
create table if not exists t1 select 1; create table if not exists t1 select 1;
select * from t1; select * from t1;
1 2 3 1 2 3
@ -251,7 +253,7 @@ a b
0 2 0 2
create table if not exists t1 select 3 as 'a',4 as 'b'; create table if not exists t1 select 3 as 'a',4 as 'b';
create table if not exists t1 select 3 as 'a',3 as 'b'; create table if not exists t1 select 3 as 'a',3 as 'b';
Duplicate entry '3' for key 1 ERROR 23000: Duplicate entry '3' for key 1
select * from t1; select * from t1;
a b a b
1 1 1 1
@ -358,8 +360,6 @@ t1 CREATE TABLE `t1` (
) TYPE=MyISAM CHARSET=latin1 ) TYPE=MyISAM CHARSET=latin1
SET SESSION table_type=default; SET SESSION table_type=default;
drop table t1; drop table t1;
create table t1 select x'4132';
drop table t1;
create table t1(a int,b int,c int unsigned,d date,e char,f datetime,g time,h blob); create table t1(a int,b int,c int unsigned,d date,e char,f datetime,g time,h blob);
insert into t1(a)values(1); insert into t1(a)values(1);
insert into t1(a,b,c,d,e,f,g,h) insert into t1(a,b,c,d,e,f,g,h)

3
mysql-test/r/mysqldump.result
View File

@ -4,8 +4,6 @@ INSERT INTO t1 VALUES (1), (2);
<?xml version="1.0"?> <?xml version="1.0"?>
<mysqldump> <mysqldump>
<database name="test"> <database name="test">
DROP TABLE IF EXISTS t1;
LOCK TABLES t1 WRITE;
<table name="t1"> <table name="t1">
<row> <row>
<field name="a">1</field> <field name="a">1</field>
@ -14,7 +12,6 @@ LOCK TABLES t1 WRITE;
<field name="a">2</field> <field name="a">2</field>
</row> </row>
</table> </table>
UNLOCK TABLES;
</database> </database>
</mysqldump> </mysqldump>
DROP TABLE t1; DROP TABLE t1;