diff options
Diffstat (limited to 'storage')
22 files changed, 46 insertions, 18 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index ac1d0539d19..3d4ec2dbc13 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -2766,8 +2766,8 @@ int ha_connect::info(uint flag) if (flag & HA_STATUS_CONST) { // This is imported from the previous handler and must be reconsidered - stats.max_data_file_length= 4294967295; - stats.max_index_file_length= 4398046510080; + stats.max_data_file_length= 4294967295LL; + stats.max_index_file_length= 4398046510080LL; stats.create_time= 0; data_file_name= xinfo.data_file_name; index_file_name= NULL; @@ -4051,7 +4051,7 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd, TABLE_SHARE *table_s, HA_CREATE_INFO *create_info) { - char v, spc= ',', qch= 0; + char v=0, spc= ',', qch= 0; const char *fncn= "?"; const char *user, *fn, *db, *host, *pwd, *sep, *tbl, *src; const char *col, *ocl, *rnk, *pic, *fcl; @@ -4115,7 +4115,9 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd, cls= GetListOption(g, "class", topt->oplist); #endif // WIN32 port= atoi(GetListOption(g, "port", topt->oplist, "0")); +#if defined(ODBC_SUPPORT) mxr= atoi(GetListOption(g,"maxres", topt->oplist, "0")); +#endif mxe= atoi(GetListOption(g,"maxerr", topt->oplist, "0")); #if defined(PROMPT_OK) cop= atoi(GetListOption(g, "checkdsn", topt->oplist, "0")); diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index d9c6e43ee14..c76c3067d08 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -2096,7 +2096,7 @@ os_file_set_size( fprintf(stderr, "InnoDB: Error: preallocating file " "space for file \'%s\' failed. Current size " "%lu, desired size %lu\n", - name, current_size, size); + name, (long unsigned) current_size, (long unsigned) size); os_file_handle_error_no_exit(name, "posix_fallocate", FALSE); return(FALSE); } diff --git a/storage/maria/ma_open.c b/storage/maria/ma_open.c index eb0dc5f9def..a1d4e215118 100644 --- a/storage/maria/ma_open.c +++ b/storage/maria/ma_open.c @@ -153,8 +153,8 @@ static MARIA_HA *maria_clone_internal(MARIA_SHARE *share, const char *name, info.lock_type= F_WRLCK; _ma_set_data_pagecache_callbacks(&info.dfile, share); - bitmap_init(&info.changed_fields, changed_fields_bitmap, - share->base.fields, 0); + my_bitmap_init(&info.changed_fields, changed_fields_bitmap, + share->base.fields, 0); if ((*share->init)(&info)) goto err; diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt index 74d05873f6f..3f592133969 100644 --- a/storage/oqgraph/CMakeLists.txt +++ b/storage/oqgraph/CMakeLists.txt @@ -3,14 +3,14 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") MESSAGE(STATUS "Configuring OQGraph") FIND_PACKAGE(Boost) IF(NOT Boost_FOUND) - MESSAGE(STATUS "Boost not found") + MESSAGE(STATUS "Boost not found. OQGraph will not be compiled") RETURN() ENDIF() INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS}) FIND_PACKAGE(Judy) IF(NOT Judy_FOUND) - MESSAGE(STATUS "Judy not found") + MESSAGE(STATUS "Judy not found. OQGraph will not be compiled") RETURN() ENDIF() INCLUDE_DIRECTORIES(${Judy_INCLUDE_DIR}) @@ -53,6 +53,7 @@ IF(BOOST_OK) MODULE_ONLY COMPONENT oqgraph-engine LINK_LIBRARIES ${Judy_LIBRARIES}) + MESSAGE(STATUS "OQGraph OK") ELSE(BOOST_OK) - MESSAGE(STATUS "Requisites for OQGraph not met") + MESSAGE(STATUS "Requisites for OQGraph not met. OQGraph will not be compiled") ENDIF(BOOST_OK) diff --git a/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result b/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result index 9aa806eace9..7cb65bc07ea 100644 --- a/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result +++ b/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result @@ -1,6 +1,7 @@ DROP TABLE IF EXISTS graph_base; DROP TABLE IF EXISTS graph; DROP TABLE IF EXISTS graph2; +call mtr.add_suppression("graph_base is open on delete"); CREATE TABLE graph2 ( latch VARCHAR(32) NULL, origid BIGINT UNSIGNED NULL, diff --git a/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test b/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test index 869994aa208..a6dae0e2678 100644 --- a/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test +++ b/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test @@ -4,6 +4,8 @@ DROP TABLE IF EXISTS graph; DROP TABLE IF EXISTS graph2; --enable_warnings +call mtr.add_suppression("graph_base is open on delete"); + CREATE TABLE graph2 ( latch VARCHAR(32) NULL, origid BIGINT UNSIGNED NULL, diff --git a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result index 046c468b768..49639c278d0 100644 --- a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result +++ b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result @@ -1,5 +1,6 @@ DROP TABLE IF EXISTS graph_base; DROP TABLE IF EXISTS graph; +call mtr.add_suppression("graph_base is open on delete"); CREATE TABLE graph_base ( from_id INT UNSIGNED NOT NULL, to_id INT UNSIGNED NOT NULL, diff --git a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test index 8f79b23ed43..cab99ec5018 100644 --- a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test +++ b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test @@ -3,6 +3,8 @@ DROP TABLE IF EXISTS graph_base; DROP TABLE IF EXISTS graph; --enable_warnings +call mtr.add_suppression("graph_base is open on delete"); + # Create the backing store CREATE TABLE graph_base ( from_id INT UNSIGNED NOT NULL, diff --git a/storage/oqgraph/mysql-test/oqgraph/isnull.result b/storage/oqgraph/mysql-test/oqgraph/isnull.result index 38ebf12413c..d9af33222dc 100644 --- a/storage/oqgraph/mysql-test/oqgraph/isnull.result +++ b/storage/oqgraph/mysql-test/oqgraph/isnull.result @@ -38,5 +38,5 @@ NULL 1 NULL 1 1 2 select * from graph where latch is null and destid=2; latch origid destid weight seq linkid NULL NULL 2 1 1 1 -DROP TABLE graph_base; DROP TABLE graph; +DROP TABLE graph_base; diff --git a/storage/oqgraph/mysql-test/oqgraph/isnull.test b/storage/oqgraph/mysql-test/oqgraph/isnull.test index 93105887834..dc7622daa0d 100644 --- a/storage/oqgraph/mysql-test/oqgraph/isnull.test +++ b/storage/oqgraph/mysql-test/oqgraph/isnull.test @@ -34,6 +34,5 @@ select * from graph where latch is null; select * from graph where latch is null and origid=1; select * from graph where latch is null and destid=2; -DROP TABLE graph_base; DROP TABLE graph; - +DROP TABLE graph_base; diff --git a/storage/oqgraph/mysql-test/oqgraph/regression_1233113.result b/storage/oqgraph/mysql-test/oqgraph/regression_1233113.result index 415b2181bbb..2b0ea4b2acb 100644 --- a/storage/oqgraph/mysql-test/oqgraph/regression_1233113.result +++ b/storage/oqgraph/mysql-test/oqgraph/regression_1233113.result @@ -1,5 +1,6 @@ DROP TABLE IF EXISTS graph_base; DROP TABLE IF EXISTS graph; +call mtr.add_suppression("graph_base is open on delete"); CREATE TABLE graph_base ( from_id INT UNSIGNED NOT NULL, to_id INT UNSIGNED NOT NULL, diff --git a/storage/oqgraph/mysql-test/oqgraph/regression_1233113.test b/storage/oqgraph/mysql-test/oqgraph/regression_1233113.test index 26e6656eea5..db53b2b39ae 100644 --- a/storage/oqgraph/mysql-test/oqgraph/regression_1233113.test +++ b/storage/oqgraph/mysql-test/oqgraph/regression_1233113.test @@ -3,6 +3,8 @@ DROP TABLE IF EXISTS graph_base; DROP TABLE IF EXISTS graph; --enable_warnings +call mtr.add_suppression("graph_base is open on delete"); + # Create the backing store CREATE TABLE graph_base ( from_id INT UNSIGNED NOT NULL, diff --git a/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result b/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result index 84902676ef2..cace2c40564 100644 --- a/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result +++ b/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result @@ -1,5 +1,6 @@ DROP TABLE IF EXISTS graph_base; DROP TABLE IF EXISTS graph; +call mtr.add_suppression("graph_base is open on delete"); CREATE TABLE graph_base ( from_id INT UNSIGNED NOT NULL, to_id INT UNSIGNED NOT NULL, diff --git a/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test b/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test index b6f4418112c..673eb867032 100644 --- a/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test +++ b/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test @@ -3,6 +3,8 @@ DROP TABLE IF EXISTS graph_base; DROP TABLE IF EXISTS graph; --enable_warnings +call mtr.add_suppression("graph_base is open on delete"); + # Create the backing store CREATE TABLE graph_base ( from_id INT UNSIGNED NOT NULL, diff --git a/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result index cf70de29376..f67c5bccd6b 100644 --- a/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result +++ b/storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result @@ -182,14 +182,14 @@ a b c d e f 3 30 200 2000 20000 200000 explain select * from t1 where b > 0; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index b b NULL NULL NULL; Using where; Using index +1 SIMPLE t1 index_or_range b b NULL NULL NULL; Using where; Using index_or_range select * from t1 where b > 0; a b c d e f 2 20 100 1000 10000 100000 3 30 200 2000 20000 200000 explain select * from t1 where d > "0"; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index d d NULL NULL NULL; Using where; Using index +1 SIMPLE t1 index_or_range d d NULL NULL NULL; Using where; Using index_or_range select * from t1 where d > "0"; a b c d e f 2 20 100 1000 10000 100000 diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_bin.test b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.test index 6d502a08567..443a378270c 100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_bin.test +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.test @@ -1,3 +1,4 @@ +--source include/big_test.inc # this test is generated by change_bin.py # test binary expansion is hot --disable_warnings diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_char.test b/storage/tokudb/mysql-test/tokudb/t/change_column_char.test index eff3d8428ba..6705dd73aa1 100644 --- a/storage/tokudb/mysql-test/tokudb/t/change_column_char.test +++ b/storage/tokudb/mysql-test/tokudb/t/change_column_char.test @@ -1,3 +1,4 @@ +--source include/big_test.inc # this test is generated by change_char.py # test char expansion --disable_warnings diff --git a/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test index c90994f325a..f5b600e501a 100644 --- a/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test +++ b/storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test @@ -83,10 +83,12 @@ explain select * from t1; select * from t1; --replace_column 7 NULL 9 NULL; +--replace_result index index_or_range range index_or_range explain select * from t1 where b > 0; select * from t1 where b > 0; --replace_column 7 NULL 9 NULL; +--replace_result index index_or_range range index_or_range explain select * from t1 where d > "0"; select * from t1 where d > "0"; diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/r/compression.result b/storage/tokudb/mysql-test/tokudb_mariadb/r/compression.result index f465fe5df65..ea8a0b521b9 100644 --- a/storage/tokudb/mysql-test/tokudb_mariadb/r/compression.result +++ b/storage/tokudb/mysql-test/tokudb_mariadb/r/compression.result @@ -1,3 +1,4 @@ +drop table if exists t1,t2,t3,t4,t5,t6; create table t1 (a text) engine=tokudb compression=tokudb_uncompressed; create table t2 (a text) engine=tokudb compression=tokudb_zlib; create table t3 (a text) engine=tokudb compression=tokudb_quicklz; diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/t/compression.test b/storage/tokudb/mysql-test/tokudb_mariadb/t/compression.test index 1bac772437d..00478aed1c7 100644 --- a/storage/tokudb/mysql-test/tokudb_mariadb/t/compression.test +++ b/storage/tokudb/mysql-test/tokudb_mariadb/t/compression.test @@ -1,3 +1,10 @@ +# +# Initial cleanup from previous tests +# +--disable_warnings +drop table if exists t1,t2,t3,t4,t5,t6; +--enable_warnings + create table t1 (a text) engine=tokudb compression=tokudb_uncompressed; create table t2 (a text) engine=tokudb compression=tokudb_zlib; create table t3 (a text) engine=tokudb compression=tokudb_quicklz; diff --git a/storage/xtradb/btr/btr0btr.cc b/storage/xtradb/btr/btr0btr.cc index 569dcea072a..78f6d661560 100644 --- a/storage/xtradb/btr/btr0btr.cc +++ b/storage/xtradb/btr/btr0btr.cc @@ -805,7 +805,7 @@ btr_height_get( /* S latches the page */ root_block = btr_root_block_get(index, RW_S_LATCH, mtr); - height = btr_page_get_level(buf_block_get_frame(root_block), mtr); + height = btr_page_get_level(buf_block_get_frame_fast(root_block), mtr); /* Release the S latch on the root page. */ mtr_memo_release(mtr, root_block, MTR_MEMO_PAGE_S_FIX); @@ -2746,7 +2746,7 @@ btr_attach_half_pages( } /* Get the level of the split pages */ - level = btr_page_get_level(buf_block_get_frame(block), mtr); + level = btr_page_get_level(buf_block_get_frame_fast(block), mtr); ut_ad(level == btr_page_get_level(buf_block_get_frame(new_block), mtr)); @@ -3970,8 +3970,8 @@ btr_discard_page( /* Decide the page which will inherit the locks */ - left_page_no = btr_page_get_prev(buf_block_get_frame(block), mtr); - right_page_no = btr_page_get_next(buf_block_get_frame(block), mtr); + left_page_no = btr_page_get_prev(buf_block_get_frame_fast(block), mtr); + right_page_no = btr_page_get_next(buf_block_get_frame_fast(block), mtr); if (left_page_no != FIL_NULL) { merge_block = btr_block_get(space, zip_size, left_page_no, diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index c18cab7510e..43a99cafb64 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -1230,6 +1230,7 @@ normalize_table_name_low( ibool set_lower_case); /* in: TRUE if we want to set name to lower case */ +#ifdef NOT_USED /*************************************************************//** Removes old archived transaction log files. @return true on error */ @@ -1255,6 +1256,7 @@ static bool innobase_purge_archive_logs( } return (err != DB_SUCCESS); } +#endif /*************************************************************//** Check for a valid value of innobase_commit_concurrency. |