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 bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/opt/local/work/mysql-5.0-runtime


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2006-07-01 22:13:42 +04:00
parent 047e2be28c 697e8d71bb
commit 4c2db1bef1
13 changed files with 169 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@@ -2365,7 +2365,7 @@ static void reset_one_shot_variables(THD *thd)
/*
Execute command saved in thd and current_lex->sql_command
Execute command saved in thd and lex->sql_command
SYNOPSIS
mysql_execute_command()
@@ -5547,7 +5547,7 @@ bool check_stack_overrun(THD *thd, long margin,
bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, ulong *yystacksize)
{
LEX *lex=current_lex;
LEX *lex= current_thd->lex;
ulong old_info=0;
if ((uint) *yystacksize >= MY_YACC_MAX)
return 1;
@@ -5984,7 +5984,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
void store_position_for_column(const char *name)
{
current_lex->last_field->after=my_const_cast(char*) (name);
current_thd->lex->last_field->after=my_const_cast(char*) (name);
}
bool