diff options
| author | mskold/marty@mysql.com/linux.site <> | 2006-12-05 06:38:08 +0100 |
|---|---|---|
| committer | mskold/marty@mysql.com/linux.site <> | 2006-12-05 06:38:08 +0100 |
| commit | f8bd5d312ba8bcbbaacd7cc1f2a74e80a1aacae3 (patch) | |
| tree | a864690bd9f0c54d2262dc0b6b858fdeb608fe4b /mysql-test | |
| parent | 6e8f99d29b7691921a39bad730f2de1433502b80 (diff) | |
| parent | d253588c699ef2e589fb2d38aff7f78c8e25063c (diff) | |
| download | mariadb-git-f8bd5d312ba8bcbbaacd7cc1f2a74e80a1aacae3.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/type_varchar.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/type_varchar.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/type_varchar.result b/mysql-test/r/type_varchar.result index 4c1aee24642..f6c2f4d01a6 100644 --- a/mysql-test/r/type_varchar.result +++ b/mysql-test/r/type_varchar.result @@ -488,3 +488,4 @@ t 0 Warnings: Warning 1292 Truncated incorrect INTEGER value: '1a' Warning 1292 Truncated incorrect INTEGER value: 't' +DROP TABLE t1; diff --git a/mysql-test/t/type_varchar.test b/mysql-test/t/type_varchar.test index cfb6472a7b4..7b87a388c56 100644 --- a/mysql-test/t/type_varchar.test +++ b/mysql-test/t/type_varchar.test @@ -196,3 +196,4 @@ INSERT INTO t1 VALUES (10), (50), (30), ('1a'), (60), ('t'); SELECT a,(a + 0) FROM t1 ORDER BY a; SELECT a,(a DIV 2) FROM t1 ORDER BY a; SELECT a,CAST(a AS SIGNED) FROM t1 ORDER BY a; +DROP TABLE t1; |