diff options
| author | unknown <bar@mysql.com> | 2005-01-18 21:38:40 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-01-18 21:38:40 +0400 |
| commit | 7e842896b8d3189856d2c349e8b07b5d4b27ca06 (patch) | |
| tree | 17bc0181a67b221bd9dd2e7753cfd0f73b890d5e /mysql-test | |
| parent | 9f93b015898a6c9bc92333b5d8951024725e39c1 (diff) | |
| parent | 9ab94d6ca628851e01d022d53501a490048f0281 (diff) | |
| download | mariadb-git-7e842896b8d3189856d2c349e8b07b5d4b27ca06.tar.gz | |
merge
mysql-test/r/metadata.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/metadata.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/metadata.result b/mysql-test/r/metadata.result index 307e918a37b..48c09f369b3 100644 --- a/mysql-test/r/metadata.result +++ b/mysql-test/r/metadata.result @@ -1,9 +1,9 @@ drop table if exists t1,t2; select 1, 1.0, -1, "hello", NULL; Catalog Database Table Table_alias Column Column_alias Name Type Length Max length Is_null Flags Decimals Charsetnr -def 1 8 1 1 N 32769 0 8 -def 1.0 5 3 3 N 32769 1 8 -def -1 8 2 2 N 32769 0 8 +def 1 8 1 1 N 32897 0 63 +def 1.0 5 3 3 N 32897 1 63 +def -1 8 2 2 N 32897 0 63 def hello 253 5 5 N 1 31 8 def NULL 6 0 0 Y 32896 0 63 1 1.0 -1 hello NULL |