diff options
| author | unknown <monty@mysql.com> | 2005-05-14 00:01:40 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-05-14 00:01:40 +0300 |
| commit | 037b0a7b14288f078bb3e6e75c14b4fc3181b4f0 (patch) | |
| tree | f66bb31f8c3bb3a7c23d82b86abf8f0810f05403 /mysql-test/r/auto_increment.result | |
| parent | 04890a2e20d338a2f1b4b279c6dd6da3cd6d0f95 (diff) | |
| parent | cdd6bc9bfeb1a82e7c7cfd8880f8e014ca5d9ff8 (diff) | |
| download | mariadb-git-037b0a7b14288f078bb3e6e75c14b4fc3181b4f0.tar.gz | |
Merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/outfile2.result:
Merge rename: mysql-test/r/outfile.result -> mysql-test/r/outfile2.result
myisam/mi_key.c:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/handler.h:
Auto merged
mysql-test/t/alter_table.test:
Merge
mysql-test/t/outfile.test:
Merge
sql/item_func.cc:
Merge
sql/share/czech/errmsg.txt:
Merge
sql/share/danish/errmsg.txt:
Merge
sql/share/dutch/errmsg.txt:
Merge
sql/share/english/errmsg.txt:
Merge
sql/share/estonian/errmsg.txt:
Merge
sql/share/french/errmsg.txt:
Merge
sql/share/german/errmsg.txt:
Merge
sql/share/greek/errmsg.txt:
Merge
sql/share/hungarian/errmsg.txt:
Merge
sql/share/italian/errmsg.txt:
Merge
sql/share/japanese/errmsg.txt:
Merge
sql/share/korean/errmsg.txt:
Merge
sql/share/norwegian-ny/errmsg.txt:
Merge
sql/share/norwegian/errmsg.txt:
Merge
sql/share/polish/errmsg.txt:
Merge
sql/share/portuguese/errmsg.txt:
Merge
sql/share/romanian/errmsg.txt:
Merge
sql/share/russian/errmsg.txt:
Merge
sql/share/slovak/errmsg.txt:
Merge
sql/share/spanish/errmsg.txt:
Merge
sql/share/swedish/errmsg.txt:
Merge
sql/share/ukrainian/errmsg.txt:
Merge
sql/sql_table.cc:
Merge
sql/sql_yacc.yy:
Keep old
sql/unireg.cc:
Merge
Diffstat (limited to 'mysql-test/r/auto_increment.result')
| -rw-r--r-- | mysql-test/r/auto_increment.result | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/auto_increment.result b/mysql-test/r/auto_increment.result index 428b2769fdb..9f3695cb1b1 100644 --- a/mysql-test/r/auto_increment.result +++ b/mysql-test/r/auto_increment.result @@ -341,3 +341,17 @@ a b 2 3 3 4 drop table t1; +CREATE TABLE t1 ( a INT AUTO_INCREMENT, b BLOB, PRIMARY KEY (a,b(10))); +INSERT INTO t1 (b) VALUES ('aaaa'); +CHECK TABLE t1; +Table Op Msg_type Msg_text +test.t1 check status OK +INSERT INTO t1 (b) VALUES (''); +CHECK TABLE t1; +Table Op Msg_type Msg_text +test.t1 check status OK +INSERT INTO t1 (b) VALUES ('bbbb'); +CHECK TABLE t1; +Table Op Msg_type Msg_text +test.t1 check status OK +DROP TABLE IF EXISTS t1; |