database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql.com:/home/psergey/mysql-5.0

Browse Source 
into mysql.com:/home/psergey/10-get-mysql5
This commit is contained in:
sergefp@mysql.com
2003-11-22 00:26:43 +03:00
parent 4f721196f3 6f73baf126
commit c8bc4edc7f
10 changed files with 115 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.cc
View File

@@ -102,7 +102,6 @@ THD::THD():user_time(0), is_fatal_error(0),
query_error= tmp_table_used= 0;
next_insert_id=last_insert_id=0;
open_tables= temporary_tables= handler_tables= derived_tables= 0;
handler_items=0;
tmp_table=0;
lock=locked_tables=0;
used_tables=0;
@@ -1205,7 +1204,7 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
{
my_var *mv= gl++;
if (mv->local)
(void)local_vars.push_back(new Item_splocal(mv->offset));
(void)local_vars.push_back(new Item_splocal(mv->s, mv->offset));
else
{
Item_func_set_user_var *xx = new Item_func_set_user_var(mv->s, item);