diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-10-11 23:09:08 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-10-11 23:09:08 +0500 |
| commit | f0fcc8c26704a4627963a6b3044eea40fcee143b (patch) | |
| tree | a37b48b9496527f7f425a19edc1846239d318dea /mysql-test/r/create.result | |
| parent | 048cb42dbfadc57761ec8575b344046db91808cd (diff) | |
| parent | c866f8015fcfd56c42f52865c0e89a50c055f6f8 (diff) | |
| download | mariadb-git-f0fcc8c26704a4627963a6b3044eea40fcee143b.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31471
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/create.result:
Auto merged
mysql-test/r/null.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/create.result')
| -rw-r--r-- | mysql-test/r/create.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index b370fbf6fbe..a19fd34731b 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -438,7 +438,7 @@ explain t2; Field Type Null Key Default Extra a int(11) YES NULL b bigint(11) NO 0 -c bigint(11) NO 0 +c bigint(11) unsigned NO 0 d date YES NULL e varchar(1) NO f datetime YES NULL |