diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-07 12:16:00 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-07 12:16:00 +0200 |
| commit | 7ceb29ff17047a268d8e8670478f6e1669939904 (patch) | |
| tree | 65b42f5cb11f29ea5b4414ff075ccafd48569ad6 /storage/innobase/mysql-test/innodb-replace.result | |
| parent | 7fa1449eac29401b3d1f3fb4980149e9e562a705 (diff) | |
| download | mariadb-git-7ceb29ff17047a268d8e8670478f6e1669939904.tar.gz | |
Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same
layout as we always had in trees containing only the builtin
2) win\configure.js WITH_INNOBASE_STORAGE_ENGINE still works.
storage/innobase/CMakeLists.txt:
fix to new directory name (and like 5.1)
storage/innobase/Makefile.am:
fix to new directory name (and like 5.1)
storage/innobase/handler/ha_innodb.cc:
fix to new directory name (and like 5.1)
storage/innobase/plug.in:
fix to new directory name (and like 5.1)
Diffstat (limited to 'storage/innobase/mysql-test/innodb-replace.result')
| -rw-r--r-- | storage/innobase/mysql-test/innodb-replace.result | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/storage/innobase/mysql-test/innodb-replace.result b/storage/innobase/mysql-test/innodb-replace.result new file mode 100644 index 00000000000..c926bb89a2e --- /dev/null +++ b/storage/innobase/mysql-test/innodb-replace.result @@ -0,0 +1,13 @@ +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 +replace delayed into t1 (c1, c2) values ( "text1","11"); +ERROR HY000: DELAYED option not supported for table 't1' +select * from t1; +c1 c2 stamp +replace delayed into t1 (c1, c2) values ( "text1","12"); +ERROR HY000: DELAYED option not supported for table 't1' +select * from t1; +c1 c2 stamp +drop table t1; |