diff options
| author | unknown <konstantin@mysql.com> | 2006-04-23 04:04:36 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-04-23 04:04:36 +0400 |
| commit | 38c4f0b7692611e9eabbe9d91f576410f0ee98dd (patch) | |
| tree | cf86208cb9610e10d0c11805be4ec6bd4a8d4093 /sql/item_create.cc | |
| parent | a0aea60d0e3ea05b8e4d9f58e6ad1d98203eb175 (diff) | |
| parent | 7069599748259e59353bce21e8b5ae7cd4b8ff44 (diff) | |
| download | mariadb-git-38c4f0b7692611e9eabbe9d91f576410f0ee98dd.tar.gz | |
Merge mysql.com:/opt/local/work/tmp_merge
into mysql.com:/opt/local/work/mysql-5.1-merge
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/mysqld.cc:
Manual merge.
sql/sp_head.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index fb1ef0ee9bc..6eca6209438 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -71,14 +71,8 @@ Item *create_func_ceiling(Item* a) Item *create_func_connection_id(void) { - THD *thd=current_thd; - thd->lex->safe_to_cache_query= 0; - return new Item_static_int_func("connection_id()", - (longlong) - ((thd->slave_thread) ? - thd->variables.pseudo_thread_id : - thd->thread_id), - 10); + current_thd->lex->safe_to_cache_query= 0; + return new Item_func_connection_id(); } Item *create_func_conv(Item* a, Item *b, Item *c) |