diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-04-08 09:39:33 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-04-08 09:39:33 +0200 |
| commit | 64e43e1cc88c66bd89f95a5307020bcf60ba4b96 (patch) | |
| tree | 1ae6299d5a75f92fa97b240b0670c81c9a301afe /sql/sql_insert.cc | |
| parent | 8b427b7d5548aeb214c70b004cc9056b9f7a6f7c (diff) | |
| parent | 86008e0ca2b864f1ab7a30e496d7c67c8fce06c2 (diff) | |
| download | mariadb-git-64e43e1cc88c66bd89f95a5307020bcf60ba4b96.tar.gz | |
Merge various replication-related patches into MariaDB 5.3:
- MWL#116 Group commit
- MWL#136 Enhancements for START TRANSACTION WITH CONSISTENT SNAPSHOT
- MWL#47 Annotate_rows_log_event
- MWL#163 innodb_release_locks_early
- Percona patch enhancing row-based replication for tables with no primary key
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index adc82d791b6..05804c2ee7e 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1970,6 +1970,11 @@ bool delayed_get_table(THD *thd, TABLE_LIST *table_list) pthread_mutex_lock(&LOCK_thread_count); thread_count++; pthread_mutex_unlock(&LOCK_thread_count); + /* + Annotating delayed inserts is not supported. + */ + di->thd.variables.binlog_annotate_rows_events= 0; + di->thd.set_db(table_list->db, (uint) strlen(table_list->db)); di->thd.set_query(my_strdup(table_list->table_name, MYF(MY_WME)), 0); if (di->thd.db == NULL || di->thd.query() == NULL) |