diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-05-02 12:11:25 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-05-02 12:11:25 -0600 |
| commit | 1513cd0933f73356fb9461c343ef8b2c39c1e0a0 (patch) | |
| tree | da0fae22b611c9ddf529095b74ff47c0bcad3400 /sql/item_func.cc | |
| parent | cd66d3dd12d1fd125c7a8bc5c3f2249dbcbab1cb (diff) | |
| parent | d2e8f9010fef50bd4cc2c339aaa46f88528e954c (diff) | |
| download | mariadb-git-1513cd0933f73356fb9461c343ef8b2c39c1e0a0.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 732c4403ca2..840c5afbebd 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4307,7 +4307,7 @@ int get_var_with_binlog(THD *thd, enum_sql_command sql_command, List<set_var_base> tmp_var_list; LEX *sav_lex= thd->lex, lex_tmp; thd->lex= &lex_tmp; - lex_start(thd, NULL, 0); + lex_start(thd); tmp_var_list.push_back(new set_var_user(new Item_func_set_user_var(name, new Item_null()))); /* Create the variable */ |