mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1

Browse source 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0


mysql-test/r/ndb_charset.result:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Merg
sql/handler.cc:
  Merge
This commit is contained in:
unknown 2006-10-16 10:07:19 +02:00
commit 8a88e57c28
5 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/r/ndb_charset.result
View file

@ -112,9 +112,9 @@ unique key(a)
) engine=ndb;
insert into t1 values(1, 'aAa');
insert into t1 values(2, 'aaa');
ERROR 23000: Duplicate entry '2' for key 1
ERROR 23000: Duplicate entry '' for key 0
insert into t1 values(3, 'AAA');
ERROR 23000: Duplicate entry '3' for key 1
ERROR 23000: Duplicate entry '' for key 0
select * from t1 order by p;
p a
1 aAa

10
mysql-test/r/ndb_index_unique.result
View file

@ -22,7 +22,7 @@ select * from t1 where b = 4 order by a;
a b c
3 4 6
insert into t1 values(8, 2, 3);
ERROR 23000: Duplicate entry '8' for key 1
ERROR 23000: Duplicate entry '' for key 0
select * from t1 order by a;
a b c
1 2 3
@ -89,7 +89,7 @@ a b c
1 1 1
4 4 NULL
insert into t1 values(5,1,1);
ERROR 23000: Duplicate entry '5' for key 1
ERROR 23000: Duplicate entry '' for key 0
drop table t1;
CREATE TABLE t2 (
a int unsigned NOT NULL PRIMARY KEY,
@ -112,7 +112,7 @@ select * from t2 where b = 4 order by a;
a b c
3 4 6
insert into t2 values(8, 2, 3);
ERROR 23000: Duplicate entry '8' for key 1
ERROR 23000: Duplicate entry '' for key 0
select * from t2 order by a;
a b c
1 2 3
@ -177,7 +177,7 @@ pk a
3 NULL
4 4
insert into t1 values (5,0);
ERROR 23000: Duplicate entry '5' for key 1
ERROR 23000: Duplicate entry '' for key 0
select * from t1 order by pk;
pk a
-1 NULL
@ -210,7 +210,7 @@ pk a b c
0 NULL 18 NULL
1 3 19 abc
insert into t2 values(2,3,19,'abc');
ERROR 23000: Duplicate entry '2' for key 1
ERROR 23000: Duplicate entry '' for key 0
select * from t2 order by pk;
pk a b c
-1 1 17 NULL

2
mysql-test/r/ndb_update.result
View file

@ -18,7 +18,7 @@ pk1 b c
2 2 2
4 1 1
UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;
ERROR 23000: Duplicate entry '1' for key 1
ERROR 23000: Duplicate entry '' for key 0
select * from t1 order by pk1;
pk1 b c
0 0 0