summaryrefslogtreecommitdiff
path: root/mysql-test/r/metadata.result
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2005-03-30 23:08:03 +0300
committerbell@sanja.is.com.ua <>2005-03-30 23:08:03 +0300
commitdc87075f866fb5e146f92b3b2b87d46f73957c7b (patch)
tree6d5c1ce80d730620d6df04640793e8b791bdb704 /mysql-test/r/metadata.result
parentc64efa6062134675c6cb057fc7412ef1ea3a7a56 (diff)
downloadmariadb-git-dc87075f866fb5e146f92b3b2b87d46f73957c7b.tar.gz
postmerge fixes
Diffstat (limited to 'mysql-test/r/metadata.result')
-rw-r--r--mysql-test/r/metadata.result8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/metadata.result b/mysql-test/r/metadata.result
index 790c1ec3794..8f25e6b7f4a 100644
--- a/mysql-test/r/metadata.result
+++ b/mysql-test/r/metadata.result
@@ -65,22 +65,22 @@ insert into t1 values (1,'one');
insert into t1 values (2,'two');
set @arg00=1 ;
select @arg00 FROM t1 where a=1 union distinct select 1 FROM t1 where a=1;
-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 Type Length Max length Is_null Flags Decimals Charsetnr
def @arg00 @arg00 8 20 1 Y 32768 0 63
@arg00
1
select * from (select @arg00) aaa;
-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 Type Length Max length Is_null Flags Decimals Charsetnr
def aaa @arg00 @arg00 8 20 1 Y 32768 0 63
@arg00
1
select 1 union select 1;
-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 Type Length Max length Is_null Flags Decimals Charsetnr
def 1 1 8 20 1 N 32769 0 63
1
1
select * from (select 1 union select 1) aaa;
-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 Type Length Max length Is_null Flags Decimals Charsetnr
def aaa 1 1 8 20 1 N 32769 0 63
1
1