mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/ram/work/b30200/b30200.5.0

Browse source 
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.
This commit is contained in:
unknown 2007-08-02 15:26:52 +05:00
commit 8b9e7c14db
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sql/item_create.cc
View file

@ -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();
}

1
sql/item_func.cc
View file

@ -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;
}