diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 14:06:11 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 14:06:11 -0400 |
| commit | ec91eea8dbae4276ff6e31a0d80c0b523f88ed88 (patch) | |
| tree | 8d1b9adecf56764c4198a42c3df6dbb1096ce49a /sql/handler.cc | |
| parent | e4e55f7968d961e0cb07800397bc3108f960956a (diff) | |
| parent | c722e5f25f1f00b32f9b4b556f07489bda38095a (diff) | |
| download | mariadb-git-ec91eea8dbae4276ff6e31a0d80c0b523f88ed88.tar.gz | |
Local merge of mariadb-5.5.39
bzr merge -r4264 maria/5.5
Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index cd1e03d7879..0c165f6940d 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -546,7 +546,19 @@ int ha_initialize_handlerton(st_plugin_int *plugin) savepoint_alloc_size+= tmp; hton2plugin[hton->slot]=plugin; if (hton->prepare) + { total_ha_2pc++; + if (tc_log && tc_log != get_tc_log_implementation()) + { + total_ha_2pc--; + hton->prepare= 0; + push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_UNKNOWN_ERROR, + "Cannot enable tc-log at run-time. " + "XA features of %s are disabled", + plugin->name.str); + } + } break; } /* fall through */ |