diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-01 13:15:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-01 13:15:29 +0200 |
| commit | 416d0aebbfaaa00802d00105a0bd2faedb8b8f04 (patch) | |
| tree | 5244b83a9f22d4d5899154c9a64a316111bbe6b6 /mysql-test/r/bug58669.result | |
| parent | adf6e145f77d2f7b049b977ee55ed12d05b96eac (diff) | |
| download | mariadb-git-416d0aebbfaaa00802d00105a0bd2faedb8b8f04.tar.gz | |
more fixes for test cases
mysql-test/suite/innodb/include/restart_and_reinit.inc:
drop and recreate mysql.innodb* tables when deleting innodb table spaces
mysql-test/t/ssl_8k_key-master.opt:
with loose- prefix ssl errors are ignored
sql-common/client.c:
compiler warnings
sql/field.cc:
use the new function
sql/item.cc:
don't convert time to double or decimal via longlong,
this loses sub-second part.
Use dedicated functions.
sql/item.h:
incorrect cast_to_int type for params
sql/item_strfunc.cc:
use the new function
sql/lex.h:
unused
sql/my_decimal.h:
helper macro
sql/sql_plugin.cc:
workaround for a compiler warning
sql/sql_yacc.yy:
unused
sql/transaction.cc:
fix the merge for SERVER_STATUS_IN_TRANS_READONLY protocol flag
storage/sphinx/CMakeLists.txt:
compiler warnings
Diffstat (limited to 'mysql-test/r/bug58669.result')
| -rw-r--r-- | mysql-test/r/bug58669.result | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/r/bug58669.result b/mysql-test/r/bug58669.result index cf4eeeb02a1..c9bd43e244b 100644 --- a/mysql-test/r/bug58669.result +++ b/mysql-test/r/bug58669.result @@ -8,10 +8,9 @@ CREATE TABLE db1.t1(a INT); SELECT CURRENT_USER(); CURRENT_USER() user1@localhost -SHOW VARIABLES LIKE "%read_only%"; +SHOW VARIABLES LIKE "read_only%"; Variable_name Value read_only ON -tx_read_only OFF INSERT INTO db1.t1 VALUES (1); ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement DROP DATABASE db1; |