database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-29 21:42:28 +03:00
Code

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/usr/home/bar/mysql-5.0
This commit is contained in:
unknown 2005-01-18 22:30:28 +04:00
commit 0fb69c751a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/ps_6bdb.result
View File

@ -1145,7 +1145,7 @@ test_sequence
prepare stmt1 from ' explain select * from t9 ' ; prepare stmt1 from ' explain select * from t9 ' ;
execute stmt1; execute stmt1;
Catalog Database Table Table_alias Column Column_alias Name Type Length Max length Is_null Flags Decimals Charsetnr Catalog Database Table Table_alias Column Column_alias Name Type Length Max length Is_null Flags Decimals Charsetnr
def id 8 3 1 N 32801 0 8 def id 8 3 1 N 32929 0 63
def select_type 253 19 6 N 1 31 8 def select_type 253 19 6 N 1 31 8
def table 253 64 2 N 1 31 8 def table 253 64 2 N 1 31 8
def type 253 10 3 N 1 31 8 def type 253 10 3 N 1 31 8
@ -1153,7 +1153,7 @@ def possible_keys 253 4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8 def key 253 64 0 Y 0 31 8
def key_len 253 4096 0 Y 128 31 63 def key_len 253 4096 0 Y 128 31 63
def ref 253 1024 0 Y 0 31 8 def ref 253 1024 0 Y 0 31 8
def rows 8 10 1 N 32801 0 8 def rows 8 10 1 N 32929 0 63
def Extra 253 255 0 N 1 31 8 def Extra 253 255 0 N 1 31 8
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t9 ALL NULL NULL NULL NULL 3 1 SIMPLE t9 ALL NULL NULL NULL NULL 3

10
mysql-test/r/ps_7ndb.result
View File

@ -4,7 +4,7 @@ create table t1
( (
a int, b varchar(30), a int, b varchar(30),
primary key(a) primary key(a)
) engine = 'BDB' ; ) engine = 'NDB' ;
create table t9 create table t9
( (
c1 tinyint, c2 smallint, c3 mediumint, c4 int, c1 tinyint, c2 smallint, c3 mediumint, c4 int,
@ -17,7 +17,7 @@ c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
c29 longblob, c30 longtext, c31 enum('one', 'two', 'three'), c29 longblob, c30 longtext, c31 enum('one', 'two', 'three'),
c32 set('monday', 'tuesday', 'wednesday'), c32 set('monday', 'tuesday', 'wednesday'),
primary key(c1) primary key(c1)
) engine = 'BDB' ; ) engine = 'NDB' ;
delete from t1 ; delete from t1 ;
insert into t1 values (1,'one'); insert into t1 values (1,'one');
insert into t1 values (2,'two'); insert into t1 values (2,'two');
@ -1156,7 +1156,7 @@ def ref 253 1024 0 Y 0 31 8
def rows 8 10 1 N 32929 0 63 def rows 8 10 1 N 32929 0 63
def Extra 253 255 0 N 1 31 8 def Extra 253 255 0 N 1 31 8
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t9 ALL NULL NULL NULL NULL 3 1 SIMPLE t9 ALL NULL NULL NULL NULL 2
test_sequence test_sequence
------ delete tests ------ ------ delete tests ------
delete from t1 ; delete from t1 ;
@ -1328,7 +1328,7 @@ create table t2
( (
a int, b varchar(30), a int, b varchar(30),
primary key(a) primary key(a)
) engine = 'BDB' ; ) engine = 'NDB' ;
insert into t2(a,b) select a, b from t1 ; insert into t2(a,b) select a, b from t1 ;
prepare stmt1 from 'update t1 set a=? where b=? prepare stmt1 from 'update t1 set a=? where b=?
and a in (select ? from t2 and a in (select ? from t2
@ -1520,7 +1520,7 @@ execute stmt1 using @arg00, @arg01;
ERROR 23000: Duplicate entry '82' for key 1 ERROR 23000: Duplicate entry '82' for key 1
drop table if exists t2 ; drop table if exists t2 ;
create table t2 (id int auto_increment primary key) create table t2 (id int auto_increment primary key)
ENGINE= 'BDB' ; ENGINE= 'NDB' ;
prepare stmt1 from ' select last_insert_id() ' ; prepare stmt1 from ' select last_insert_id() ' ;
insert into t2 values (NULL) ; insert into t2 values (NULL) ;
execute stmt1 ; execute stmt1 ;