mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.1-opt
This commit is contained in:
29
mysql-test/r/almost_full.result
Normal file
29
mysql-test/r/almost_full.result
Normal file
@ -0,0 +1,29 @@
|
||||
drop table if exists t1;
|
||||
set global myisam_data_pointer_size=2;
|
||||
CREATE TABLE t1 (a int auto_increment primary key not null, b longtext) ENGINE=MyISAM;
|
||||
DELETE FROM t1 WHERE a=1 or a=5;
|
||||
INSERT INTO t1 SET b=repeat('a',600);
|
||||
ERROR HY000: The table 't1' is full
|
||||
CHECK TABLE t1 EXTENDED;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 check warning Datafile is almost full, 65448 of 65534 used
|
||||
test.t1 check status OK
|
||||
UPDATE t1 SET b=repeat('a', 800) where a=10;
|
||||
ERROR HY000: The table 't1' is full
|
||||
CHECK TABLE t1 EXTENDED;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 check warning Datafile is almost full, 65448 of 65534 used
|
||||
test.t1 check status OK
|
||||
INSERT INTO t1 SET b=repeat('a',400);
|
||||
CHECK TABLE t1 EXTENDED;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 check warning Datafile is almost full, 65448 of 65534 used
|
||||
test.t1 check status OK
|
||||
DELETE FROM t1 WHERE a=2 or a=6;
|
||||
UPDATE t1 SET b=repeat('a', 600) where a=11;
|
||||
CHECK TABLE t1 EXTENDED;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 check warning Datafile is almost full, 65448 of 65534 used
|
||||
test.t1 check status OK
|
||||
drop table t1;
|
||||
set global myisam_data_pointer_size=default;
|
@ -1291,4 +1291,9 @@ t1 CREATE TABLE `t1` (
|
||||
`b` int(11) DEFAULT NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (b) (PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION p2 VALUES LESS THAN (20) ENGINE = MyISAM) */
|
||||
drop table t1, t2;
|
||||
create table t1
|
||||
(s1 timestamp on update current_timestamp, s2 int)
|
||||
partition by key(s1) partitions 3;
|
||||
insert into t1 values (null,null);
|
||||
drop table t1;
|
||||
End of 5.1 tests
|
||||
|
41
mysql-test/t/almost_full.test
Normal file
41
mysql-test/t/almost_full.test
Normal file
@ -0,0 +1,41 @@
|
||||
#
|
||||
# Some special cases with empty tables
|
||||
#
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1;
|
||||
--enable_warnings
|
||||
|
||||
set global myisam_data_pointer_size=2;
|
||||
CREATE TABLE t1 (a int auto_increment primary key not null, b longtext) ENGINE=MyISAM;
|
||||
|
||||
--disable_query_log
|
||||
let $1= 303;
|
||||
while ($1)
|
||||
{
|
||||
INSERT INTO t1 SET b=repeat('a',200);
|
||||
dec $1;
|
||||
}
|
||||
--enable_query_log
|
||||
|
||||
DELETE FROM t1 WHERE a=1 or a=5;
|
||||
|
||||
--error 1114
|
||||
INSERT INTO t1 SET b=repeat('a',600);
|
||||
CHECK TABLE t1 EXTENDED;
|
||||
|
||||
--error 1114
|
||||
UPDATE t1 SET b=repeat('a', 800) where a=10;
|
||||
CHECK TABLE t1 EXTENDED;
|
||||
|
||||
INSERT INTO t1 SET b=repeat('a',400);
|
||||
CHECK TABLE t1 EXTENDED;
|
||||
|
||||
DELETE FROM t1 WHERE a=2 or a=6;
|
||||
UPDATE t1 SET b=repeat('a', 600) where a=11;
|
||||
CHECK TABLE t1 EXTENDED;
|
||||
drop table t1;
|
||||
|
||||
set global myisam_data_pointer_size=default;
|
||||
|
||||
# End of 4.1 tests
|
@ -1528,4 +1528,25 @@ PARTITION BY RANGE (b) (
|
||||
show create table t1;
|
||||
drop table t1, t2;
|
||||
|
||||
#
|
||||
# Bug #32067 Partitions: crash with timestamp column
|
||||
# this bug occurs randomly on some UPDATE statement
|
||||
# with the '1032: Can't find record in 't1'' error
|
||||
|
||||
create table t1
|
||||
(s1 timestamp on update current_timestamp, s2 int)
|
||||
partition by key(s1) partitions 3;
|
||||
|
||||
insert into t1 values (null,null);
|
||||
--disable_query_log
|
||||
let $cnt= 1000;
|
||||
while ($cnt)
|
||||
{
|
||||
update t1 set s2 = 1;
|
||||
update t1 set s2 = 2;
|
||||
dec $cnt;
|
||||
}
|
||||
--enable_query_log
|
||||
|
||||
drop table t1;
|
||||
--echo End of 5.1 tests
|
||||
|
Reference in New Issue
Block a user