summaryrefslogtreecommitdiff
path: root/mysql-test/suite/handler
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-02-23 02:06:58 +0200
committerMichael Widenius <monty@askmonty.org>2011-02-23 02:06:58 +0200
commit39616eb9ef974c69e73bcb80cd7e3c40228910fd (patch)
tree092aec15bb2404ab11a594dae191d07a4bae2298 /mysql-test/suite/handler
parentab6d450639ce8b031929080be579148264989aa5 (diff)
downloadmariadb-git-39616eb9ef974c69e73bcb80cd7e3c40228910fd.tar.gz
Fixed compiler warnings and some test failures found by buildbot
dbug/dbug.c: Fixed compiler warnings on windows mysql-test/r/index_intersect_innodb.result: Don't print number of rows as this varies mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Update to use new State mysql-test/suite/handler/heap.result: Update results mysql-test/suite/handler/heap.test: Changed key used in test as the key 'b' will not guarantee order of the two last elements (as the key value is the same) mysql-test/suite/pbxt/r/lock_multi.result: Update to use new State mysql-test/t/index_intersect.test: Don't print number of rows as this varies mysql-test/valgrind.supp: Added suppression for linux mysys/hash.c: Fixed compiler warnings on windows plugin/handler_socket/handlersocket/database.cpp: Fixed compiler warnings sql-common/client_plugin.c: Changed variable to define to avoid compiler warnings when variable is not used sql-common/my_time.c: Initialize all my_time elements to avoid compiler warnings storage/oqgraph/ha_oqgraph.cc: Use right function (to avoid compiler warning) storage/pbxt/src/table_xt.cc: Initialize variables (to avoid compiler warnings)
Diffstat (limited to 'mysql-test/suite/handler')
-rw-r--r--mysql-test/suite/handler/heap.result20
-rw-r--r--mysql-test/suite/handler/heap.test4
2 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/suite/handler/heap.result b/mysql-test/suite/handler/heap.result
index b41f49091f1..07050042447 100644
--- a/mysql-test/suite/handler/heap.result
+++ b/mysql-test/suite/handler/heap.result
@@ -206,26 +206,26 @@ ERROR 42S02: Unknown table 't2' in HANDLER
handler t1 open;
handler t1 read a=(16) limit 1,3;
a b
-16 xxx
+16 ccc
flush tables;
handler t1 read a=(16) limit 1,3;
a b
-16 xxx
+16 ccc
handler t1 close;
handler t1 open;
prepare stmt from 'handler t1 read a=(?) limit ?,?';
set @a=16,@b=1,@c=100;
execute stmt using @a,@b,@c;
a b
-16 xxx
+16 ccc
set @a=16,@b=2,@c=1;
execute stmt using @a,@b,@c;
a b
set @a=16,@b=0,@c=2;
execute stmt using @a,@b,@c;
a b
-16 ccc
16 xxx
+16 ccc
deallocate prepare stmt;
prepare stmt from 'handler t1 read a next limit ?';
handler t1 read a>=(11);
@@ -234,8 +234,8 @@ a b
set @a=3;
execute stmt using @a;
a b
-16 ccc
16 xxx
+16 ccc
17 ddd
execute stmt using @a;
a b
@@ -292,15 +292,15 @@ prepare stmt from 'handler t1 read a>=(?) where a < ? limit 5';
set @a=15, @b=20;
execute stmt using @a,@b;
a b
-16 ccc
16 xxx
+16 ccc
17 ddd
18 eee
19 fff
execute stmt using @a,@b;
a b
-16 ccc
16 xxx
+16 ccc
17 ddd
18 eee
19 fff
@@ -309,7 +309,7 @@ prepare stmt from 'handler t1 read a=(?)';
set @a=16;
execute stmt using @a;
a b
-16 ccc
+16 xxx
alter table t1 add c int;
execute stmt using @a;
ERROR 42S02: Unknown table 't1' in HANDLER
@@ -687,7 +687,7 @@ INSERT INTO t1 VALUES(1);
HANDLER t1 READ a NEXT;
HANDLER t1 CLOSE;
DROP TABLE t1;
-CREATE TABLE t1(a INT, b INT, KEY(a), KEY b using btree (b), KEY ab using btree(a, b));
+CREATE TABLE t1(a INT, b INT, KEY(a), KEY b using btree (b), KEY ab using btree(a, b)) engine=memory;
INSERT INTO t1 VALUES (2, 20), (2,20), (1, 10), (4, 40), (3, 30), (5,50), (6,50);
HANDLER t1 OPEN;
HANDLER t1 READ a>=(2) limit 3;
@@ -730,7 +730,7 @@ HANDLER t1 READ b FIRST LIMIT 2;
a b
1 10
2 20
-HANDLER t1 READ b LAST LIMIT 2;
+HANDLER t1 READ ab LAST LIMIT 2;
a b
6 50
5 50
diff --git a/mysql-test/suite/handler/heap.test b/mysql-test/suite/handler/heap.test
index e9e5c5fad44..d6715144caa 100644
--- a/mysql-test/suite/handler/heap.test
+++ b/mysql-test/suite/handler/heap.test
@@ -14,7 +14,7 @@ let $key_type=using btree;
connect (con1,localhost,root,,);
connection default;
-CREATE TABLE t1(a INT, b INT, KEY(a), KEY b using btree (b), KEY ab using btree(a, b));
+CREATE TABLE t1(a INT, b INT, KEY(a), KEY b using btree (b), KEY ab using btree(a, b)) engine=memory;
INSERT INTO t1 VALUES (2, 20), (2,20), (1, 10), (4, 40), (3, 30), (5,50), (6,50);
@@ -35,7 +35,7 @@ HANDLER t1 READ a FIRST;
--error ER_ILLEGAL_HA
HANDLER t1 READ a LAST;
HANDLER t1 READ b FIRST LIMIT 2;
-HANDLER t1 READ b LAST LIMIT 2;
+HANDLER t1 READ ab LAST LIMIT 2;
# Table scan
HANDLER t1 READ FIRST LIMIT 10;