summaryrefslogtreecommitdiff
path: root/storage/tokudb/ft-index/locktree/keyrange.cc
diff options
context:
space:
mode:
authorJan Lindström <jplindst@mariadb.org>2013-11-25 17:14:08 +0200
committerJan Lindström <jplindst@mariadb.org>2013-11-25 17:14:08 +0200
commit071edcfea05674f86926ee4c5fbf30f97c2ed368 (patch)
treec33fbb7c8bc5d568650226c8d71496a3d47bc10c /storage/tokudb/ft-index/locktree/keyrange.cc
parent4f85baab95f50448930a8c9915f7178aa121e66e (diff)
parent160236f880e92d2872d95ce72aab144f08456bcc (diff)
downloadmariadb-git-071edcfea05674f86926ee4c5fbf30f97c2ed368.tar.gz
Merge with MariaDB 5.5.34.
Diffstat (limited to 'storage/tokudb/ft-index/locktree/keyrange.cc')
-rw-r--r--storage/tokudb/ft-index/locktree/keyrange.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/tokudb/ft-index/locktree/keyrange.cc b/storage/tokudb/ft-index/locktree/keyrange.cc
index 5bd98ea3dba..0bf9790196c 100644
--- a/storage/tokudb/ft-index/locktree/keyrange.cc
+++ b/storage/tokudb/ft-index/locktree/keyrange.cc
@@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE:
PATENT MARKING NOTICE:
This software is covered by US Patent No. 8,185,551.
+ This software is covered by US Patent No. 8,489,638.
PATENT RIGHTS GRANT: