Skip to content
Permalink
Browse files

Merge branch '10.1' into 10.2

  • Loading branch information...
Oleksandr Byelkin
Oleksandr Byelkin committed Jul 26, 2019
2 parents cf8c2a3 + 2382cd1 commit 32c6f40a6319d493e5270c72ac5d27dc99d1b242
Showing with 385 additions and 50 deletions.
  1. +2 −2 mysql-test/r/plugin.result
  2. +3 −0 mysql-test/r/plugin_not_embedded.result
  3. +3 −7 mysql-test/t/plugin.test
  4. +9 −0 mysql-test/t/plugin_not_embedded.test
  5. +9 −0 storage/connect/CMakeLists.txt
  6. +1 −1 storage/connect/ha_connect.cc
  7. +12 −12 storage/connect/mysql-test/connect/disabled.def
  8. +14 −0 storage/tokudb/PerconaFT/ft/comparator.h
  9. +2 −0 storage/tokudb/PerconaFT/ft/ft-ops.cc
  10. +14 −0 storage/tokudb/PerconaFT/ft/ft-status.cc
  11. +14 −0 storage/tokudb/PerconaFT/ft/ft-status.h
  12. +1 −0 storage/tokudb/PerconaFT/locktree/keyrange.cc
  13. +1 −0 storage/tokudb/PerconaFT/locktree/keyrange.h
  14. +1 −0 storage/tokudb/PerconaFT/locktree/lock_request.cc
  15. +1 −0 storage/tokudb/PerconaFT/locktree/lock_request.h
  16. +1 −0 storage/tokudb/PerconaFT/locktree/locktree.cc
  17. +1 −0 storage/tokudb/PerconaFT/locktree/locktree.h
  18. +1 −0 storage/tokudb/PerconaFT/locktree/manager.cc
  19. +1 −0 storage/tokudb/PerconaFT/locktree/range_buffer.cc
  20. +1 −0 storage/tokudb/PerconaFT/locktree/range_buffer.h
  21. +1 −0 storage/tokudb/PerconaFT/locktree/treenode.cc
  22. +1 −0 storage/tokudb/PerconaFT/locktree/treenode.h
  23. +1 −0 storage/tokudb/PerconaFT/locktree/txnid_set.cc
  24. +1 −0 storage/tokudb/PerconaFT/locktree/txnid_set.h
  25. +1 −0 storage/tokudb/PerconaFT/locktree/wfg.cc
  26. +1 −0 storage/tokudb/PerconaFT/locktree/wfg.h
  27. +23 −8 storage/tokudb/PerconaFT/portability/memory.cc
  28. +14 −0 storage/tokudb/PerconaFT/portability/memory.h
  29. +2 −0 storage/tokudb/PerconaFT/portability/portability.cc
  30. +14 −0 storage/tokudb/PerconaFT/portability/toku_atomic.h
  31. +46 −0 storage/tokudb/PerconaFT/portability/toku_instrumentation.h
  32. +14 −0 storage/tokudb/PerconaFT/portability/toku_portability.h
  33. +14 −0 storage/tokudb/PerconaFT/portability/toku_pthread.cc
  34. +14 −0 storage/tokudb/PerconaFT/portability/toku_pthread.h
  35. +14 −0 storage/tokudb/PerconaFT/portability/toku_race_tools.h
  36. +14 −0 storage/tokudb/PerconaFT/portability/toku_time.cc
  37. +14 −0 storage/tokudb/PerconaFT/portability/toku_time.h
  38. +14 −0 storage/tokudb/PerconaFT/util/dbt.h
  39. +1 −0 storage/tokudb/PerconaFT/util/growable_array.h
  40. +14 −0 storage/tokudb/PerconaFT/util/memarena.cc
  41. +14 −0 storage/tokudb/PerconaFT/util/memarena.h
  42. +1 −0 storage/tokudb/PerconaFT/util/omt.cc
  43. +1 −0 storage/tokudb/PerconaFT/util/omt.h
  44. +14 −0 storage/tokudb/PerconaFT/util/partitioned_counter.cc
  45. +14 −0 storage/tokudb/PerconaFT/util/partitioned_counter.h
  46. +14 −0 storage/tokudb/PerconaFT/util/status.h
  47. +5 −5 storage/tokudb/mysql-test/tokudb/t/change_column_Makefile
  48. +1 −1 storage/tokudb/mysql-test/tokudb/t/change_column_bin.py
  49. +1 −1 storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py
  50. +1 −1 storage/tokudb/mysql-test/tokudb/t/change_column_char.py
  51. +1 −1 storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py
  52. +1 −1 storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py
  53. +1 −1 storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py
  54. +1 −1 storage/tokudb/mysql-test/tokudb/t/change_column_int.py
  55. +1 −1 storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py
  56. +1 −1 storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py
  57. +1 −1 storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py
  58. +2 −2 storage/tokudb/mysql-test/tokudb/t/fast_update_Makefile
  59. +0 −1 storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_sync_tokudb-master.opt
  60. +0 −1 storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_tokudb-master.opt
  61. +0 −1 storage/tokudb/mysql-test/tokudb_parts/t/partition_special_tokudb-master.opt
