mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update results for new SHOW FULL COLUMNS

Browse source 
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
This commit is contained in:
unknown 2002-06-04 11:32:33 +03:00
parent daff6c5115
commit f45dc57729
6 changed files with 131 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/my_tree.h
View file

@ -20,6 +20,8 @@
extern "C" {
#endif
#include "my_base.h" /* get 'enum ha_rkey_function' */
#define MAX_TREE_HEIGHT 40 /* = max 1048576 leafs in tree */
#define ELEMENT_KEY(tree,element)\
(tree->offset_to_key ? (void*)((byte*) element+tree->offset_to_key) :\

6
mysql-test/r/select.result
View file

@ -3207,7 +3207,7 @@ Tables_in_test (s%)
show tables from test like "t?";
Tables_in_test (t?)
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
fld1 int(6) unsigned zerofill UNI 000000 select,insert,update,references
companynr tinyint(2) unsigned zerofill 00 select,insert,update,references
@ -3216,14 +3216,14 @@ fld4 char(35) select,insert,update,references
fld5 char(35) select,insert,update,references
fld6 char(4) select,insert,update,references
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
fld3 char(30) MUL select,insert,update,references
fld4 char(35) select,insert,update,references
fld5 char(35) select,insert,update,references
fld6 char(4) select,insert,update,references
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;
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

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

@ -37,14 +37,14 @@ insert into t1 values (NULL,NULL,NULL,NULL);
update t1 set c="",b=null where c="1";
lock tables t1 READ;
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
c varchar(10) YES NULL select,insert,update,references
b blob YES NULL select,insert,update,references
d varchar(10) binary YES NULL select,insert,update,references
lock tables t1 WRITE;
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
c varchar(10) YES NULL select,insert,update,references
b blob YES NULL select,insert,update,references

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

@ -10,7 +10,7 @@ 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;
create table t1 (f1 float(24),f2 float(52));
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
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);
@ -69,7 +69,7 @@ min(a)
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));
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
f2 float YES NULL select,insert,update,references
f3 float(6,2) YES NULL select,insert,update,references

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

@ -38,7 +38,7 @@ KEY (ulonglong,ulong),
KEY (options,flags)
);
show full fields from t1;
Field Type Null Key Default Extra Privileges
Field Type Null Key Default Extra Privileges Comment
auto int(5) unsigned PRI NULL auto_increment select,insert,update,references
string varchar(10) YES hello select,insert,update,references
tiny tinyint(4) MUL 0 select,insert,update,references
@ -168,7 +168,7 @@ drop table t2;
create table t2 select * from t1;
update t2 set string="changed" where auto=16;
show full columns from t1;
Field Type Null Key Default Extra Privileges
Field Type Null Key Default Extra Privileges Comment
auto int(5) unsigned MUL NULL auto_increment select,insert,update,references
string varchar(10) YES new defaul select,insert,update,references
tiny tinyint(4) MUL 0 select,insert,update,references
@ -194,7 +194,7 @@ options enum('one','two','tree') MUL one select,insert,update,references
flags set('one','two','tree') select,insert,update,references
new_field varchar(10) new select,insert,update,references
show full columns from t2;
Field Type Null Key Default Extra Privileges
Field Type Null Key Default Extra Privileges Comment
auto int(5) unsigned 0 select,insert,update,references
string varchar(10) YES new defaul select,insert,update,references
tiny tinyint(4) 0 select,insert,update,references
@ -228,7 +228,7 @@ auto auto
drop table t2;
create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, "a" as t2, repeat("a",256) as t3, binary repeat("b",256) as t4 from t1;
show full columns from t2;
Field Type Null Key Default Extra Privileges
Field Type Null Key Default Extra Privileges Comment
auto bigint(17) unsigned PRI 0 select,insert,update,references
t1 bigint(1) 0 select,insert,update,references
t2 char(1) select,insert,update,references
@ -251,7 +251,7 @@ create table t3 select * from t1, t2;
Duplicate column name 'c'
create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2;
show full columns from t3;
Field Type Null Key Default Extra Privileges
Field Type Null Key Default Extra Privileges Comment
c1 int(11) YES NULL select,insert,update,references
c2 int(11) YES NULL select,insert,update,references
const bigint(1) 0 select,insert,update,references

6
mysql-test/t/heap_btree.test
View file

@ -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;
insert into t1 values(1,1),(1,2),(2,3),(1,3),(1,4),(1,5),(1,6);
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;
--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;
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;
drop table t1;