diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-16 23:41:28 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-16 23:41:28 +0400 |
| commit | b94fb828472ad63bcde997cec1ddc83bd783428d (patch) | |
| tree | 182b287887217b74ee291b9e344358118e7e88f8 /sql/sql_parse.cc | |
| parent | 7d3cecca0ae25abdc2943e79410a19bdde5fff54 (diff) | |
| parent | de2089264fcafa7f850c73382200ed1d5d91fdef (diff) | |
| download | mariadb-git-b94fb828472ad63bcde997cec1ddc83bd783428d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
mysql-test/t/sp.test:
Auto merged
sql/item.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge.
mysql-test/t/innodb_mysql.test:
Manual merge.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index c679135f858..ae3bc0f5597 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2272,7 +2272,7 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident, DBUG_RETURN(1); #else if (lex->select_lex.db == NULL && - thd->copy_db_to(&lex->select_lex.db, NULL)) + lex->copy_db_to(&lex->select_lex.db, NULL)) { DBUG_RETURN(1); } @@ -6080,8 +6080,9 @@ void mysql_parse(THD *thd, const char *inBuf, uint length, (thd->query_length= (ulong)(lip.found_semicolon - thd->query))) thd->query_length--; /* Actually execute the query */ - mysql_execute_command(thd); - query_cache_end_of_result(thd); + lex->set_trg_event_type_for_tables(); + mysql_execute_command(thd); + query_cache_end_of_result(thd); } } } @@ -6397,7 +6398,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ptr->db= table->db.str; ptr->db_length= table->db.length; } - else if (thd->copy_db_to(&ptr->db, &ptr->db_length)) + else if (lex->copy_db_to(&ptr->db, &ptr->db_length)) DBUG_RETURN(0); ptr->alias= alias_str; |