@@ -326,8 +326,7 @@ Warnings:
Warning 1300 Invalid utf8 character string: '\xF0\x9D\x8C\x86'
install plugin foo soname 'admin𝌆';
ERROR HY000: No paths allowed for shared library
insert mysql.plugin values ();
delete from mysql.plugin where name = '';
# End of 5.5 test
#
# MDEV-5309 - RENAME TABLE does not check for existence of the table's
# engine
@@ -341,3 +340,4 @@ UNINSTALL PLUGIN example;
RENAME TABLE t1 TO t2;
ERROR 42S02: Table 'test.t1' doesn't exist
DROP TABLE t1;
# End of 10.1 test
@@ -16,3 +16,6 @@ connection default;
DROP USER bug51770@localhost;
INSTALL PLUGIN example SONAME '../ha_example.so';
ERROR HY000: No paths allowed for shared library
insert mysql.plugin values ();
delete from mysql.plugin where name = '';
# End of 5.5 tests
@@ -260,13 +260,7 @@ select convert('admin𝌆' using utf8);
--error ER_UDF_NO_PATHS
install plugin foo soname 'admin𝌆';

#
# Bug#27302459: EMPTY VALUE IN MYSQL.PLUGIN TABLE CAUSES SERVER TO EXIT ON STARTUP
#
insert mysql.plugin values ();
source include/restart_mysqld.inc;
delete from mysql.plugin where name = '';

--echo # End of 5.5 test

--echo #
--echo # MDEV-5309 - RENAME TABLE does not check for existence of the table's
@@ -280,3 +274,5 @@ UNINSTALL PLUGIN example;
--error ER_NO_SUCH_TABLE
RENAME TABLE t1 TO t2;
DROP TABLE t1;

--echo # End of 10.1 test
@@ -30,3 +30,12 @@ let $path = `select CONCAT_WS('/', '..', '$HA_EXAMPLE_SO')`;
--replace_regex /\.dll/.so/
--error ER_UDF_NO_PATHS
eval INSTALL PLUGIN example SONAME '$path';

#
# Bug#27302459: EMPTY VALUE IN MYSQL.PLUGIN TABLE CAUSES SERVER TO EXIT ON STARTUP
#
insert mysql.plugin values ();
source include/restart_mysqld.inc;
delete from mysql.plugin where name = '';

--echo # End of 5.5 tests
@@ -114,6 +114,7 @@ IF(CONNECT_WITH_LIBXML2)
FIND_PACKAGE(LibXml2)
IF (LIBXML2_FOUND)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
SET(ZLIB_LIBRARY "z") # see ZLIB_INCLUDE_DIR below
SET(XML_LIBRARY ${LIBXML2_LIBRARIES})
SET(CONNECT_SOURCES ${CONNECT_SOURCES} libdoc.cpp libdoc.h)
add_definitions(-DLIBXML2_SUPPORT)
@@ -332,6 +333,14 @@ IF(NOT TARGET connect)
RETURN()
ENDIF()

# Don't link with bundled zlib and systel libxml2 at the same time.
# System libxml2 uses system zlib, might conflict with the bundled one.
IF (XML_LIBRARY AND BUILD_BUNDLED_ZLIB)
GET_PROPERTY(INCS TARGET connect PROPERTY INCLUDE_DIRECTORIES)
LIST(REMOVE_ITEM INCS ${ZLIB_INCLUDE_DIR})
SET_PROPERTY(TARGET connect PROPERTY INCLUDE_DIRECTORIES ${INCS})
ENDIF()

