diff options
Diffstat (limited to 'mysql-test/suite/sys_vars/t/general_log_file_func.test')
-rw-r--r-- | mysql-test/suite/sys_vars/t/general_log_file_func.test | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/mysql-test/suite/sys_vars/t/general_log_file_func.test b/mysql-test/suite/sys_vars/t/general_log_file_func.test index eeea3f75d26..1a73a4a5eaa 100644 --- a/mysql-test/suite/sys_vars/t/general_log_file_func.test +++ b/mysql-test/suite/sys_vars/t/general_log_file_func.test @@ -21,7 +21,7 @@ --disable_warnings -drop table if exists t1; +DROP TABLE IF EXISTS t1; --enable_warnings ######################### @@ -31,7 +31,7 @@ drop table if exists t1; --echo ## Creating new table ## CREATE TABLE t1 ( -id INT NOT NULL auto_increment, +id INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (id), name VARCHAR(30) ); @@ -40,18 +40,17 @@ name VARCHAR(30) #################################################################### # Verifying general log as we have initialized in opt file # #################################################################### - - SELECT @@general_log_file; -INSERT into t1(name) values('Record_1'); -INSERT into t1(name) values('Record_2'); -INSERT into t1(name) values('Record_3'); -INSERT into t1(name) values('Record_4'); +INSERT INTO t1(name) VALUES('Record_1'); +INSERT INTO t1(name) VALUES('Record_2'); +INSERT INTO t1(name) VALUES('Record_3'); +INSERT INTO t1(name) VALUES('Record_4'); --echo ## Verifying general log file ## ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---file_exists $MYSQLTEST_VARDIR/master-data/mysql-test.log +let $MYSQLD_DATADIR= `select @@datadir`; +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR +--file_exists $MYSQLD_DATADIR/mysql-test.log --echo ## Dropping table ## DROP TABLE t1; |