diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-03-26 18:37:38 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-03-26 18:37:38 +0200 |
| commit | 9630bdffddc52d9ecd2e9ccab1c492756f07076d (patch) | |
| tree | 007e99eab2948fed93bba975a04801b24ba9c92a /mysql-test/t/order_by.test | |
| parent | c8bdced21469ec1777abfea13662becc66944919 (diff) | |
| parent | 221dfec1a4fb2a7208d9ae88eaa151857e95486c (diff) | |
| download | mariadb-git-9630bdffddc52d9ecd2e9ccab1c492756f07076d.tar.gz | |
Merge with 4.0.13
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/sort.c:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/t/bdb-crash.test:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
mysql-test/t/type_ranges.test:
Auto merged
mysql-test/t/update.test:
Auto merged
sql-bench/crash-me.sh:
Auto merged
client/mysql.cc:
Keep old code
Diffstat (limited to 'mysql-test/t/order_by.test')
| -rw-r--r-- | mysql-test/t/order_by.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/order_by.test b/mysql-test/t/order_by.test index f7677709ca4..8e1f304a5a5 100644 --- a/mysql-test/t/order_by.test +++ b/mysql-test/t/order_by.test @@ -25,7 +25,7 @@ INSERT INTO t1 VALUES (2,7,'60671569','Y'); INSERT INTO t1 VALUES (2,3,'dd','Y'); CREATE TABLE t2 ( - id int(6) DEFAULT '0' NOT NULL auto_increment, + id int(6) NOT NULL auto_increment, description varchar(40) NOT NULL, idform varchar(40), ordre int(6) unsigned DEFAULT '0' NOT NULL, |