diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-22 17:06:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-22 17:06:50 +0100 |
| commit | ffa8c4cfcc41d4f160e3bdfca5cfd4b01a7d6e63 (patch) | |
| tree | 728585c36f22a5db3cea796430883d0ebc5c05eb /sql/share | |
| parent | e27c34f9e4ca15c797fcd3191ee5679c2f237a09 (diff) | |
| parent | 52c26f7a1f675185d2ef1a28aca7f9bcc67c6414 (diff) | |
| download | mariadb-git-ffa8c4cfcc41d4f160e3bdfca5cfd4b01a7d6e63.tar.gz | |
Percona-Server-5.6.14-rel62.0 merge
support ha_innodb.so as a dynamic plugin.
* remove obsolete *,innodb_plugin.rdiff files
* s/--plugin-load=/--plugin-load-add=/
* MYSQL_PLUGIN_IMPORT glob_hostname[]
* use my_error instead of push_warning_printf(ER_DEFAULT)
* don't use tdc_size and tc_size in a module
update test cases (XtraDB is 5.6.14, InnoDB is 5.6.10)
* copy new tests over
* disable some tests for (old) InnoDB
* delete XtraDB tests that no longer apply
small compatibility changes:
* s/HTON_EXTENDED_KEYS/HTON_SUPPORTS_EXTENDED_KEYS/
* revert unnecessary InnoDB changes to make it a bit closer to the upstream
fix XtraDB to compile on Windows (both as a static and a dynamic plugin)
disable XtraDB on Windows (deadlocks) and where no atomic ops are available (e.g. CentOS 5)
storage/innobase/handler/ha_innodb.cc:
revert few unnecessary changes to make it a bit closer to the original InnoDB
storage/innobase/include/univ.i:
correct the version to match what it was merged from
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 6a01ffe4ffb..2d061fc314c 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6932,6 +6932,12 @@ ER_ROW_IN_WRONG_PARTITION eng "Found a row in wrong partition %s" swe "Hittade en rad i fel partition %s" +ER_MTS_EVENT_BIGGER_PENDING_JOBS_SIZE_MAX + eng "Cannot schedule event %s, relay-log name %s, position %s to Worker thread because its size %lu exceeds %lu of slave_pending_jobs_size_max." + +ER_INNODB_NO_FT_USES_PARSER + eng "Cannot CREATE FULLTEXT INDEX WITH PARSER on InnoDB table" + # # MariaDB error messages section starts here # |