diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
| commit | a8fdaa6f2c5b2e302bffb069be3475772ca20f48 (patch) | |
| tree | b5c9560ec7346f7af6a5904ad344fdbb8020849c /mysql-test/t/show_check.test | |
| parent | 115efe100dbc1393bce964fa1370e50cfef71d18 (diff) | |
| parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
| download | mariadb-git-a8fdaa6f2c5b2e302bffb069be3475772ca20f48.tar.gz | |
Merge with base MySQL 5.1
Contains fixes for test cases
Changed release tag to beta
configure.in:
change release tag to beta
Diffstat (limited to 'mysql-test/t/show_check.test')
| -rw-r--r-- | mysql-test/t/show_check.test | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 765a69aaa5f..116298a9c80 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -422,14 +422,15 @@ DROP TABLE t1; flush tables; # Create a junk frm file on disk -system echo "this is a junk file for test" >> $MYSQLTEST_VARDIR/master-data/test/t1.frm ; +let $MYSQLD_DATADIR= `select @@datadir`; +system echo "this is a junk file for test" >> $MYSQLD_DATADIR/test/t1.frm ; --replace_column 6 # 7 # 8 # 9 # SHOW TABLE STATUS like 't1'; --error 1033 show create table t1; drop table if exists t1; --error 1,0 ---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm +--remove_file $MYSQLD_DATADIR/test/t1.frm # # BUG 12183 - SHOW OPEN TABLES behavior doesn't match grammar |