diff options
| author | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-19 20:14:35 +0300 |
|---|---|---|
| committer | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-19 20:14:35 +0300 |
| commit | 747328a5664229aa34cc92c2210425130e97ada8 (patch) | |
| tree | 095650183fd0ccdaa33b61c73f3a08954efac80b /sql/item.cc | |
| parent | c62cd144f79f5be6b61f0920f2dedd3c67449239 (diff) | |
| parent | e3719ed02a44b947fbdc47994e588d3c5c533d38 (diff) | |
| download | mariadb-git-747328a5664229aa34cc92c2210425130e97ada8.tar.gz | |
merge
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 9249df16d3d..86fa2d82c41 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -49,7 +49,7 @@ Item::Item(): next= thd->free_list; // Put in free list thd->free_list= this; /* - Item constructor can be called during execution other tnen SQL_COM + Item constructor can be called during execution other then SQL_COM command => we should check thd->lex.current_select on zero (thd->lex can be uninitialised) */ |