diff options
author | unknown <msvensson@pilot.blaudden> | 2007-04-02 10:50:39 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-04-02 10:50:39 +0200 |
commit | 3378a48698a311403651fe9bb83d1dfe80a98d78 (patch) | |
tree | da9c4b945967d94e3b16c2fd56a52699aba69b66 /mysql-test/t/create.test | |
parent | f249185b6eead7796f15f880a896a7782222db99 (diff) | |
parent | 44d4940fcc001a6606c63e8900d9e2bf41ea4e67 (diff) | |
download | mariadb-git-3378a48698a311403651fe9bb83d1dfe80a98d78.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/gis.result:
SCCS merged
mysql-test/t/gis.test:
SCCS merged
Diffstat (limited to 'mysql-test/t/create.test')
-rw-r--r-- | mysql-test/t/create.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index 8e55bf62ba6..ba5f56e12b1 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -656,6 +656,7 @@ create table t1(a set("a,b","c,d") not null); # End of 4.1 tests + # # Bug #14155: Maximum value of MAX_ROWS handled incorrectly on 64-bit # platforms @@ -674,4 +675,4 @@ drop table t1; create table t1 (upgrade int); drop table t1; -# End of 5.0 tests +--echo End of 5.0 tests |