diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-11-03 14:48:51 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-11-03 14:48:51 +0100 |
| commit | b002509b67860df9f0634709b5fb8a2ab98d130a (patch) | |
| tree | 3c1fb6c45a3a2275efc18e003bae531e81b3395e /sql/share | |
| parent | d665e79c5b8582f44dc280e5e6df4a8ff4945623 (diff) | |
| parent | 56a041cde657e5618c519a3c50e8075136d4a1ce (diff) | |
| download | mariadb-git-b002509b67860df9f0634709b5fb8a2ab98d130a.tar.gz | |
MDEV-11065: Compressed binary log. Merge code into current 10.2.
Conflicts:
sql/share/errmsg-utf8.txt
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index ade788623e3..75eb8931c35 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7237,3 +7237,5 @@ ER_INVALID_DEFAULT_PARAM ukr "Значення за замовчуванням не підтримано для цього випадку використання параьетра" ER_BINLOG_NON_SUPPORTED_BULK eng "Only row based replication supported for bulk operations" +ER_BINLOG_UNCOMPRESS_ERROR + eng "Uncompress the compressed binlog failed" |