diff options
| author |   Brian Evans <grknight@tuffmail.com> | 2014-10-19 15:27:15 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@tuffmail.com> | 2014-10-19 15:27:15 -0400 |
| commit | ad7a16616962a6966c891348ca50395b89884484 (patch) | |
| tree | d07184fc1bdecdf05e4914d437a7453b29cf3aa7 | |
| parent | Fix embedded lib paths for mysql_config in 5.6/10.0 series (diff) | |
| download | mysql-extras-ad7a16616962a6966c891348ca50395b89884484.tar.gz mysql-extras-ad7a16616962a6966c891348ca50395b89884484.tar.bz2 mysql-extras-ad7a16616962a6966c891348ca50395b89884484.zip | |
Fix tokudb unique key false positive wrt bug 525912mysql-extras-20141019-1948Z
| -rw-r--r-- | 00000_index.txt | 8 | ||||
| -rw-r--r-- | 20013_all_mariadb-tokudb-variable.patch | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/00000_index.txt b/00000_index.txt index 0027586..f2f7826 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1747,3 +1747,11 @@ @pn mariadb-galera @@ Fix bad header #error which breaks other builds @@ Gentoo bug 525644 MDEV-6862 + +@patch 20013_all_mariadb-tokudb-variable.patch +@ver 5.05.39.00 to 5.05.99.99 +@ver 10.00.13.00 to 10.00.99.99 +@pn mariadb +@pn mariadb-galera +@@ Fix bad header #error which breaks other builds +@@ Gentoo bug 525192 MDEV-6863 diff --git a/20013_all_mariadb-tokudb-variable.patch b/20013_all_mariadb-tokudb-variable.patch new file mode 100644 index 0000000..7e7298a --- /dev/null +++ b/20013_all_mariadb-tokudb-variable.patch @@ -0,0 +1,12 @@ +diff -urN a/storage/tokudb/ft-index/ft/ft-ops.cc b/storage/tokudb/ft-index/ft/ft-ops.cc +--- a/storage/tokudb/ft-index/ft/ft-ops.cc 2014-09-24 23:29:47.000000000 +0100 ++++ b/storage/tokudb/ft-index/ft/ft-ops.cc 2014-10-12 19:21:39.060499831 +0100 +@@ -2237,7 +2237,7 @@ + nullptr, nullptr, nullptr + ); + *target_childnum = childnum; +- if (r == 0 && !le_latest_is_del(leftmost_le)) { ++ if (r == 0 && !le_latest_is_del(target_le)) { + *nondeleted_key_found = true; + } + } |