diff options
| author | unknown <kostja@vajra.(none)> | 2007-05-15 13:56:09 +0400 |
|---|---|---|
| committer | unknown <kostja@vajra.(none)> | 2007-05-15 13:56:09 +0400 |
| commit | 655efae884601372cd9a9d0fe4bee891bb85bb59 (patch) | |
| tree | f03054909cf94cfd088525d7139a12c45aa861cc /sql/item_func.cc | |
| parent | 6e3cff22ca93a0ef96dae442caceaaaef3cdb319 (diff) | |
| parent | d8f13c8cd004eafd08ea72219133adc76be756e2 (diff) | |
| download | mariadb-git-655efae884601372cd9a9d0fe4bee891bb85bb59.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into vajra.(none):/opt/local/work/mysql-5.0-runtime
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.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 c0a9647e382..1bd41cf87a4 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4450,7 +4450,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 */ |