diff options
| author | unknown <serg@serg.mylan> | 2005-05-01 23:10:55 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-05-01 23:10:55 +0200 |
| commit | 9b512475fcd3056682b7a2eb0a1d3fc5ff041eb3 (patch) | |
| tree | 0a41aa330429f40b1c6866922006bfb0cb59b1ef /mysql-test/r/innodb-replace.result | |
| parent | d3d56609520700ce6f0490007cd4c01870bc7fd6 (diff) | |
| parent | 21eed96b0261a6c6eff4f8df1493a0e57decf2bb (diff) | |
| download | mariadb-git-9b512475fcd3056682b7a2eb0a1d3fc5ff041eb3.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/innodb-replace.result')
| -rw-r--r-- | mysql-test/r/innodb-replace.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/innodb-replace.result b/mysql-test/r/innodb-replace.result index a27806640ad..b7edcc49e56 100644 --- a/mysql-test/r/innodb-replace.result +++ b/mysql-test/r/innodb-replace.result @@ -1,3 +1,4 @@ +drop table if exists t1; create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb; select * from t1; c1 c2 stamp |