diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-18 22:12:06 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-18 22:12:06 +0500 |
| commit | 7786aca7987c1c50e62033883015fc56f9a21f87 (patch) | |
| tree | 146db858b3661fde37fce7321a97ec9ef9967aa5 /mysql-test/r/strict.result | |
| parent | d3b455137ee309bd36b81a021bdaa922a9614863 (diff) | |
| parent | 8b33c41554b1f9ac173a047f55fa0c522f28af35 (diff) | |
| download | mariadb-git-7786aca7987c1c50e62033883015fc56f9a21f87.tar.gz | |
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
mysql-test/r/ps.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/item.cc:
Auto merged
mysql-test/r/sp_trans.result:
merging
mysql-test/t/sp_trans.test:
merging
Diffstat (limited to 'mysql-test/r/strict.result')
| -rw-r--r-- | mysql-test/r/strict.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index 3b2fda4248a..c1dccd53035 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -3,7 +3,7 @@ set @@sql_mode='ansi,traditional'; select @@sql_mode; @@sql_mode REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER -DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 (col1 date); INSERT INTO t1 VALUES('2004-01-01'),('2004-02-29'); INSERT INTO t1 VALUES('0000-10-31'); |