Skip to content

M
mariadb
Commit 407f73c8 authored by antony@pcg5ppc.xiphis.org's avatar antony@pcg5ppc.xiphis.org
Browse files
Options

Merge pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1 

into  pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1-merge-5.1-engines
parents 672290b0 f4a153c3
Show whitespace changes
Inline Side-by-side
Showing with 240 additions and 125 deletions
mysql-test/r/csv.result
View file @ 407f73c8
...@@ -4929,7 +4929,7 @@ Note 1051 Unknown table 't2' ...@@ -4929,7 +4929,7 @@ Note 1051 Unknown table 't2'
Note 1051 Unknown table 't3' Note 1051 Unknown table 't3'
Note 1051 Unknown table 't4' Note 1051 Unknown table 't4'
DROP TABLE IF EXISTS bug13894; DROP TABLE IF EXISTS bug13894;
CREATE TABLE bug13894 ( val integer ) ENGINE = CSV; CREATE TABLE bug13894 ( val integer not null ) ENGINE = CSV;
INSERT INTO bug13894 VALUES (5); INSERT INTO bug13894 VALUES (5);
INSERT INTO bug13894 VALUES (10); INSERT INTO bug13894 VALUES (10);
INSERT INTO bug13894 VALUES (11); INSERT INTO bug13894 VALUES (11);
...@@ -4949,7 +4949,7 @@ val ...@@ -4949,7 +4949,7 @@ val
11 11
DROP TABLE bug13894; DROP TABLE bug13894;
DROP TABLE IF EXISTS bug14672; DROP TABLE IF EXISTS bug14672;
CREATE TABLE bug14672 (c1 integer) engine = CSV; CREATE TABLE bug14672 (c1 integer not null) engine = CSV;
INSERT INTO bug14672 VALUES (1), (2), (3); INSERT INTO bug14672 VALUES (1), (2), (3);
SELECT * FROM bug14672; SELECT * FROM bug14672;
c1 c1
...@@ -4975,7 +4975,7 @@ c1 ...@@ -4975,7 +4975,7 @@ c1
4 4
5 5
DROP TABLE bug14672; DROP TABLE bug14672;
CREATE TABLE test_concurrent_insert ( val integer ) ENGINE = CSV; CREATE TABLE test_concurrent_insert ( val integer not null ) ENGINE = CSV;
LOCK TABLES test_concurrent_insert READ LOCAL; LOCK TABLES test_concurrent_insert READ LOCAL;
INSERT INTO test_concurrent_insert VALUES (1); INSERT INTO test_concurrent_insert VALUES (1);
SELECT * FROM test_concurrent_insert; SELECT * FROM test_concurrent_insert;
...@@ -4992,7 +4992,7 @@ val ...@@ -4992,7 +4992,7 @@ val
2 2
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE test_concurrent_insert; DROP TABLE test_concurrent_insert;
CREATE TABLE test_repair_table ( val integer ) ENGINE = CSV; CREATE TABLE test_repair_table ( val integer not null ) ENGINE = CSV;
CHECK TABLE test_repair_table; CHECK TABLE test_repair_table;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.test_repair_table check status OK test.test_repair_table check status OK
...@@ -5000,7 +5000,7 @@ REPAIR TABLE test_repair_table; ...@@ -5000,7 +5000,7 @@ REPAIR TABLE test_repair_table;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.test_repair_table repair status OK test.test_repair_table repair status OK
DROP TABLE test_repair_table; DROP TABLE test_repair_table;
CREATE TABLE test_repair_table2 ( val integer ) ENGINE = CSV; CREATE TABLE test_repair_table2 ( val integer not null ) ENGINE = CSV;
SELECT * from test_repair_table2; SELECT * from test_repair_table2;
val val
Warnings: Warnings:
...@@ -5011,7 +5011,7 @@ CHECK TABLE test_repair_table2; ...@@ -5011,7 +5011,7 @@ CHECK TABLE test_repair_table2;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.test_repair_table2 check status OK test.test_repair_table2 check status OK
DROP TABLE test_repair_table2; DROP TABLE test_repair_table2;
CREATE TABLE test_repair_table3 ( val integer ) ENGINE = CSV; CREATE TABLE test_repair_table3 ( val integer not null ) ENGINE = CSV;
CHECK TABLE test_repair_table3; CHECK TABLE test_repair_table3;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.test_repair_table3 check error Corrupt test.test_repair_table3 check error Corrupt
...@@ -5114,7 +5114,7 @@ num magic_no company_name founded ...@@ -5114,7 +5114,7 @@ num magic_no company_name founded
1 0102 CORRECT 1876 1 0102 CORRECT 1876
1 0102 CORRECT2 1876 1 0102 CORRECT2 1876
DROP TABLE test_repair_table5; DROP TABLE test_repair_table5;
create table t1 (a int) engine=csv; create table t1 (a int not null) engine=csv;
insert t1 values (1); insert t1 values (1);
delete from t1; delete from t1;
affected rows: 1 affected rows: 1
...@@ -5138,7 +5138,7 @@ insert t1 values (1),(2),(3),(4),(5); ...@@ -5138,7 +5138,7 @@ insert t1 values (1),(2),(3),(4),(5);
truncate table t1; truncate table t1;
affected rows: 0 affected rows: 0
drop table t1; drop table t1;
create table t1 (v varchar(32)); create table t1 (v varchar(32) not null);
insert into t1 values ('def'),('abc'),('hij'),('3r4f'); insert into t1 values ('def'),('abc'),('hij'),('3r4f');
select * from t1; select * from t1;
v v
...@@ -5193,8 +5193,8 @@ select * from t1 where i between 2 and 4 and v in ('def','3r4f','lmn'); ...@@ -5193,8 +5193,8 @@ select * from t1 where i between 2 and 4 and v in ('def','3r4f','lmn');
i v i v
4 3r4f 4 3r4f
drop table t1; drop table t1;
create table bug15205 (val int(11) default null) engine=csv; create table bug15205 (val int(11) not null) engine=csv;
create table bug15205_2 (val int(11) default null) engine=csv; create table bug15205_2 (val int(11) not null) engine=csv;
select * from bug15205; select * from bug15205;
ERROR HY000: Can't get stat of './test/bug15205.CSV' (Errcode: 2) ERROR HY000: Can't get stat of './test/bug15205.CSV' (Errcode: 2)
select * from bug15205_2; select * from bug15205_2;
...@@ -5205,8 +5205,8 @@ drop table bug15205; ...@@ -5205,8 +5205,8 @@ drop table bug15205;
drop table bug15205_2; drop table bug15205_2;
set names latin1; set names latin1;
create table t1 ( create table t1 (
c varchar(1), c varchar(1) not null,
name varchar(64) name varchar(64) not null
) character set latin1 engine=csv; ) character set latin1 engine=csv;
insert into t1 values (0xC0,'LATIN CAPITAL LETTER A WITH GRAVE'); insert into t1 values (0xC0,'LATIN CAPITAL LETTER A WITH GRAVE');
insert into t1 values (0xE0,'LATIN SMALL LETTER A WITH GRAVE'); insert into t1 values (0xE0,'LATIN SMALL LETTER A WITH GRAVE');
...@@ -5224,9 +5224,9 @@ FE ...@@ -5224,9 +5224,9 @@ FE
FF LATIN SMALL LETTER Y WITH DIAERESIS FF LATIN SMALL LETTER Y WITH DIAERESIS
drop table t1; drop table t1;
End of 5.0 tests End of 5.0 tests
create table bug22080_1 (id int,string varchar(64)) Engine=CSV; create table bug22080_1 (id int not null,string varchar(64) not null) Engine=CSV;
create table bug22080_2 (id int,string varchar(64)) Engine=CSV; create table bug22080_2 (id int not null,string varchar(64) not null) Engine=CSV;
create table bug22080_3 (id int,string varchar(64)) Engine=CSV; create table bug22080_3 (id int not null,string varchar(64) not null) Engine=CSV;
insert into bug22080_1 values(1,'string'); insert into bug22080_1 values(1,'string');
insert into bug22080_1 values(2,'string'); insert into bug22080_1 values(2,'string');
insert into bug22080_1 values(3,'string'); insert into bug22080_1 values(3,'string');
...@@ -5237,7 +5237,7 @@ check table bug22080_3; ...@@ -5237,7 +5237,7 @@ check table bug22080_3;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.bug22080_3 check error Corrupt test.bug22080_3 check error Corrupt
drop tables bug22080_1,bug22080_2,bug22080_3; drop tables bug22080_1,bug22080_2,bug22080_3;
create table float_test (id float,string varchar(64)) Engine=CSV; create table float_test (id float not null,string varchar(64) not null) Engine=CSV;
insert into float_test values(1.0,'string'); insert into float_test values(1.0,'string');
insert into float_test values(2.23,'serg.g'); insert into float_test values(2.23,'serg.g');
insert into float_test values(0.03,'string'); insert into float_test values(0.03,'string');
...@@ -5254,14 +5254,14 @@ id string ...@@ -5254,14 +5254,14 @@ id string
9.67 string 9.67 string
drop table float_test; drop table float_test;
CREATE TABLE `bug21328` ( CREATE TABLE `bug21328` (
`col1` int(11) DEFAULT NULL, `col1` int(11) NOT NULL,
`col2` int(11) DEFAULT NULL, `col2` int(11) NOT NULL,
`col3` int(11) DEFAULT NULL `col3` int(11) NOT NULL
) ENGINE=CSV; ) ENGINE=CSV;
insert into bug21328 values (1,NULL,NULL); insert into bug21328 values (1,0,0);
alter table bug21328 engine=myisam; alter table bug21328 engine=myisam;
drop table bug21328; drop table bug21328;
create table t1(a blob, b int) engine=csv; create table t1(a blob not null, b int not null) engine=csv;
insert into t1 values('a', 1); insert into t1 values('a', 1);
flush tables; flush tables;
update t1 set b=2; update t1 set b=2;
...@@ -5269,7 +5269,7 @@ select * from t1; ...@@ -5269,7 +5269,7 @@ select * from t1;
a b a b
a 2 a 2
drop table t1; drop table t1;
create table t1(a int) engine=csv; create table t1(a int not null) engine=csv;
insert into t1 values(-1), (-123.34), (2), (-23); insert into t1 values(-1), (-123.34), (2), (-23);
select * from t1; select * from t1;
a a
...@@ -5281,7 +5281,7 @@ check table t1; ...@@ -5281,7 +5281,7 @@ check table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check status OK
drop table t1; drop table t1;
create table t1(a int, b int) engine=csv; create table t1(a int not null, b int not null) engine=csv;
repair table t1; repair table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair Warning Data truncated for column 'a' at row 5 test.t1 repair Warning Data truncated for column 'a' at row 5
...@@ -5299,7 +5299,7 @@ check table t1; ...@@ -5299,7 +5299,7 @@ check table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check status OK
drop table t1; drop table t1;
create table t1(a int) engine=csv; create table t1(a int not null) engine=csv;
insert into t1 values (0), (1), (2); insert into t1 values (0), (1), (2);
delete from t1 limit 2; delete from t1 limit 2;
check table t1; check table t1;
...@@ -5315,4 +5315,62 @@ test.t1 check status OK ...@@ -5315,4 +5315,62 @@ test.t1 check status OK
select * from t1; select * from t1;
a a
drop table t1; drop table t1;
create table t1(a datetime not null) engine=csv;
insert into t1 values();
Warnings:
Warning 1364 Field 'a' doesn't have a default value
select * from t1;
a
0000-00-00 00:00:00
drop table t1;
create table t1(a set('foo','bar') not null) engine=csv;
insert into t1 values();
Warnings:
Warning 1364 Field 'a' doesn't have a default value
select * from t1;
a
drop table t1;
create table t1(a varchar(32) not null) engine=csv;
insert into t1 values();
Warnings:
Warning 1364 Field 'a' doesn't have a default value
select * from t1;
a
drop table t1;
create table t1(a int not null) engine=csv;
insert into t1 values();
Warnings:
Warning 1364 Field 'a' doesn't have a default value
select * from t1;
a
0
drop table t1;
create table t1(a blob not null) engine=csv;
insert into t1 values();
Warnings:
Warning 1364 Field 'a' doesn't have a default value
select * from t1;
a
drop table t1;
create table t1(a bit(1) not null) engine=csv;
insert into t1 values();
Warnings:
Warning 1364 Field 'a' doesn't have a default value
select BIN(a) from t1;
BIN(a)
0
drop table t1;
create table t1(a enum('foo','bar') default null) engine=csv;
ERROR HY000: Can't create table 'test.t1' (errno: -1)
create table t1(a enum('foo','bar') default 'foo') engine=csv;
ERROR HY000: Can't create table 'test.t1' (errno: -1)
create table t1(a enum('foo','bar') default 'foo' not null) engine=csv;
insert into t1 values();
select * from t1;
a
foo
drop table t1;
End of 5.1 tests End of 5.1 tests
mysql-test/r/log_tables.result
View file @ 407f73c8
...@@ -42,20 +42,20 @@ show create table mysql.general_log; ...@@ -42,20 +42,20 @@ show create table mysql.general_log;
Table Create Table Table Create Table
general_log CREATE TABLE `general_log` ( general_log CREATE TABLE `general_log` (
`event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`user_host` mediumtext, `user_host` mediumtext NOT NULL,
`thread_id` int(11) DEFAULT NULL, `thread_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`command_type` varchar(64) DEFAULT NULL, `command_type` varchar(64) NOT NULL,
`argument` mediumtext `argument` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
show fields from mysql.general_log; show fields from mysql.general_log;
Field Type Null Key Default Extra Field Type Null Key Default Extra
event_time timestamp NO CURRENT_TIMESTAMP event_time timestamp NO CURRENT_TIMESTAMP
user_host mediumtext YES NULL user_host mediumtext NO NULL
thread_id int(11) YES NULL thread_id int(11) NO NULL
server_id int(11) YES NULL server_id int(11) NO NULL
command_type varchar(64) YES NULL command_type varchar(64) NO NULL
argument mediumtext YES NULL argument mediumtext NO NULL
show create table mysql.slow_log; show create table mysql.slow_log;
Table Create Table Table Create Table
slow_log CREATE TABLE `slow_log` ( slow_log CREATE TABLE `slow_log` (
...@@ -65,10 +65,10 @@ slow_log CREATE TABLE `slow_log` ( ...@@ -65,10 +65,10 @@ slow_log CREATE TABLE `slow_log` (
`lock_time` time NOT NULL, `lock_time` time NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` int(11) NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` int(11) NOT NULL,
`db` varchar(512) DEFAULT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) DEFAULT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) DEFAULT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`sql_text` mediumtext NOT NULL `sql_text` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
show fields from mysql.slow_log; show fields from mysql.slow_log;
...@@ -79,10 +79,10 @@ query_time time NO NULL ...@@ -79,10 +79,10 @@ query_time time NO NULL
lock_time time NO NULL lock_time time NO NULL
rows_sent int(11) NO NULL rows_sent int(11) NO NULL
rows_examined int(11) NO NULL rows_examined int(11) NO NULL
db varchar(512) YES NULL db varchar(512) NO NULL
last_insert_id int(11) YES NULL last_insert_id int(11) NO NULL
insert_id int(11) YES NULL insert_id int(11) NO NULL
server_id int(11) YES NULL server_id int(11) NO NULL
sql_text mediumtext NO NULL sql_text mediumtext NO NULL
flush logs; flush logs;
flush tables; flush tables;
...@@ -141,11 +141,11 @@ show create table mysql.general_log; ...@@ -141,11 +141,11 @@ show create table mysql.general_log;
Table Create Table Table Create Table
general_log CREATE TABLE `general_log` ( general_log CREATE TABLE `general_log` (
`event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`user_host` mediumtext, `user_host` mediumtext NOT NULL,
`thread_id` int(11) DEFAULT NULL, `thread_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`command_type` varchar(64) DEFAULT NULL, `command_type` varchar(64) NOT NULL,
`argument` mediumtext `argument` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
show create table mysql.slow_log; show create table mysql.slow_log;
Table Create Table Table Create Table
...@@ -156,10 +156,10 @@ slow_log CREATE TABLE `slow_log` ( ...@@ -156,10 +156,10 @@ slow_log CREATE TABLE `slow_log` (
`lock_time` time NOT NULL, `lock_time` time NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` int(11) NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` int(11) NOT NULL,
`db` varchar(512) DEFAULT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) DEFAULT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) DEFAULT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`sql_text` mediumtext NOT NULL `sql_text` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
alter table mysql.general_log engine=myisam; alter table mysql.general_log engine=myisam;
...@@ -168,11 +168,11 @@ show create table mysql.general_log; ...@@ -168,11 +168,11 @@ show create table mysql.general_log;
Table Create Table Table Create Table
general_log CREATE TABLE `general_log` ( general_log CREATE TABLE `general_log` (
`event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`user_host` mediumtext, `user_host` mediumtext NOT NULL,
`thread_id` int(11) DEFAULT NULL, `thread_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`command_type` varchar(64) DEFAULT NULL, `command_type` varchar(64) NOT NULL,
`argument` mediumtext `argument` mediumtext NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='General log' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='General log'
show create table mysql.slow_log; show create table mysql.slow_log;
Table Create Table Table Create Table
...@@ -183,10 +183,10 @@ slow_log CREATE TABLE `slow_log` ( ...@@ -183,10 +183,10 @@ slow_log CREATE TABLE `slow_log` (
`lock_time` time NOT NULL, `lock_time` time NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` int(11) NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` int(11) NOT NULL,
`db` varchar(512) DEFAULT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) DEFAULT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) DEFAULT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`sql_text` mediumtext NOT NULL `sql_text` mediumtext NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Slow log' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Slow log'
set global general_log='ON'; set global general_log='ON';
...@@ -241,11 +241,11 @@ use mysql; ...@@ -241,11 +241,11 @@ use mysql;
CREATE TABLE `general_log` ( CREATE TABLE `general_log` (
`event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP, ON UPDATE CURRENT_TIMESTAMP,
`user_host` mediumtext, `user_host` mediumtext NOT NULL,
`thread_id` int(11) DEFAULT NULL, `thread_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`command_type` varchar(64) DEFAULT NULL, `command_type` varchar(64) NOT NULL,
`argument` mediumtext `argument` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'; ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log';
CREATE TABLE `slow_log` ( CREATE TABLE `slow_log` (
`start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP `start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
...@@ -255,10 +255,10 @@ ON UPDATE CURRENT_TIMESTAMP, ...@@ -255,10 +255,10 @@ ON UPDATE CURRENT_TIMESTAMP,
`lock_time` time NOT NULL, `lock_time` time NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` int(11) NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` int(11) NOT NULL,
`db` varchar(512) DEFAULT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) DEFAULT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) DEFAULT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`sql_text` mediumtext NOT NULL `sql_text` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'; ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log';
set global general_log='ON'; set global general_log='ON';
...@@ -399,9 +399,9 @@ My own slow query sleep(2) ...@@ -399,9 +399,9 @@ My own slow query sleep(2)
My own slow query 0 My own slow query 0
SELECT * FROM mysql.slow_log WHERE seq >= 2 LIMIT 3; SELECT * FROM mysql.slow_log WHERE seq >= 2 LIMIT 3;
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text seq start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text seq
START_TIME USER_HOST QUERY_TIME 00:00:00 1 0 test NULL NULL 1 SELECT "My own slow query", sleep(2) 2 START_TIME USER_HOST QUERY_TIME 00:00:00 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 2
START_TIME USER_HOST QUERY_TIME 00:00:00 1 0 test NULL NULL 1 SELECT "My own slow query", sleep(2) 3 START_TIME USER_HOST QUERY_TIME 00:00:00 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 3
START_TIME USER_HOST QUERY_TIME 00:00:00 1 0 test NULL NULL 1 SELECT "My own slow query", sleep(2) 4 START_TIME USER_HOST QUERY_TIME 00:00:00 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 4
SET GLOBAL slow_query_log = 0; SET GLOBAL slow_query_log = 0;
SET SESSION long_query_time =@old_long_query_time; SET SESSION long_query_time =@old_long_query_time;
FLUSH LOGS; FLUSH LOGS;
......
mysql-test/r/system_mysql_db.result
View file @ 407f73c8
...@@ -240,11 +240,11 @@ show create table general_log; ...@@ -240,11 +240,11 @@ show create table general_log;
Table Create Table Table Create Table
general_log CREATE TABLE `general_log` ( general_log CREATE TABLE `general_log` (
`event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`user_host` mediumtext, `user_host` mediumtext NOT NULL,
`thread_id` int(11) DEFAULT NULL, `thread_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`command_type` varchar(64) DEFAULT NULL, `command_type` varchar(64) NOT NULL,
`argument` mediumtext `argument` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
show create table slow_log; show create table slow_log;
Table Create Table Table Create Table
...@@ -255,10 +255,10 @@ slow_log CREATE TABLE `slow_log` ( ...@@ -255,10 +255,10 @@ slow_log CREATE TABLE `slow_log` (
`lock_time` time NOT NULL, `lock_time` time NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` int(11) NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` int(11) NOT NULL,
`db` varchar(512) DEFAULT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) DEFAULT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) DEFAULT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`sql_text` mediumtext NOT NULL `sql_text` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log' ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
show tables; show tables;
......
mysql-test/t/csv.test
View file @ 407f73c8
...@@ -1322,7 +1322,7 @@ drop table if exists t1,t2,t3,t4; ...@@ -1322,7 +1322,7 @@ drop table if exists t1,t2,t3,t4;
DROP TABLE IF EXISTS bug13894; DROP TABLE IF EXISTS bug13894;
--enable_warnings --enable_warnings
CREATE TABLE bug13894 ( val integer ) ENGINE = CSV; CREATE TABLE bug13894 ( val integer not null ) ENGINE = CSV;
INSERT INTO bug13894 VALUES (5); INSERT INTO bug13894 VALUES (5);
INSERT INTO bug13894 VALUES (10); INSERT INTO bug13894 VALUES (10);
INSERT INTO bug13894 VALUES (11); INSERT INTO bug13894 VALUES (11);
...@@ -1340,7 +1340,7 @@ DROP TABLE bug13894; ...@@ -1340,7 +1340,7 @@ DROP TABLE bug13894;
DROP TABLE IF EXISTS bug14672; DROP TABLE IF EXISTS bug14672;
--enable_warnings --enable_warnings
CREATE TABLE bug14672 (c1 integer) engine = CSV; CREATE TABLE bug14672 (c1 integer not null) engine = CSV;
INSERT INTO bug14672 VALUES (1), (2), (3); INSERT INTO bug14672 VALUES (1), (2), (3);
SELECT * FROM bug14672; SELECT * FROM bug14672;
DELETE FROM bug14672 WHERE c1 = 2; DELETE FROM bug14672 WHERE c1 = 2;
...@@ -1357,7 +1357,7 @@ DROP TABLE bug14672; ...@@ -1357,7 +1357,7 @@ DROP TABLE bug14672;
# Test CONCURRENT INSERT (5.1) # Test CONCURRENT INSERT (5.1)
# #
CREATE TABLE test_concurrent_insert ( val integer ) ENGINE = CSV; CREATE TABLE test_concurrent_insert ( val integer not null ) ENGINE = CSV;
connect (con1,localhost,root,,); connect (con1,localhost,root,,);
connect (con2,localhost,root,,); connect (con2,localhost,root,,);
...@@ -1393,7 +1393,7 @@ DROP TABLE test_concurrent_insert; ...@@ -1393,7 +1393,7 @@ DROP TABLE test_concurrent_insert;
# Check that repair on the newly created table works fine # Check that repair on the newly created table works fine
CREATE TABLE test_repair_table ( val integer ) ENGINE = CSV; CREATE TABLE test_repair_table ( val integer not null ) ENGINE = CSV;
CHECK TABLE test_repair_table; CHECK TABLE test_repair_table;
REPAIR TABLE test_repair_table; REPAIR TABLE test_repair_table;
...@@ -1405,7 +1405,7 @@ DROP TABLE test_repair_table; ...@@ -1405,7 +1405,7 @@ DROP TABLE test_repair_table;
# restore the meta-file # restore the meta-file
# #
CREATE TABLE test_repair_table2 ( val integer ) ENGINE = CSV; CREATE TABLE test_repair_table2 ( val integer not null ) ENGINE = CSV;
--remove_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table2.CSM --remove_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table2.CSM
# Should give a warning and perform autorepair. We also disable ps-protocol # Should give a warning and perform autorepair. We also disable ps-protocol
...@@ -1423,7 +1423,7 @@ DROP TABLE test_repair_table2; ...@@ -1423,7 +1423,7 @@ DROP TABLE test_repair_table2;
# Corrupt csv file and see if we can repair it # Corrupt csv file and see if we can repair it
CREATE TABLE test_repair_table3 ( val integer ) ENGINE = CSV; CREATE TABLE test_repair_table3 ( val integer not null ) ENGINE = CSV;
--remove_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table3.CSV --remove_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table3.CSV
--write_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table3.CSV --write_file $MYSQLTEST_VARDIR/master-data/test/test_repair_table3.CSV
"1" "1"
...@@ -1517,7 +1517,7 @@ DROP TABLE test_repair_table5; ...@@ -1517,7 +1517,7 @@ DROP TABLE test_repair_table5;
# BUG#13406 - incorrect amount of "records deleted" # BUG#13406 - incorrect amount of "records deleted"
# #
create table t1 (a int) engine=csv; create table t1 (a int not null) engine=csv;
insert t1 values (1); insert t1 values (1);
--enable_info --enable_info
delete from t1; # delete_row delete from t1; # delete_row
...@@ -1549,7 +1549,7 @@ drop table t1; ...@@ -1549,7 +1549,7 @@ drop table t1;
# whole alter table code is being tested all around the test suite already. # whole alter table code is being tested all around the test suite already.
# #
create table t1 (v varchar(32)); create table t1 (v varchar(32) not null);
insert into t1 values ('def'),('abc'),('hij'),('3r4f'); insert into t1 values ('def'),('abc'),('hij'),('3r4f');
select * from t1; select * from t1;
# Fast alter, no copy performed # Fast alter, no copy performed
...@@ -1583,8 +1583,8 @@ drop table t1; ...@@ -1583,8 +1583,8 @@ drop table t1;
# resulted in scanning through deleted memory and we were geting a crash. # resulted in scanning through deleted memory and we were geting a crash.
# that's why we need two tables in the bugtest # that's why we need two tables in the bugtest
create table bug15205 (val int(11) default null) engine=csv; create table bug15205 (val int(11) not null) engine=csv;
create table bug15205_2 (val int(11) default null) engine=csv; create table bug15205_2 (val int(11) not null) engine=csv;
--remove_file $MYSQLTEST_VARDIR/master-data/test/bug15205.CSV --remove_file $MYSQLTEST_VARDIR/master-data/test/bug15205.CSV
# system error (can't open the datafile) # system error (can't open the datafile)
--replace_result $MYSQLTEST_VARDIR . master-data/ '' --replace_result $MYSQLTEST_VARDIR . master-data/ ''
...@@ -1604,8 +1604,8 @@ drop table bug15205_2; ...@@ -1604,8 +1604,8 @@ drop table bug15205_2;
# #
set names latin1; set names latin1;
create table t1 ( create table t1 (
c varchar(1), c varchar(1) not null,
name varchar(64) name varchar(64) not null
) character set latin1 engine=csv; ) character set latin1 engine=csv;
insert into t1 values (0xC0,'LATIN CAPITAL LETTER A WITH GRAVE'); insert into t1 values (0xC0,'LATIN CAPITAL LETTER A WITH GRAVE');
insert into t1 values (0xE0,'LATIN SMALL LETTER A WITH GRAVE'); insert into t1 values (0xE0,'LATIN SMALL LETTER A WITH GRAVE');
...@@ -1623,9 +1623,9 @@ drop table t1; ...@@ -1623,9 +1623,9 @@ drop table t1;
# Bug#22080 "CHECK fails to identify some corruption" # Bug#22080 "CHECK fails to identify some corruption"
# #
create table bug22080_1 (id int,string varchar(64)) Engine=CSV; create table bug22080_1 (id int not null,string varchar(64) not null) Engine=CSV;
create table bug22080_2 (id int,string varchar(64)) Engine=CSV; create table bug22080_2 (id int not null,string varchar(64) not null) Engine=CSV;
create table bug22080_3 (id int,string varchar(64)) Engine=CSV; create table bug22080_3 (id int not null,string varchar(64) not null) Engine=CSV;
insert into bug22080_1 values(1,'string'); insert into bug22080_1 values(1,'string');
insert into bug22080_1 values(2,'string'); insert into bug22080_1 values(2,'string');
insert into bug22080_1 values(3,'string'); insert into bug22080_1 values(3,'string');
...@@ -1655,7 +1655,7 @@ drop tables bug22080_1,bug22080_2,bug22080_3; ...@@ -1655,7 +1655,7 @@ drop tables bug22080_1,bug22080_2,bug22080_3;
# #
# Testing float type # Testing float type
# #
create table float_test (id float,string varchar(64)) Engine=CSV; create table float_test (id float not null,string varchar(64) not null) Engine=CSV;
insert into float_test values(1.0,'string'); insert into float_test values(1.0,'string');
insert into float_test values(2.23,'serg.g'); insert into float_test values(2.23,'serg.g');
insert into float_test values(0.03,'string'); insert into float_test values(0.03,'string');
...@@ -1670,12 +1670,12 @@ drop table float_test; ...@@ -1670,12 +1670,12 @@ drop table float_test;
# #
CREATE TABLE `bug21328` ( CREATE TABLE `bug21328` (
`col1` int(11) DEFAULT NULL, `col1` int(11) NOT NULL,
`col2` int(11) DEFAULT NULL, `col2` int(11) NOT NULL,
`col3` int(11) DEFAULT NULL `col3` int(11) NOT NULL
) ENGINE=CSV; ) ENGINE=CSV;
insert into bug21328 values (1,NULL,NULL); insert into bug21328 values (1,0,0);
alter table bug21328 engine=myisam; alter table bug21328 engine=myisam;
drop table bug21328; drop table bug21328;
...@@ -1683,7 +1683,7 @@ drop table bug21328; ...@@ -1683,7 +1683,7 @@ drop table bug21328;
# BUG#28971 - ALTER TABLE followed by UPDATE for a CSV table make server # BUG#28971 - ALTER TABLE followed by UPDATE for a CSV table make server
# crash # crash
# #
create table t1(a blob, b int) engine=csv; create table t1(a blob not null, b int not null) engine=csv;
insert into t1 values('a', 1); insert into t1 values('a', 1);
flush tables; flush tables;
update t1 set b=2; update t1 set b=2;
...@@ -1693,13 +1693,13 @@ drop table t1; ...@@ -1693,13 +1693,13 @@ drop table t1;
# #
# Bug #29353: negative values # Bug #29353: negative values
# #
create table t1(a int) engine=csv; create table t1(a int not null) engine=csv;
insert into t1 values(-1), (-123.34), (2), (-23); insert into t1 values(-1), (-123.34), (2), (-23);
select * from t1; select * from t1;
check table t1; check table t1;
drop table t1; drop table t1;
create table t1(a int, b int) engine=csv; create table t1(a int not null, b int not null) engine=csv;
--remove_file $MYSQLTEST_VARDIR/master-data/test/t1.CSV --remove_file $MYSQLTEST_VARDIR/master-data/test/t1.CSV
--write_file $MYSQLTEST_VARDIR/master-data/test/t1.CSV --write_file $MYSQLTEST_VARDIR/master-data/test/t1.CSV
1, 1E-2 1, 1E-2
...@@ -1717,7 +1717,7 @@ drop table t1; ...@@ -1717,7 +1717,7 @@ drop table t1;
# #
# Bug #29411: deleting from a csv table leads to the table corruption # Bug #29411: deleting from a csv table leads to the table corruption
# #
create table t1(a int) engine=csv; create table t1(a int not null) engine=csv;
insert into t1 values (0), (1), (2); insert into t1 values (0), (1), (2);
delete from t1 limit 2; delete from t1 limit 2;
check table t1; check table t1;
...@@ -1727,4 +1727,43 @@ check table t1; ...@@ -1727,4 +1727,43 @@ check table t1;
select * from t1; select * from t1;
drop table t1; drop table t1;
#
# Bug #31473: does not work with NULL value in datetime field
#
create table t1(a datetime not null) engine=csv;
insert into t1 values();
select * from t1;
drop table t1;
create table t1(a set('foo','bar') not null) engine=csv;
insert into t1 values();
select * from t1;
drop table t1;
create table t1(a varchar(32) not null) engine=csv;
insert into t1 values();
select * from t1;
drop table t1;
create table t1(a int not null) engine=csv;
insert into t1 values();
select * from t1;
drop table t1;
create table t1(a blob not null) engine=csv;
insert into t1 values();
select * from t1;
drop table t1;
create table t1(a bit(1) not null) engine=csv;
insert into t1 values();
select BIN(a) from t1;
drop table t1;
# We prevent creation of table with nullable ENUM
--error ER_CANT_CREATE_TABLE
create table t1(a enum('foo','bar') default null) engine=csv;
--error ER_CANT_CREATE_TABLE
create table t1(a enum('foo','bar') default 'foo') engine=csv;
# Enum columns must be specified as NOT NULL
create table t1(a enum('foo','bar') default 'foo' not null) engine=csv;
insert into t1 values();
select * from t1;
drop table t1;
--echo End of 5.1 tests --echo End of 5.1 tests
mysql-test/t/log_tables.test
View file @ 407f73c8
...@@ -253,11 +253,11 @@ use mysql; ...@@ -253,11 +253,11 @@ use mysql;
CREATE TABLE `general_log` ( CREATE TABLE `general_log` (
`event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP, ON UPDATE CURRENT_TIMESTAMP,
`user_host` mediumtext, `user_host` mediumtext NOT NULL,
`thread_id` int(11) DEFAULT NULL, `thread_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`command_type` varchar(64) DEFAULT NULL, `command_type` varchar(64) NOT NULL,
`argument` mediumtext `argument` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'; ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log';
CREATE TABLE `slow_log` ( CREATE TABLE `slow_log` (
...@@ -268,10 +268,10 @@ CREATE TABLE `slow_log` ( ...@@ -268,10 +268,10 @@ CREATE TABLE `slow_log` (
`lock_time` time NOT NULL, `lock_time` time NOT NULL,
`rows_sent` int(11) NOT NULL, `rows_sent` int(11) NOT NULL,
`rows_examined` int(11) NOT NULL, `rows_examined` int(11) NOT NULL,
`db` varchar(512) DEFAULT NULL, `db` varchar(512) NOT NULL,
`last_insert_id` int(11) DEFAULT NULL, `last_insert_id` int(11) NOT NULL,
`insert_id` int(11) DEFAULT NULL, `insert_id` int(11) NOT NULL,
`server_id` int(11) DEFAULT NULL, `server_id` int(11) NOT NULL,
`sql_text` mediumtext NOT NULL `sql_text` mediumtext NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'; ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log';
......
scripts/mysql_system_tables.sql
View file @ 407f73c8
...@@ -66,7 +66,7 @@ CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL ...@@ -66,7 +66,7 @@ CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL
-- Create general_log if CSV is enabled. -- Create general_log if CSV is enabled.
SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT, thread_id INTEGER, server_id INTEGER, command_type VARCHAR(64), argument MEDIUMTEXT) engine=CSV CHARACTER SET utf8 comment="General log"', 'SET @dummy = 0'); SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, thread_id INTEGER NOT NULL, server_id INTEGER NOT NULL, command_type VARCHAR(64) NOT NULL, argument MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="General log"', 'SET @dummy = 0');
PREPARE stmt FROM @str; PREPARE stmt FROM @str;
EXECUTE stmt; EXECUTE stmt;
...@@ -74,7 +74,7 @@ DROP PREPARE stmt; ...@@ -74,7 +74,7 @@ DROP PREPARE stmt;
-- Create slow_log if CSV is enabled. -- Create slow_log if CSV is enabled.
SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512), last_insert_id INTEGER, insert_id INTEGER, server_id INTEGER, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="Slow log"', 'SET @dummy = 0'); SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512) NOT NULL, last_insert_id INTEGER NOT NULL, insert_id INTEGER NOT NULL, server_id INTEGER NOT NULL, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="Slow log"', 'SET @dummy = 0');
PREPARE stmt FROM @str; PREPARE stmt FROM @str;
EXECUTE stmt; EXECUTE stmt;
......
storage/csv/ha_tina.cc
View file @ 407f73c8
...@@ -471,23 +471,31 @@ int ha_tina::encode_quote(uchar *buf) ...@@ -471,23 +471,31 @@ int ha_tina::encode_quote(uchar *buf)
{ {
const char *ptr; const char *ptr;
const char *end_ptr; const char *end_ptr;
const bool was_null= (*field)->is_null();
/* /*
CSV does not support nulls. Write quoted 0 to the buffer. In fact, CSV does not support nulls. ::create() prevents creation of a table
(*field)->val_str(&attribute,&attribute) would usually return 0 with nullable columns so if we encounter them here, there is a bug.
in this case but we write it explicitly here. This may only occur if the frm was created by an older version of
Basically this is a safety check, as no one ensures that the mysqld which permitted table creation with nullable columns.
field content is cleaned up every time we use Field::set_null()
in the code.
*/ */
if ((*field)->is_null()) DBUG_ASSERT(!(*field)->maybe_null());
/*
assistance for backwards compatibility in production builds.
note: this will not work for ENUM columns.
*/
if (was_null)
{ {
buffer.append(STRING_WITH_LEN("\"0\",")); (*field)->set_default();
continue; (*field)->set_notnull();
} }
(*field)->val_str(&attribute,&attribute); (*field)->val_str(&attribute,&attribute);
if (was_null)
(*field)->set_null();
if ((*field)->str_needs_quotes()) if ((*field)->str_needs_quotes())
{ {
ptr= attribute.ptr(); ptr= attribute.ptr();
...@@ -1480,6 +1488,16 @@ int ha_tina::create(const char *name, TABLE *table_arg, ...@@ -1480,6 +1488,16 @@ int ha_tina::create(const char *name, TABLE *table_arg,
File create_file; File create_file;
DBUG_ENTER("ha_tina::create"); DBUG_ENTER("ha_tina::create");
/*
check columns
*/
for (Field **field= table_arg->s->field; *field; field++)
{
if ((*field)->real_maybe_null())
DBUG_RETURN(-1);
}
if ((create_file= my_create(fn_format(name_buff, name, "", CSM_EXT, if ((create_file= my_create(fn_format(name_buff, name, "", CSM_EXT,
MY_REPLACE_EXT|MY_UNPACK_FILENAME), 0, MY_REPLACE_EXT|MY_UNPACK_FILENAME), 0,
O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7