summaryrefslogtreecommitdiff
path: root/mysql-test/r/heap.result
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-04-06 17:22:21 +0300
committerunknown <monty@mysql.com>2005-04-06 17:22:21 +0300
commit080c8ab39bb110370b64837613e8453702b353c1 (patch)
treee94c78c8db8d7f6ca96a83d37f1af529688c9a72 /mysql-test/r/heap.result
parentf3aa7770b647a9256b3c93f0ef4823b4cb73af55 (diff)
downloadmariadb-git-080c8ab39bb110370b64837613e8453702b353c1.tar.gz
Fixed errors descovered by valgrind 2.4
Added suppression file for some valgrind warnings that are not real errors mysql-test/mysql-test-run.sh: Added suppression of some valgrind warnings that are not real errors mysql-test/r/heap.result: Cleanup old tests and added new tests mysql-test/t/heap.test: Cleanup old tests and added new tests mysys/default.c: Removed duplicate fn_format() scripts/make_binary_distribution.sh: Added valgrind suppress file sql/ha_federated.cc: Ensure that 'socket' is initialized properly sql/ha_heap.cc: Ensure that with_auto_increment is initialized properly sql/mysqld.cc: Ensure that create_time is initialized for cached threads sql/sql_parse.cc: Indentation fix strings/decimal.c: Fixed wrong tests
Diffstat (limited to 'mysql-test/r/heap.result')
-rw-r--r--mysql-test/r/heap.result21
1 files changed, 5 insertions, 16 deletions
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result
index db20b242962..631bd8c713c 100644
--- a/mysql-test/r/heap.result
+++ b/mysql-test/r/heap.result
@@ -667,14 +667,7 @@ drop table t1;
set storage_engine=MyISAM;
create table t1 (a bigint unsigned auto_increment primary key, b int,
key (b, a)) engine=heap;
-insert t1 (b) values (1);
-insert t1 (b) values (1);
-insert t1 (b) values (1);
-insert t1 (b) values (1);
-insert t1 (b) values (1);
-insert t1 (b) values (1);
-insert t1 (b) values (1);
-insert t1 (b) values (1);
+insert t1 (b) values (1),(1),(1),(1),(1),(1),(1),(1);
select * from t1;
a b
1 1
@@ -688,14 +681,7 @@ a b
drop table t1;
create table t1 (a int not null, b int not null auto_increment,
primary key(a, b), key(b)) engine=heap;
-insert t1 (a) values (1);
-insert t1 (a) values (1);
-insert t1 (a) values (1);
-insert t1 (a) values (1);
-insert t1 (a) values (1);
-insert t1 (a) values (1);
-insert t1 (a) values (1);
-insert t1 (a) values (1);
+insert t1 (a) values (1),(1),(1),(1),(1),(1),(1),(1);
select * from t1;
a b
1 1
@@ -707,3 +693,6 @@ a b
1 7
1 8
drop table t1;
+create table t1 (a int not null, b int not null auto_increment,
+primary key(a, b)) engine=heap;
+ERROR 42000: Incorrect table definition; there can be only one auto column and it must be defined as a key