diff options
| author | unknown <hf@deer.(none)> | 2005-07-07 21:49:12 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-07-07 21:49:12 +0500 |
| commit | cab1a23a735999dc89e87d427436ae3a97315df8 (patch) | |
| tree | e34bdb458843af89377ea9b2bf7f90966fca8bf4 /mysql-test/r/show_check.result | |
| parent | 21f20266069b959dfa252f7e4ca4ccf315cbcd92 (diff) | |
| parent | 077e335eb35d7217e2c950a2caa7c025f78f7a3b (diff) | |
| download | mariadb-git-cab1a23a735999dc89e87d427436ae3a97315df8.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sql_mode.result:
Auto merged
Diffstat (limited to 'mysql-test/r/show_check.result')
| -rw-r--r-- | mysql-test/r/show_check.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index dcab877abf9..f1c536ed1da 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -267,9 +267,9 @@ drop table t1; create table t1 (c decimal(3,3), d double(3,3), f float(3,3)); show columns from t1; Field Type Null Key Default Extra -c decimal(4,3) YES NULL -d double(4,3) YES NULL -f float(4,3) YES NULL +c decimal(3,3) YES NULL +d double(3,3) YES NULL +f float(3,3) YES NULL drop table t1; SET @old_sql_mode= @@sql_mode, sql_mode= ''; SET @old_sql_quote_show_create= @@sql_quote_show_create, sql_quote_show_create= OFF; |