diff options
| author | unknown <ingo@chilla.local> | 2006-07-06 15:38:47 +0200 |
|---|---|---|
| committer | unknown <ingo@chilla.local> | 2006-07-06 15:38:47 +0200 |
| commit | 9532056d1351f0377db90738363f5b4bff176588 (patch) | |
| tree | 1efd4d6be4cd94b4d675fcaf788d5c44f897a53b /mysql-test/r/archive.result | |
| parent | 4ceb9bb0901432d675003d8e306c020a54f880be (diff) | |
| download | mariadb-git-9532056d1351f0377db90738363f5b4bff176588.tar.gz | |
After merge fixes.
mysql-test/r/archive.result:
After merge fix. It might come from the fix for
bug 1662 (ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY)
sql/time.cc:
After merge fix. Auto resolve failed because this piece
of code was moved from another file to here.
Diffstat (limited to 'mysql-test/r/archive.result')
| -rw-r--r-- | mysql-test/r/archive.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index cacf4aaf304..1dfec8ff713 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -13812,6 +13812,8 @@ select * from t1 where i between 2 and 4 and v in ('def','3r4f','lmn'); i v 4 3r4f alter table t1 data directory="$MYSQLTEST_VARDIR/tmp"; +Warnings: +Warning 0 DATA DIRECTORY option ignored select * from t1; i v 1 def |