diff options
author | unknown <brian@zim.(none)> | 2006-08-13 22:28:41 -0700 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2006-08-13 22:28:41 -0700 |
commit | 1363c9b215a2e01e6437fdaa16db0fa86e57362f (patch) | |
tree | 15ad7b04e02a710319de19d4c714db8d0e375062 /mysql-test/r/log_tables.result | |
parent | 79072b506fb0cd5feb5677289fa04cb0f485ba0d (diff) | |
download | mariadb-git-1363c9b215a2e01e6437fdaa16db0fa86e57362f.tar.gz |
Fixed warning message breakage.
Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references.
mysql-test/r/backup.result:
fix warnings
mysql-test/r/im_options.result:
Remove missed bdb skip
mysql-test/r/im_utils.result:
Remove missed bdb-skip
mysql-test/r/log_tables.result:
Fix warnings
mysql-test/r/show_check.result:
Fix warnings
mysql-test/r/sp_trans.result:
Fix warning
mysql-test/r/type_timestamp.result:
Fix warning
mysql-test/r/warnings.result:
Fix warning
mysql-test/t/disabled.def:
Disabled Federation test
mysql-test/t/federated_transactions.test:
Fixed comments in federation test
netware/mysql_install_db.c:
Fix install breakage.
netware/mysql_test_run.c:
Fix install breakage.
scripts/mysql_install_db.sh:
Fix install breakage
storage/myisam/ftbench/ft-test-run.sh:
Fixed test which is never run
support-files/my-innodb-heavy-4G.cnf.sh:
Modified examples
support-files/my-small.cnf.sh:
Modified examples
Diffstat (limited to 'mysql-test/r/log_tables.result')
-rw-r--r-- | mysql-test/r/log_tables.result | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 8b0a5ea6a20..638c05dd712 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -29,13 +29,13 @@ on (mysql.general_log.command_type = join_test.command_type) drop table join_test; flush logs; lock tables mysql.general_log WRITE; -ERROR HY000: You can't write-lock a log table. Only read access is possible. +ERROR HY000: You can't write-lock a log table. Only read access is possible lock tables mysql.slow_log WRITE; -ERROR HY000: You can't write-lock a log table. Only read access is possible. +ERROR HY000: You can't write-lock a log table. Only read access is possible lock tables mysql.general_log READ; -ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead. +ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead lock tables mysql.slow_log READ; -ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead. +ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL; unlock tables; lock tables mysql.general_log READ LOCAL; @@ -161,13 +161,13 @@ TIMESTAMP USER_HOST THREAD_ID 1 Query set global slow_query_log='ON' TIMESTAMP USER_HOST THREAD_ID 1 Query select * from mysql.general_log flush logs; lock tables mysql.general_log WRITE; -ERROR HY000: You can't write-lock a log table. Only read access is possible. +ERROR HY000: You can't write-lock a log table. Only read access is possible lock tables mysql.slow_log WRITE; -ERROR HY000: You can't write-lock a log table. Only read access is possible. +ERROR HY000: You can't write-lock a log table. Only read access is possible lock tables mysql.general_log READ; -ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead. +ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead lock tables mysql.slow_log READ; -ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead. +ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL; unlock tables; set global general_log='OFF'; |