diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-08-02 15:26:52 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-08-02 15:26:52 +0500 |
| commit | 8b9e7c14db0bde6350e9376869cb45d30762023f (patch) | |
| tree | daf71a35202e5acea176d82d3bf59228e6290506 | |
| parent | c7419debba007918f6317ccf844ae333031fcff5 (diff) | |
| parent | 898333f843b5c750b9863ea94d60ab81a9caca4e (diff) | |
| download | mariadb-git-8b9e7c14db0bde6350e9376869cb45d30762023f.tar.gz | |
Merge mysql.com:/home/ram/work/b30200/b30200.5.0
into mysql.com:/home/ram/work/b30200/b30200.5.1
sql/item_func.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/item_create.cc:
manual merge.
| -rw-r--r-- | sql/item_create.cc | 1 | ||||
| -rw-r--r-- | sql/item_func.cc | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 06996cdaa3b..fa15b992e5c 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -2861,7 +2861,6 @@ Item* Create_func_connection_id::create(THD *thd) { thd->lex->safe_to_cache_query= 0; - thd->thread_specific_used= TRUE; return new (thd->mem_root) Item_func_connection_id(); } diff --git a/sql/item_func.cc b/sql/item_func.cc index 69b55228234..9a26169ad30 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -649,6 +649,7 @@ bool Item_func_connection_id::fix_fields(THD *thd, Item **ref) { if (Item_int_func::fix_fields(thd, ref)) return TRUE; + thd->thread_specific_used= TRUE; value= thd->variables.pseudo_thread_id; return FALSE; } |