diff options
author | unknown <jimw@mysql.com> | 2005-04-05 19:45:34 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-04-05 19:45:34 -0700 |
commit | 5cdec5d6ba0c3fac2fe312da3e98c9506091a0a7 (patch) | |
tree | b51927fa62cfdff1d3b10fd3678491743e115f13 /mysql-test/t/limit.test | |
parent | 51653cb239a715c754c1e8a7352fedf47393a872 (diff) | |
parent | 2f19824d20c49b244c89c008437eb6c1281222b3 (diff) | |
download | mariadb-git-5cdec5d6ba0c3fac2fe312da3e98c9506091a0a7.tar.gz |
Merge
mysql-test/r/create.result:
Auto merged
mysql-test/r/ctype_latin1_de.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/limit.result:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/ctype_latin1_de.test:
Auto merged
mysql-test/t/limit.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
mysql-test/t/type_ranges.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_insert.cc:
Auto merged
mysql-test/t/strict.test:
SCCS merged
Diffstat (limited to 'mysql-test/t/limit.test')
-rw-r--r-- | mysql-test/t/limit.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/limit.test b/mysql-test/t/limit.test index 28b287a5d4a..3dc56295375 100644 --- a/mysql-test/t/limit.test +++ b/mysql-test/t/limit.test @@ -6,7 +6,7 @@ drop table if exists t1; --enable_warnings -create table t1 (a int primary key, b int not null); +create table t1 (a int not null default 0 primary key, b int not null default 0); insert into t1 () values (); -- Testing default values insert into t1 values (1,1),(2,1),(3,1); update t1 set a=4 where b=1 limit 1; |