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

Manual merge from mysql-trunk-merge.

Browse Source
This commit is contained in:
Alexander Nozdrin
2009-11-05 23:28:35 +03:00
parent 06bfaf21f2 85f3e8ce24
commit f620cae974
32 changed files with 187 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_trigger.cc
View File

@ -409,7 +409,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
*/
result= FALSE;
/* Still, we need to log the query ... */
stmt_query.append(thd->query, thd->query_length);
stmt_query.append(thd->query(), thd->query_length());
goto end;
}
}
@ -918,7 +918,7 @@ bool Table_triggers_list::drop_trigger(THD *thd, TABLE_LIST *tables,
List_iterator<LEX_STRING> it_connection_cl_name(connection_cl_names);
List_iterator<LEX_STRING> it_db_cl_name(db_cl_names);
stmt_query->append(thd->query, thd->query_length);
stmt_query->append(thd->query(), thd->query_length());
while ((name= it_name++))
{