database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bodhi.netgear:/opt/local/work/tmp_merge

Browse Source 
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
This commit is contained in:
konstantin@bodhi.netgear
2006-07-06 22:55:48 +04:00
parent f22a50a93b e29ea3f2ef
commit 01bc761690
31 changed files with 649 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_trigger.cc
View File

@ -928,8 +928,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
save_db.str= thd->db;
save_db.length= thd->db_length;
thd->db_length= strlen(db);
thd->db= (char *) db;
thd->reset_db((char*) db, strlen(db));
while ((trg_create_str= it++))
{
trg_sql_mode= itm++;
@ -1031,8 +1030,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
lex_end(&lex);
}
thd->db= save_db.str;
thd->db_length= save_db.length;
thd->reset_db(save_db.str, save_db.length);
thd->lex= old_lex;
thd->spcont= save_spcont;
thd->variables.sql_mode= save_sql_mode;
@ -1045,8 +1043,7 @@ err_with_lex_cleanup:
thd->lex= old_lex;
thd->spcont= save_spcont;
thd->variables.sql_mode= save_sql_mode;
thd->db= save_db.str;
thd->db_length= save_db.length;
thd->reset_db(save_db.str, save_db.length);
DBUG_RETURN(1);
}