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 sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1


sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2003-07-13 13:04:59 +03:00
parent 134cc54e80 768ab1e47e
commit 6d7c4021f8
69 changed files with 1783 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_parse.cc
View File

@@ -1290,6 +1290,11 @@ restore_user:
mysql_stmt_free(thd, packet);
break;
}
case COM_RESET_STMT:
{
mysql_stmt_reset(thd, packet);
break;
}
case COM_QUERY:
{
if (alloc_query(thd, packet, packet_length))
@@ -3584,15 +3589,20 @@ mysql_new_select(LEX *lex, bool move_down)
void create_select_for_variable(const char *var_name)
{
THD *thd;
LEX *lex;
LEX_STRING tmp;
LEX_STRING tmp, null_lex_string;
DBUG_ENTER("create_select_for_variable");
lex= current_lex;
thd= current_thd;
lex= &thd->lex;
mysql_init_select(lex);
lex->sql_command= SQLCOM_SELECT;
tmp.str= (char*) var_name;
tmp.length=strlen(var_name);
add_item_to_list(lex->thd, get_system_var(OPT_SESSION, tmp));
bzero((char*) &null_lex_string.str, sizeof(null_lex_string));
add_item_to_list(thd, get_system_var(thd, OPT_SESSION, tmp,
null_lex_string));
DBUG_VOID_RETURN;
}