diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-27 19:03:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-27 19:03:11 +0200 |
| commit | 078e510e0a75510cd2af8aebe2f300987d10e4d2 (patch) | |
| tree | d1013f8088084d93d26e32d54c4f197b85bfd8aa /storage/tokudb/hatoku_defines.h | |
| parent | 2e914acb7862a49db577adb29a4a1e5712991a29 (diff) | |
| parent | e312e2e636b84ba4d0d64cc5a7bb368d3286c5ed (diff) | |
| download | mariadb-git-078e510e0a75510cd2af8aebe2f300987d10e4d2.tar.gz | |
Merge branch 'merge/merge-tokudb-5.6' into 10.0
Diffstat (limited to 'storage/tokudb/hatoku_defines.h')
| -rw-r--r-- | storage/tokudb/hatoku_defines.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/storage/tokudb/hatoku_defines.h b/storage/tokudb/hatoku_defines.h index 3ff3e537778..a8d4a38e1c3 100644 --- a/storage/tokudb/hatoku_defines.h +++ b/storage/tokudb/hatoku_defines.h @@ -7,7 +7,7 @@ This file is part of TokuDB Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved. - TokuDBis is free software: you can redistribute it and/or modify + TokuDB is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as published by the Free Software Foundation. @@ -233,9 +233,12 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved. // mysql 5.6.15 removed the test macro, so we define our own #define tokudb_test(e) ((e) ? 1 : 0) -inline const char* tokudb_thd_get_proc_info(const THD *thd) { +inline const char* tokudb_thd_get_proc_info(const THD* thd) { return thd->proc_info; } +inline void tokudb_thd_set_proc_info(THD* thd, const char* proc_info) { + thd_proc_info(thd, proc_info); +} // uint3korr reads 4 bytes and valgrind reports an error, so we use this function instead inline uint tokudb_uint3korr(const uchar *a) { |