Skip to content

M
MariaDB
Commit 764501e7 authored by unknown's avatar unknown
Browse files
Options

After-merge clean-up

parent d4823d97
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
mysql-test/r/analyse.result
View file @ 764501e7
...@@ -36,16 +36,16 @@ create table t2 select * from t1 where 0=1 procedure analyse(); ...@@ -36,16 +36,16 @@ create table t2 select * from t1 where 0=1 procedure analyse();
show create table t2; show create table t2;
Table Create Table Table Create Table
t2 CREATE TABLE `t2` ( t2 CREATE TABLE `t2` (
`Field_name` varchar(255) NOT NULL default '', `Field_name` varbinary(255) NOT NULL default '',
`Min_value` varchar(255) default NULL, `Min_value` varbinary(255) default NULL,
`Max_value` varchar(255) default NULL, `Max_value` varbinary(255) default NULL,
`Min_length` bigint(11) NOT NULL default '0', `Min_length` bigint(11) NOT NULL default '0',
`Max_length` bigint(11) NOT NULL default '0', `Max_length` bigint(11) NOT NULL default '0',
`Empties_or_zeros` bigint(11) NOT NULL default '0', `Empties_or_zeros` bigint(11) NOT NULL default '0',
`Nulls` bigint(11) NOT NULL default '0', `Nulls` bigint(11) NOT NULL default '0',
`Avg_value_or_avg_length` varchar(255) NOT NULL default '', `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',
`Std` varchar(255) default NULL, `Std` varbinary(255) default NULL,
`Optimal_fieldtype` varchar(64) NOT NULL default '' `Optimal_fieldtype` varbinary(64) NOT NULL default ''
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
select * from t1 where 0=1 procedure analyse(); select * from t1 where 0=1 procedure analyse();
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
...@@ -55,16 +55,16 @@ create table t2 select * from t1 where 0=1 procedure analyse(); ...@@ -55,16 +55,16 @@ create table t2 select * from t1 where 0=1 procedure analyse();
show create table t2; show create table t2;
Table Create Table Table Create Table
t2 CREATE TABLE `t2` ( t2 CREATE TABLE `t2` (
`Field_name` varchar(255) NOT NULL default '', `Field_name` varbinary(255) NOT NULL default '',
`Min_value` varchar(255) default NULL, `Min_value` varbinary(255) default NULL,
`Max_value` varchar(255) default NULL, `Max_value` varbinary(255) default NULL,
`Min_length` bigint(11) NOT NULL default '0', `Min_length` bigint(11) NOT NULL default '0',
`Max_length` bigint(11) NOT NULL default '0', `Max_length` bigint(11) NOT NULL default '0',
`Empties_or_zeros` bigint(11) NOT NULL default '0', `Empties_or_zeros` bigint(11) NOT NULL default '0',
`Nulls` bigint(11) NOT NULL default '0', `Nulls` bigint(11) NOT NULL default '0',
`Avg_value_or_avg_length` varchar(255) NOT NULL default '', `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',
`Std` varchar(255) default NULL, `Std` varbinary(255) default NULL,
`Optimal_fieldtype` varchar(64) NOT NULL default '' `Optimal_fieldtype` varbinary(64) NOT NULL default ''
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
select * from t2; select * from t2;
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
...@@ -78,16 +78,16 @@ create table t2 select * from t1 where 0=1 procedure analyse(); ...@@ -78,16 +78,16 @@ create table t2 select * from t1 where 0=1 procedure analyse();
show create table t2; show create table t2;
Table Create Table Table Create Table
t2 CREATE TABLE `t2` ( t2 CREATE TABLE `t2` (
`Field_name` varchar(255) NOT NULL default '', `Field_name` varbinary(255) NOT NULL default '',
`Min_value` varchar(255) default NULL, `Min_value` varbinary(255) default NULL,
`Max_value` varchar(255) default NULL, `Max_value` varbinary(255) default NULL,
`Min_length` bigint(11) NOT NULL default '0', `Min_length` bigint(11) NOT NULL default '0',
`Max_length` bigint(11) NOT NULL default '0', `Max_length` bigint(11) NOT NULL default '0',
`Empties_or_zeros` bigint(11) NOT NULL default '0', `Empties_or_zeros` bigint(11) NOT NULL default '0',
`Nulls` bigint(11) NOT NULL default '0', `Nulls` bigint(11) NOT NULL default '0',
`Avg_value_or_avg_length` varchar(255) NOT NULL default '', `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',
`Std` varchar(255) default NULL, `Std` varbinary(255) default NULL,
`Optimal_fieldtype` varchar(64) NOT NULL default '' `Optimal_fieldtype` varbinary(64) NOT NULL default ''
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
select * from t2; select * from t2;
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
......
mysql-test/r/case.result
View file @ 764501e7
...@@ -98,10 +98,10 @@ Table Create Table ...@@ -98,10 +98,10 @@ Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '', `c1` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '',
`c2` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '', `c2` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '',
`c3` varchar(1) NOT NULL default '', `c3` varbinary(1) NOT NULL default '',
`c4` varchar(1) NOT NULL default '', `c4` varbinary(1) NOT NULL default '',
`c5` varchar(3) NOT NULL default '', `c5` varbinary(3) NOT NULL default '',
`c6` varchar(3) NOT NULL default '', `c6` varbinary(3) NOT NULL default '',
`c7` double(3,1) NOT NULL default '0.0', `c7` double(3,1) NOT NULL default '0.0',
`c8` double(3,1) NOT NULL default '0.0', `c8` double(3,1) NOT NULL default '0.0',
`c9` double(3,1) default NULL `c9` double(3,1) default NULL
...@@ -149,8 +149,8 @@ t1 CREATE TABLE `t1` ( ...@@ -149,8 +149,8 @@ t1 CREATE TABLE `t1` (
`COALESCE(1.0)` double(3,1) NOT NULL default '0.0', `COALESCE(1.0)` double(3,1) NOT NULL default '0.0',
`COALESCE('a')` varchar(1) NOT NULL default '', `COALESCE('a')` varchar(1) NOT NULL default '',
`COALESCE(1,1.0)` double(3,1) NOT NULL default '0.0', `COALESCE(1,1.0)` double(3,1) NOT NULL default '0.0',
`COALESCE(1,'1')` varchar(1) NOT NULL default '', `COALESCE(1,'1')` varbinary(1) NOT NULL default '',
`COALESCE(1.1,'1')` varchar(3) NOT NULL default '', `COALESCE(1.1,'1')` varbinary(3) NOT NULL default '',
`COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default '' `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default ''
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1; DROP TABLE t1;
mysql-test/r/ps_1general.result
View file @ 764501e7
...@@ -471,7 +471,7 @@ ERROR HY000: This command is not supported in the prepared statement protocol ye ...@@ -471,7 +471,7 @@ ERROR HY000: This command is not supported in the prepared statement protocol ye
prepare stmt1 from ' explain select a from t1 order by b '; prepare stmt1 from ' explain select a from t1 order by b ';
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
...@@ -479,7 +479,7 @@ def possible_keys 253 4096 0 Y 0 31 8 ...@@ -479,7 +479,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 14 N 1 31 8 def Extra 253 255 14 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 t1 ALL NULL NULL NULL NULL 4 Using filesort 1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using filesort
...@@ -487,7 +487,7 @@ SET @arg00=1 ; ...@@ -487,7 +487,7 @@ SET @arg00=1 ;
prepare stmt1 from ' explain select a from t1 where a > ? order by b '; prepare stmt1 from ' explain select a from t1 where a > ? order by b ';
execute stmt1 using @arg00; execute stmt1 using @arg00;
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 5 N 1 31 8 def type 253 10 5 N 1 31 8
...@@ -495,7 +495,7 @@ def possible_keys 253 4096 7 Y 0 31 8 ...@@ -495,7 +495,7 @@ def possible_keys 253 4096 7 Y 0 31 8
def key 253 64 7 Y 0 31 8 def key 253 64 7 Y 0 31 8
def key_len 253 4096 1 Y 128 31 63 def key_len 253 4096 1 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 27 N 1 31 8 def Extra 253 255 27 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 t1 range PRIMARY PRIMARY 4 NULL 3 Using where; Using filesort 1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 3 Using where; Using filesort
......
mysql-test/r/ps_2myisam.result
View file @ 764501e7
...@@ -1145,7 +1145,7 @@ test_sequence ...@@ -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 ...@@ -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 2 1 SIMPLE t9 ALL NULL NULL NULL NULL 2
......
mysql-test/r/ps_3innodb.result
View file @ 764501e7
...@@ -1145,7 +1145,7 @@ test_sequence ...@@ -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 ...@@ -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 2 1 SIMPLE t9 ALL NULL NULL NULL NULL 2
......
mysql-test/r/ps_4heap.result
View file @ 764501e7
...@@ -1146,7 +1146,7 @@ test_sequence ...@@ -1146,7 +1146,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
...@@ -1154,7 +1154,7 @@ def possible_keys 253 4096 0 Y 0 31 8 ...@@ -1154,7 +1154,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 2 1 SIMPLE t9 ALL NULL NULL NULL NULL 2
......
mysql-test/r/ps_5merge.result
View file @ 764501e7
...@@ -1188,7 +1188,7 @@ test_sequence ...@@ -1188,7 +1188,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
...@@ -1196,7 +1196,7 @@ def possible_keys 253 4096 0 Y 0 31 8 ...@@ -1196,7 +1196,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 2 1 SIMPLE t9 ALL NULL NULL NULL NULL 2
...@@ -4197,7 +4197,7 @@ test_sequence ...@@ -4197,7 +4197,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
...@@ -4205,7 +4205,7 @@ def possible_keys 253 4096 0 Y 0 31 8 ...@@ -4205,7 +4205,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 2 1 SIMPLE t9 ALL NULL NULL NULL NULL 2
......
mysql-test/r/ps_7ndb.result
View file @ 764501e7
...@@ -4,7 +4,7 @@ create table t1 ...@@ -4,7 +4,7 @@ create table t1
( (
a int, b varchar(30), a int, b varchar(30),
primary key(a) primary key(a)
) engine = 'NDB' ; ) engine = 'BDB' ;
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, ...@@ -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 = 'NDB' ; ) engine = 'BDB' ;
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');
...@@ -1145,7 +1145,7 @@ test_sequence ...@@ -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,10 +1153,10 @@ def possible_keys 253 4096 0 Y 0 31 8 ...@@ -1153,10 +1153,10 @@ 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 2 1 SIMPLE t9 ALL NULL NULL NULL NULL 3
test_sequence test_sequence
------ delete tests ------ ------ delete tests ------
delete from t1 ; delete from t1 ;
...@@ -1328,7 +1328,7 @@ create table t2 ...@@ -1328,7 +1328,7 @@ create table t2
( (
a int, b varchar(30), a int, b varchar(30),
primary key(a) primary key(a)
) engine = 'NDB' ; ) engine = 'BDB' ;
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; ...@@ -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= 'NDB' ; ENGINE= 'BDB' ;
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 ;
......
mysql-test/r/union.result
View file @ 764501e7
...@@ -554,7 +554,7 @@ aa ...@@ -554,7 +554,7 @@ aa
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` varchar(20) NOT NULL default '' `a` varbinary(20) NOT NULL default ''
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
create table t1 SELECT 12 as a UNION select 12.2 as a; create table t1 SELECT 12 as a UNION select 12.2 as a;
......
sql/item.cc
View file @ 764501e7
...@@ -46,7 +46,7 @@ void item_init(void) ...@@ -46,7 +46,7 @@ void item_init(void)
Item::Item(): Item::Item():
name(0), orig_name(0), name_length(0), fixed(0), name(0), orig_name(0), name_length(0), fixed(0),
collation(default_charset(), DERIVATION_COERCIBLE) collation(&my_charset_bin, DERIVATION_COERCIBLE)
{ {
marker= 0; marker= 0;
maybe_null=null_value=with_sum_func=unsigned_flag=0; maybe_null=null_value=with_sum_func=unsigned_flag=0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7