diff options
| author | unknown <monty@mysql.com> | 2006-06-30 20:07:33 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-30 20:07:33 +0300 |
| commit | 0bbc6fbeb7cb60d263510ce1f4c116a69ec77f95 (patch) | |
| tree | da64f683229006c098861b31377eeea29039ae5c /mysql-test/r/key.result | |
| parent | 9606675ba20eb309a1f402f92d06e2de8aed22d2 (diff) | |
| download | mariadb-git-0bbc6fbeb7cb60d263510ce1f4c116a69ec77f95.tar.gz | |
After merge fixes
BitKeeper/etc/ignore:
added scripts/mysql_upgrade_shell
include/my_handler.h:
my_handler.h should not include my_global.h
mysql-test/r/key.result:
Update results after merge
Diffstat (limited to 'mysql-test/r/key.result')
| -rw-r--r-- | mysql-test/r/key.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result index 6a362d6b86a..0174ea45935 100644 --- a/mysql-test/r/key.result +++ b/mysql-test/r/key.result @@ -341,8 +341,8 @@ i2 int(11) NO UNI show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `i1` int(11) NOT NULL default '0', - `i2` int(11) NOT NULL default '0', + `i1` int(11) NOT NULL, + `i2` int(11) NOT NULL, UNIQUE KEY `i1idx` (`i1`), UNIQUE KEY `i2idx` (`i2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 |