diff options
| author | unknown <kostja@bodhi.(none)> | 2007-06-01 17:50:24 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-06-01 17:50:24 +0400 |
| commit | b21f87e8b643b29eb193b738f180d4732684bfd1 (patch) | |
| tree | 38195bc2230576453a9ef2e5131226d9fb270d86 /mysql-test/t/mysql.test | |
| parent | 108429c99e840389f806a6af761cd5d630448d92 (diff) | |
| parent | d8cd88cd2aa823131c5dafaa1bd65042a7c02f22 (diff) | |
| download | mariadb-git-b21f87e8b643b29eb193b738f180d4732684bfd1.tar.gz | |
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/r/sp.result:
Use local
Diffstat (limited to 'mysql-test/t/mysql.test')
| -rw-r--r-- | mysql-test/t/mysql.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 08087f17e16..e7131efa0f3 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -263,7 +263,7 @@ EOF --exec $MYSQL test -e "show status" 2>&1 > /dev/null --exec $MYSQL --help 2>&1 > /dev/null --exec $MYSQL --version 2>&1 > /dev/null ---enable_quary_log +--enable_query_log # # bug #26851: Mysql Client --pager Buffer Overflow |