summaryrefslogtreecommitdiff
path: root/mysql-test/r/heap_hash.result
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-06-04 18:28:51 +0300
committermonty@narttu.mysql.fi <>2003-06-04 18:28:51 +0300
commit23145cfed72954c29f5a47e82af22898164be4b0 (patch)
treef2e86edc169afb1fed9cecefdecd9f13561780c9 /mysql-test/r/heap_hash.result
parent7df5635ff2845bd708711f6b790997a3c68d5f2a (diff)
downloadmariadb-git-23145cfed72954c29f5a47e82af22898164be4b0.tar.gz
Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align Added OLAP function ROLLUP Split mysql_fix_privilege_tables to a script and a .sql data file Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects. Added table_alias_charset, for easier --lower-case-table-name handling Better SQL_MODE handling (Setting complex options also sets sub options) New (faster) assembler string functions for x86
Diffstat (limited to 'mysql-test/r/heap_hash.result')
-rw-r--r--mysql-test/r/heap_hash.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/heap_hash.result b/mysql-test/r/heap_hash.result
index 9554990aa34..72278c5da67 100644
--- a/mysql-test/r/heap_hash.result
+++ b/mysql-test/r/heap_hash.result
@@ -86,7 +86,7 @@ x y x y
explain select * from t1,t1 as t2 where t1.x=t2.y;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL x NULL NULL NULL 6
-1 SIMPLE t2 eq_ref y y 4 t1.x 1
+1 SIMPLE t2 eq_ref y y 4 test.t1.x 1
drop table t1;
create table t1 (a int) type=heap;
insert into t1 values(1);
@@ -201,7 +201,7 @@ SELECT * FROM t1 WHERE b<=>NULL;
a b
99 NULL
INSERT INTO t1 VALUES (1,3);
-Duplicate entry '3' for key 1
+ERROR 23000: Duplicate entry '3' for key 1
DROP TABLE t1;
CREATE TABLE t1 (a int not null, primary key using HASH (a)) type=heap;
INSERT into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11);