IF(WIN32)
IF (libmongoc-1.0_FOUND)
SET_TARGET_PROPERTIES(connect PROPERTIES LINK_FLAGS
@@ -1317,7 +1317,7 @@ char *ha_connect::GetRealString(PCSZ s)
{
char *sv;

if (IsPartitioned() && s && *partname) {
if (IsPartitioned() && s && partname && *partname) {
sv= (char*)PlugSubAlloc(xp->g, NULL, 0);
sprintf(sv, s, partname);
PlugSubAlloc(xp->g, NULL, strlen(sv) + 1);
@@ -9,15 +9,15 @@
# Do not use any TAB characters for whitespace.
#
##############################################################################
infoschema-9739 : Crashes with MariaDB 10.0
jdbc : Variable settings depend on machine configuration
jdbc_new : Variable settings depend on machine configuration
jdbc_oracle : Variable settings depend on machine configuration
jdbc_postgresql : Variable settings depend on machine configuration
json_mongo_c : Need MongoDB running and its C Driver installed
json_java_2 : Need MongoDB running and its Java Driver installed
json_java_3 : Need MongoDB running and its Java Driver installed
mongo_c : Need MongoDB running and its C Driver installed
mongo_java_2 : Need MongoDB running and its Java Driver installed
mongo_java_3 : Need MongoDB running and its Java Driver installed
tbl_thread : Bug MDEV-9844,10179,14214 03/01/2018 OB Option THREAD removed
jdbc : Variable settings depend on machine configuration
jdbc_new : Variable settings depend on machine configuration
jdbc_oracle : Variable settings depend on machine configuration
jdbc_postgresql : Variable settings depend on machine configuration
json_mongo_c : Need MongoDB running and its C Driver installed
json_java_2 : Need MongoDB running and its Java Driver installed
json_java_3 : Need MongoDB running and its Java Driver installed
mongo_c : Need MongoDB running and its C Driver installed
mongo_java_2 : Need MongoDB running and its Java Driver installed
mongo_java_3 : Need MongoDB running and its Java Driver installed
tbl_thread : Bug MDEV-9844,10179,14214 03/01/2018 OB Option THREAD removed
#vcol : Different error code on different versions
@@ -31,6 +31,20 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
You should have received a copy of the GNU Affero General Public License
along with PerconaFT. If not, see <http://www.gnu.org/licenses/>.
----------------------------------------
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -4974,13 +4974,15 @@ int toku_ft_layer_init(void) {

// Portability must be initialized first
r = toku_portability_init();
assert(r==0);
if (r) {
goto exit;
}

toku_pfs_keys_init("fti");

r = db_env_set_toku_product_name("tokudb");
assert(r==0);
if (r) {
goto exit;
}
@@ -32,6 +32,20 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
You should have received a copy of the GNU Affero General Public License
along with PerconaFT. If not, see <http://www.gnu.org/licenses/>.
----------------------------------------
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -32,6 +32,20 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
You should have received a copy of the GNU Affero General Public License
along with PerconaFT. If not, see <http://www.gnu.org/licenses/>.
----------------------------------------
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -45,6 +45,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -32,6 +32,20 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
You should have received a copy of the GNU Affero General Public License
along with PerconaFT. If not, see <http://www.gnu.org/licenses/>.
----------------------------------------
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
======= */

#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
@@ -65,7 +79,7 @@ static realloc_fun_t t_xrealloc = 0;
static LOCAL_MEMORY_STATUS_S status;
int toku_memory_do_stats = 0;

static bool memory_startup_complete;
static bool memory_startup_complete = false;

int
toku_memory_startup(void) {
@@ -83,8 +97,10 @@ toku_memory_startup(void) {
if (success) {
status.mallocator_version = "libc";
status.mmap_threshold = mmap_threshold;
} else
} else {
result = EINVAL;
}
assert(result == 0);
#else
// just a guess
status.mallocator_version = "darwin";
@@ -100,18 +116,17 @@ toku_memory_startup(void) {
if (mallctl_f) { // jemalloc is loaded
size_t version_length = sizeof status.mallocator_version;
result = mallctl_f("version", &status.mallocator_version, &version_length, NULL, 0);
assert(result == 0);
if (result == 0) {
size_t lg_chunk; // log2 of the mmap threshold
size_t lg_chunk_length = sizeof lg_chunk;
result = mallctl_f("opt.lg_chunk", &lg_chunk, &lg_chunk_length, NULL, 0);
if (result)
{
status.mmap_threshold = 1 << 21; // Default value.
// Incompatible jemalloc change.
if (result == 0) {
status.mmap_threshold = 1 << lg_chunk;
} else {
status.mmap_threshold = 1 << 22;
result = 0;
}
else
status.mmap_threshold = 1 << lg_chunk;
}
}

0 comments on commit 32c6f40

Please sign in to comment.
You can’t perform that action at this time.