diff options
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/alter_table.test | 11 | ||||
| -rw-r--r-- | mysql-test/t/ctype_many.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/derived.test | 8 | ||||
| -rw-r--r-- | mysql-test/t/isam.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/join.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/key_cache.test | 36 | ||||
| -rw-r--r-- | mysql-test/t/preload.test | 8 | ||||
| -rw-r--r-- | mysql-test/t/union.test | 2 |
8 files changed, 50 insertions, 21 deletions
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index 06a5db13ea3..11fe997e789 100644 --- a/mysql-test/t/alter_table.test +++ b/mysql-test/t/alter_table.test @@ -170,6 +170,17 @@ select a,hex(a) from t1; alter table t1 change a a char(10) character set koi8r; select a,hex(a) from t1; +# +# Test ALTER TABLE .. CHARACTER SET .. +# +show create table t1; +alter table t1 DEFAULT CHARACTER SET latin1; +show create table t1; +alter table t1 CHARACTER SET latin1; +show create table t1; +alter table t1 DEFAULT CHARACTER SET cp1251; +show create table t1; + drop table t1; # diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test index a1549f952e5..7b44439aa50 100644 --- a/mysql-test/t/ctype_many.test +++ b/mysql-test/t/ctype_many.test @@ -16,7 +16,7 @@ ALTER TABLE t1 CHANGE comment comment CHAR(32) CHARACTER SET latin2 NOT NULL; SHOW CREATE TABLE t1; ALTER TABLE t1 ADD latin5_f CHAR(32) NOT NULL; SHOW CREATE TABLE t1; -ALTER TABLE t1 CHARSET=latin2; +ALTER TABLE t1 DEFAULT CHARSET=latin2; ALTER TABLE t1 ADD latin2_f CHAR(32) NOT NULL; SHOW CREATE TABLE t1; ALTER TABLE t1 DROP latin2_f, DROP latin5_f; diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test index 80b131ac6fe..ee50ffda476 100644 --- a/mysql-test/t/derived.test +++ b/mysql-test/t/derived.test @@ -83,11 +83,11 @@ create table t2 (mat_id MEDIUMINT UNSIGNED NOT NULL, pla_id MEDIUMINT UNSIGNED N insert into t1 values (NULL, 'a', 1), (NULL, 'b', 2), (NULL, 'c', 3), (NULL, 'd', 4), (NULL, 'e', 5), (NULL, 'f', 6), (NULL, 'g', 7), (NULL, 'h', 8), (NULL, 'i', 9); insert into t2 values (1, 100), (1, 101), (1, 102), (2, 100), (2, 103), (2, 104), (3, 101), (3, 102), (3, 105); -SELECT d.pla_id, m2.mat_id FROM t1 m2 INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum; -SELECT d.pla_id, m2.test FROM t1 m2 INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum; +SELECT STRAIGHT_JOIN d.pla_id, m2.mat_id FROM t1 m2 INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum; +SELECT STRAIGHT_JOIN d.pla_id, m2.test FROM t1 m2 INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum; -explain SELECT d.pla_id, m2.mat_id FROM t1 m2 INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum; -explain SELECT d.pla_id, m2.test FROM t1 m2 INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum; +explain SELECT STRAIGHT_JOIN d.pla_id, m2.mat_id FROM t1 m2 INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum; +explain SELECT STRAIGHT_JOIN d.pla_id, m2.test FROM t1 m2 INNER JOIN (SELECT mp.pla_id, MIN(m1.matintnum) AS matintnum FROM t2 mp INNER JOIN t1 m1 ON mp.mat_id=m1.mat_id GROUP BY mp.pla_id) d ON d.matintnum=m2.matintnum; drop table t1,t2; # diff --git a/mysql-test/t/isam.test b/mysql-test/t/isam.test index a31ba864b2f..e35ed0dfd4a 100644 --- a/mysql-test/t/isam.test +++ b/mysql-test/t/isam.test @@ -12,12 +12,14 @@ create table t1 (a tinyint not null auto_increment, b blob not null, primary key let $1=100; disable_query_log; +--disable_warnings while ($1) { eval insert into t1 (b) values(repeat(char(65+$1),65540-$1)); dec $1; } enable_query_log; +--enable_warnings delete from t1 where (a & 1); select sum(length(b)) from t1; drop table t1; diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test index e8977ae9b62..8cef925cc24 100644 --- a/mysql-test/t/join.test +++ b/mysql-test/t/join.test @@ -112,7 +112,7 @@ drop table t1, t2; create table t1 (a int primary key); insert into t1 values(1),(2); select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a); ---replace_result "31 tables" "XX tables" "62 tables" "XX tables" +--replace_result "31 tables" "XX tables" "61 tables" "XX tables" --error 1116 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a); drop table t1; diff --git a/mysql-test/t/key_cache.test b/mysql-test/t/key_cache.test index 371d610eb5f..dc9f9c9b18a 100644 --- a/mysql-test/t/key_cache.test +++ b/mysql-test/t/key_cache.test @@ -1,6 +1,9 @@ # # Test of multiple key caches # +--disable_warnings +drop table if exists t1, t2, t3; +--enable_warnings SET @save_key_buffer=@@key_buffer_size; @@ -58,12 +61,9 @@ select @@keycache1.key_cache_block_size; select @@key_buffer_size; select @@key_cache_block_size; +set global keycache1.key_buffer_size=1024*1024; ---disable_warnings -drop table if exists t1, t2; ---enable_warnings - -create table t1 (p int primary key, a char(10)); +create table t1 (p int primary key, a char(10)) delay_key_write=1; create table t2 (p int primary key, i int, a char(10), key k1(i), key k2(a)); insert into t1 values (1, 'qqqq'), (11, 'yyyy'); @@ -75,7 +75,7 @@ select * from t2; update t1 set p=2 where p=1; update t2 set i=2 where i=1; -cache index t1 keys in keycache1; +cache index t1 keys (`primary`) in keycache1; explain select p from t1; select p from t1; @@ -84,11 +84,11 @@ select i from t2; explain select count(*) from t1, t2 where t1.p = t2.i; select count(*) from t1, t2 where t1.p = t2.i; -cache index t2 keys in keycache1; +cache index t2 in keycache1; update t2 set p=p+1000, i=2 where a='qqqq'; -cache index t2 keys in keycache2; +cache index t2 in keycache2; insert into t2 values (2000, 3, 'yyyy'); -cache index t2 keys in keycache1; +cache index t2 in keycache1; update t2 set p=3000 where a='zzzz'; select * from t2; explain select p from t2; @@ -98,12 +98,18 @@ select i from t2; explain select a from t2; select a from t2; +# Test some error conditions +--error 1287 +cache index t1 in unknown_key_cache; +cache index t1 keys (unknown_key) in keycache1; + select @@keycache2.key_buffer_size; select @@keycache2.key_cache_block_size; set global keycache2.key_buffer_size=0; select @@keycache2.key_buffer_size; select @@keycache2.key_cache_block_size; - +set global keycache2.key_buffer_size=1024*1024; +select @@keycache2.key_buffer_size; update t2 set p=4000 where a='zzzz'; update t1 set p=p+1; @@ -119,4 +125,14 @@ select a from t2; select * from t1; select p from t1; +# Use the 'small' key cache +create table t3 (like t1); +cache index t3 in small; +insert into t3 select * from t1; +cache index t3 in keycache2; +cache index t1,t2 in default; +drop table t1,t2,t3; +# Cleanup +# We don't reset keycache2 as we want to ensure that mysqld will reset it +set global keycache1.key_buffer_size=0; diff --git a/mysql-test/t/preload.test b/mysql-test/t/preload.test index 7357b42c599..7eff5cee08f 100644 --- a/mysql-test/t/preload.test +++ b/mysql-test/t/preload.test @@ -63,7 +63,7 @@ show status like "key_read%"; flush tables; flush status; select @@preload_buffer_size; -load index into cache t1 keys; +load index into cache t1; show status like "key_read%"; select count(*) from t1 where b = 'test1'; show status like "key_read%"; @@ -72,7 +72,7 @@ flush tables; flush status; show status like "key_read%"; set session preload_buffer_size=256*1024; select @@preload_buffer_size; -load index into cache t1 keys ignore leaves; +load index into cache t1 ignore leaves; show status like "key_read%"; select count(*) from t1 where b = 'test1'; show status like "key_read%"; @@ -81,7 +81,7 @@ flush tables; flush status; show status like "key_read%"; set session preload_buffer_size=1*1024; select @@preload_buffer_size; -load index into cache t1 keys, t2 keys (primary,b) ignore leaves; +load index into cache t1, t2 keys (primary,b) ignore leaves; show status like "key_read%"; select count(*) from t1 where b = 'test1'; select count(*) from t2 where b = 'test1'; @@ -89,7 +89,7 @@ show status like "key_read%"; flush tables; flush status; show status like "key_read%"; -load index into cache t3 keys, t2 keys (primary,b) ; +load index into cache t3, t2 keys (primary,b) ; show status like "key_read%"; flush tables; flush status; diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 1f3f4085734..3cfdc14b0b8 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -280,7 +280,7 @@ explain extended (select * from t1 where a=1) union (select * from t2 where a=1) (select * from t1 where a=5 and a=6) union (select * from t2 where a=1); (select t1.a,t1.b from t1,t2 where t1.a=5) union (select * from t2 where a=1); (select * from t1 where a=1) union (select t1.a,t2.a from t1,t2 where t1.a=t2.a); -explain (select * from t1 where a=1 and b=10) union (select t1.a,t2.a from t1,t2 where t1.a=t2.a); +explain (select * from t1 where a=1 and b=10) union (select straight_join t1.a,t2.a from t1,t2 where t1.a=t2.a); explain (select * from t1 where a=1) union (select * from t1 where b=1); drop table t1,t2; create table t1 ( id int not null auto_increment, primary key (id) ,user_name text ); |