diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-10-09 15:34:07 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-10-09 15:34:07 +0200 |
| commit | 220d9b8c4abed2feaa1523e2146e6d472f1c1627 (patch) | |
| tree | 244b3938a0b73a7f8aafae46e073c77f5bf6acdd /mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test | |
| parent | 5ca59914ce2ebf11700c5d47fbdf9cbb293ae489 (diff) | |
| download | mariadb-git-220d9b8c4abed2feaa1523e2146e6d472f1c1627.tar.gz | |
This is a backport of the two patches for Bug #28299:
To-number conversion warnings work differenly with CHAR
and VARCHAR sp variables.
The original revision-IDs are:
staale.smedseng@sun.com-20081124095339-2qdvzkp0rn1ljs30
staale.smedseng@sun.com-20081125104611-rtxic5d12e83ag2o
The patch provides ER_TRUNCATED_WRONG_VALUE warning messages
for conversion of VARCHAR to numberic values, in line with
messages provided for CHAR conversions. Conversions are
checked for success, and the message is emitted in case
failure.
The tests are amended to accept the added warning messages,
and explicit conversion of ON/OFF values is added for
statements checking system variables. In test
rpl.rpl_switch_stm_row_mixed checking for warnings is
temporarily disabled for one statement, as this generates
warning messages for strings that vary between executions.
sql/field.cc:
The pushing of the truncation warning is now done in a
separate static function, and used in various places.
Diffstat (limited to 'mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test')
| -rw-r--r-- | mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test index 74da0904454..005aec91acf 100644 --- a/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test +++ b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test @@ -113,7 +113,7 @@ SELECT @@session.automatic_sp_privileges; # Check if the value in GLOBAL Tables matches values in variable # ############################################################################## -SELECT @@global.automatic_sp_privileges = VARIABLE_VALUE +SELECT IF(@@global.automatic_sp_privileges, "ON", "OFF") = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='automatic_sp_privileges'; echo 'Bug# 34839: Values in variable and information_schema donot match'; |