Skip to content

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

Update results for new SHOW FULL COLUMNS 

Portability fixes


include/my_tree.h:
  Add missing include file.
mysql-test/r/select.result:
  Update results for new SHOW FULL COLUMNS
mysql-test/r/type_blob.result:
  Update results for new SHOW FULL COLUMNS
mysql-test/r/type_float.result:
  Update results for new SHOW FULL COLUMNS
mysql-test/r/type_ranges.result:
  Update results for new SHOW FULL COLUMNS
mysql-test/t/heap_btree.test:
  Update results for new SHOW FULL COLUMNS
parent daff6c51
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 129 deletions
include/my_tree.h
View file @ f45dc577
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
extern "C" { extern "C" {
#endif #endif
#include "my_base.h" /* get 'enum ha_rkey_function' */
#define MAX_TREE_HEIGHT 40 /* = max 1048576 leafs in tree */ #define MAX_TREE_HEIGHT 40 /* = max 1048576 leafs in tree */
#define ELEMENT_KEY(tree,element)\ #define ELEMENT_KEY(tree,element)\
(tree->offset_to_key ? (void*)((byte*) element+tree->offset_to_key) :\ (tree->offset_to_key ? (void*)((byte*) element+tree->offset_to_key) :\
......
mysql-test/r/select.result
View file @ f45dc577
...@@ -3207,23 +3207,23 @@ Tables_in_test (s%) ...@@ -3207,23 +3207,23 @@ Tables_in_test (s%)
show tables from test like "t?"; show tables from test like "t?";
Tables_in_test (t?) Tables_in_test (t?)
show full columns from t2; show full columns from t2;
Field Type Null Key Default Extra Privileges Field Type Null Key Default Extra Privileges Comment
auto int(11) PRI NULL auto_increment select,insert,update,references auto int(11) PRI NULL auto_increment select,insert,update,references
fld1 int(6) unsigned zerofill UNI 000000 select,insert,update,references fld1 int(6) unsigned zerofill UNI 000000 select,insert,update,references
companynr tinyint(2) unsigned zerofill 00 select,insert,update,references companynr tinyint(2) unsigned zerofill 00 select,insert,update,references
fld3 char(30) MUL select,insert,update,references fld3 char(30) MUL select,insert,update,references
fld4 char(35) select,insert,update,references fld4 char(35) select,insert,update,references
fld5 char(35) select,insert,update,references fld5 char(35) select,insert,update,references
fld6 char(4) select,insert,update,references fld6 char(4) select,insert,update,references
show full columns from t2 from test like 'f%'; show full columns from t2 from test like 'f%';
Field Type Null Key Default Extra Privileges Field Type Null Key Default Extra Privileges Comment
fld1 int(6) unsigned zerofill UNI 000000 select,insert,update,references fld1 int(6) unsigned zerofill UNI 000000 select,insert,update,references
fld3 char(30) MUL select,insert,update,references fld3 char(30) MUL select,insert,update,references
fld4 char(35) select,insert,update,references fld4 char(35) select,insert,update,references
fld5 char(35) select,insert,update,references fld5 char(35) select,insert,update,references
fld6 char(4) select,insert,update,references fld6 char(4) select,insert,update,references
show full columns from t2 from test like 's%'; show full columns from t2 from test like 's%';
Field Type Null Key Default Extra Privileges Field Type Null Key Default Extra Privileges Comment
show keys from t2; show keys from t2;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t2 0 PRIMARY 1 auto A 1199 NULL NULL BTREE t2 0 PRIMARY 1 auto A 1199 NULL NULL BTREE
......
mysql-test/r/type_blob.result
View file @ f45dc577
...@@ -37,18 +37,18 @@ insert into t1 values (NULL,NULL,NULL,NULL); ...@@ -37,18 +37,18 @@ insert into t1 values (NULL,NULL,NULL,NULL);
update t1 set c="",b=null where c="1"; update t1 set c="",b=null where c="1";
lock tables t1 READ; lock tables t1 READ;
show full fields from t1; show full fields from t1;
Field Type Null Key Default Extra Privileges Field Type Null Key Default Extra Privileges Comment
t text YES NULL select,insert,update,references t text YES NULL select,insert,update,references
c varchar(10) YES NULL select,insert,update,references c varchar(10) YES NULL select,insert,update,references
b blob YES NULL select,insert,update,references b blob YES NULL select,insert,update,references
d varchar(10) binary YES NULL select,insert,update,references d varchar(10) binary YES NULL select,insert,update,references
lock tables t1 WRITE; lock tables t1 WRITE;
show full fields from t1; show full fields from t1;
Field Type Null Key Default Extra Privileges Field Type Null Key Default Extra Privileges Comment
t text YES NULL select,insert,update,references t text YES NULL select,insert,update,references
c varchar(10) YES NULL select,insert,update,references c varchar(10) YES NULL select,insert,update,references
b blob YES NULL select,insert,update,references b blob YES NULL select,insert,update,references
d varchar(10) binary YES NULL select,insert,update,references d varchar(10) binary YES NULL select,insert,update,references
unlock tables; unlock tables;
select t from t1 where t like "hello"; select t from t1 where t like "hello";
t t
......
mysql-test/r/type_float.result
View file @ f45dc577
...@@ -10,9 +10,9 @@ SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1; ...@@ -10,9 +10,9 @@ SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1;
drop table if exists t1; drop table if exists t1;
create table t1 (f1 float(24),f2 float(52)); create table t1 (f1 float(24),f2 float(52));
show full columns from t1; show full columns from t1;
Field Type Null Key Default Extra Privileges Field Type Null Key Default Extra Privileges Comment
f1 float YES NULL select,insert,update,references f1 float YES NULL select,insert,update,references
f2 double YES NULL select,insert,update,references f2 double YES NULL select,insert,update,references
insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150); insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150);
insert into t1 values(-10,-10),(1e-5,1e-5),(1e-10,1e-10),(1e-15,1e-15),(1e-20,1e-20),(1e-50,1e-50),(1e-150,1e-150); insert into t1 values(-10,-10),(1e-5,1e-5),(1e-10,1e-10),(1e-15,1e-15),(1e-20,1e-20),(1e-50,1e-50),(1e-150,1e-150);
select * from t1; select * from t1;
...@@ -69,19 +69,19 @@ min(a) ...@@ -69,19 +69,19 @@ min(a)
drop table t1; drop table t1;
create table t1 (f float, f2 float(24), f3 float(6,2), d double, d2 float(53), d3 double(10,3), de decimal, de2 decimal(6), de3 decimal(5,2), n numeric, n2 numeric(8), n3 numeric(5,6)); create table t1 (f float, f2 float(24), f3 float(6,2), d double, d2 float(53), d3 double(10,3), de decimal, de2 decimal(6), de3 decimal(5,2), n numeric, n2 numeric(8), n3 numeric(5,6));
show full columns from t1; show full columns from t1;
Field Type Null Key Default Extra Privileges Field Type Null Key Default Extra Privileges Comment
f float YES NULL select,insert,update,references f float YES NULL select,insert,update,references
f2 float YES NULL select,insert,update,references f2 float YES NULL select,insert,update,references
f3 float(6,2) YES NULL select,insert,update,references f3 float(6,2) YES NULL select,insert,update,references
d double YES NULL select,insert,update,references d double YES NULL select,insert,update,references
d2 double YES NULL select,insert,update,references d2 double YES NULL select,insert,update,references
d3 double(10,3) YES NULL select,insert,update,references d3 double(10,3) YES NULL select,insert,update,references
de decimal(10,0) YES NULL select,insert,update,references de decimal(10,0) YES NULL select,insert,update,references
de2 decimal(6,0) YES NULL select,insert,update,references de2 decimal(6,0) YES NULL select,insert,update,references
de3 decimal(5,2) YES NULL select,insert,update,references de3 decimal(5,2) YES NULL select,insert,update,references
n decimal(10,0) YES NULL select,insert,update,references n decimal(10,0) YES NULL select,insert,update,references
n2 decimal(8,0) YES NULL select,insert,update,references n2 decimal(8,0) YES NULL select,insert,update,references
n3 decimal(7,6) YES NULL select,insert,update,references n3 decimal(7,6) YES NULL select,insert,update,references
drop table t1; drop table t1;
create table t1 (a decimal(7,3) not null, key (a)); create table t1 (a decimal(7,3) not null, key (a));
insert into t1 values ("0"),("-0.00"),("-0.01"),("-0.002"),("1"); insert into t1 values ("0"),("-0.00"),("-0.01"),("-0.002"),("1");
......
mysql-test/r/type_ranges.result
View file @ f45dc577
This diff is collapsed.
mysql-test/t/heap_btree.test
View file @ f45dc577
...@@ -60,12 +60,12 @@ insert into t1 values(1,1),(1,2),(2,3),(1,3),(1,4),(1,5),(1,6); ...@@ -60,12 +60,12 @@ insert into t1 values(1,1),(1,2),(2,3),(1,3),(1,4),(1,5),(1,6);
select * from t1 where a=1; select * from t1 where a=1;
insert into t1 values(1,1),(1,2),(2,3),(1,3),(1,4),(1,5),(1,6); insert into t1 values(1,1),(1,2),(2,3),(1,3),(1,4),(1,5),(1,6);
select * from t1 where a=1; select * from t1 where a=1;
--replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x --replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x 10 x 11 x 12 x 13 x 14 x
explain select * from t1 where a=1 order by a,b; explain select * from t1 where a=1 order by a,b;
--replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x --replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x 10 x 11 x 12 x 13 x 14 x
explain select * from t1 where a=1 order by b; explain select * from t1 where a=1 order by b;
select * from t1 where b=1; select * from t1 where b=1;
--replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x --replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x 10 x 11 x 12 x 13 x 14 x
explain select * from t1 where b=1; explain select * from t1 where b=1;
drop table t1; drop table t1;
......
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