summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-11-02 16:38:23 -0800
committerunknown <jimw@mysql.com>2005-11-02 16:38:23 -0800
commitd68354d56703a236e20ea4af1d3a835aa39f1941 (patch)
tree48faba508485cecf3aa4a28ffb873ad3e7a82a51 /sql/sql_yacc.yy
parent2b35ab1245c713cf482dc8534cffc5246d9dde16 (diff)
downloadmariadb-git-d68354d56703a236e20ea4af1d3a835aa39f1941.tar.gz
Fix handling of "SET TRANSACTION ISOLATION LEVEL ...". (Bug #7955)
mysql-test/r/bdb.result: Add results mysql-test/t/bdb.test: Add new test sql/set_var.cc: Refuse attempts to change tx_isolation while a transaction is in progress. sql/set_var.h: Support check function for sys_var_thd_enum sql/share/errmsg.txt: Add new error message sql/sql_yacc.yy: Make sure that lex->option_type always gets set in 'SET TRANSACTION ...'
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 109dcd7e86a..ddcbab97762 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -8002,8 +8002,7 @@ sys_option_value:
| option_type TRANSACTION_SYM ISOLATION LEVEL_SYM isolation_types
{
LEX *lex=Lex;
- if ($1)
- lex->option_type= $1;
+ lex->option_type= $1;
lex->var_list.push_back(new set_var(lex->option_type,
find_sys_var("tx_isolation"),
&null_lex_str,