diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-07-08 23:48:04 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-07-08 23:48:04 +0300 |
| commit | 0e1d651e8b5e479427b89c5e164499a5eda3993d (patch) | |
| tree | cd2587ecaa9e165c577d8a9f6528b48cc488643b /sql/sql_parse.cc | |
| parent | fa936cb6cc6c721c20dac098083be12ba45c7e71 (diff) | |
| parent | e17562b55af10d9415e9dfefe7cba0ade1e49bca (diff) | |
| download | mariadb-git-0e1d651e8b5e479427b89c5e164499a5eda3993d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 00917e296ca..9e670a97e92 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3575,15 +3575,20 @@ mysql_new_select(LEX *lex, bool move_down) void create_select_for_variable(const char *var_name) { + THD *thd; LEX *lex; - LEX_STRING tmp; + LEX_STRING tmp, null_lex_string; DBUG_ENTER("create_select_for_variable"); - lex= current_lex; + + thd= current_thd; + lex= &thd->lex; mysql_init_select(lex); lex->sql_command= SQLCOM_SELECT; tmp.str= (char*) var_name; tmp.length=strlen(var_name); - add_item_to_list(lex->thd, get_system_var(OPT_SESSION, tmp)); + bzero((char*) &null_lex_string.str, sizeof(null_lex_string)); + add_item_to_list(thd, get_system_var(thd, OPT_SESSION, tmp, + null_lex_string)); DBUG_VOID_RETURN; } |