diff options
Diffstat (limited to 'storage/tokudb')
26 files changed, 262 insertions, 261 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 91041ec6df4..f4b44c395dd 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -3596,7 +3596,7 @@ cleanup: return error; } -int ha_tokudb::is_val_unique(bool* is_unique, uchar* record, KEY* key_info, uint dict_index, DB_TXN* txn) { +int ha_tokudb::is_val_unique(bool* is_unique, const uchar* record, KEY* key_info, uint dict_index, DB_TXN* txn) { int error = 0; bool has_null; DBC* tmp_cursor = NULL; @@ -4151,7 +4151,7 @@ bool ha_tokudb::key_changed(uint keynr, const uchar * old_row, const uchar * new // 0 on success // error otherwise // -int ha_tokudb::update_row(const uchar * old_row, uchar * new_row) { +int ha_tokudb::update_row(const uchar * old_row, const uchar * new_row) { TOKUDB_HANDLER_DBUG_ENTER(""); DBT prim_key, old_prim_key, prim_row, old_prim_row; int UNINIT_VAR(error); @@ -6819,7 +6819,7 @@ void ha_tokudb::update_create_info(HA_CREATE_INFO* create_info) { // during drop table, we do not attempt to remove already dropped // indexes because we did not keep status.tokudb in sync with list of indexes. // -int ha_tokudb::remove_key_name_from_status(DB* status_block, char* key_name, DB_TXN* txn) { +int ha_tokudb::remove_key_name_from_status(DB* status_block, const char* key_name, DB_TXN* txn) { int error; uchar status_key_info[FN_REFLEN + sizeof(HA_METADATA_KEY)]; HA_METADATA_KEY md_key = hatoku_key_name; @@ -6845,7 +6845,8 @@ int ha_tokudb::remove_key_name_from_status(DB* status_block, char* key_name, DB_ // writes the key name in status.tokudb, so that we may later delete or rename // the dictionary associated with key_name // -int ha_tokudb::write_key_name_to_status(DB* status_block, char* key_name, DB_TXN* txn) { +int ha_tokudb::write_key_name_to_status(DB* status_block, const char* key_name, + DB_TXN* txn) { int error; uchar status_key_info[FN_REFLEN + sizeof(HA_METADATA_KEY)]; HA_METADATA_KEY md_key = hatoku_key_name; @@ -6884,7 +6885,7 @@ void ha_tokudb::trace_create_table_info(const char *name, TABLE * form) { TOKUDB_HANDLER_TRACE( "field:%d:%s:type=%d:flags=%x", i, - field->field_name, + field->field_name.str, field->type(), field->flags); } @@ -6904,7 +6905,7 @@ void ha_tokudb::trace_create_table_info(const char *name, TABLE * form) { i, p, key_part->length, - field->field_name, + field->field_name.str, field->type(), field->flags); } @@ -7254,7 +7255,7 @@ int ha_tokudb::create( "This is probably due to an alter table engine=TokuDB. To load this " "table, do a dump and load", name, - field->field_name + field->field_name.str ); error = HA_ERR_UNSUPPORTED; goto cleanup; diff --git a/storage/tokudb/ha_tokudb.h b/storage/tokudb/ha_tokudb.h index a2fd747bb92..c80be207005 100644 --- a/storage/tokudb/ha_tokudb.h +++ b/storage/tokudb/ha_tokudb.h @@ -681,8 +681,8 @@ private: int remove_metadata(DB* db, void* key_data, uint key_size, DB_TXN* transaction); int update_max_auto_inc(DB* db, ulonglong val); - int remove_key_name_from_status(DB* status_block, char* key_name, DB_TXN* txn); - int write_key_name_to_status(DB* status_block, char* key_name, DB_TXN* txn); + int remove_key_name_from_status(DB* status_block, const char* key_name, DB_TXN* txn); + int write_key_name_to_status(DB* status_block, const char* key_name, DB_TXN* txn); int write_auto_inc_create(DB* db, ulonglong val, DB_TXN* txn); void init_auto_increment(); bool can_replace_into_be_fast(TABLE_SHARE* table_share, KEY_AND_COL_INFO* kc_info, uint pk); @@ -708,7 +708,7 @@ private: int create_main_dictionary(const char* name, TABLE* form, DB_TXN* txn, KEY_AND_COL_INFO* kc_info, toku_compression_method compression_method); void trace_create_table_info(const char *name, TABLE * form); int is_index_unique(bool* is_unique, DB_TXN* txn, DB* db, KEY* key_info, int lock_flags); - int is_val_unique(bool* is_unique, uchar* record, KEY* key_info, uint dict_index, DB_TXN* txn); + int is_val_unique(bool* is_unique, const uchar* record, KEY* key_info, uint dict_index, DB_TXN* txn); int do_uniqueness_checks(uchar* record, DB_TXN* txn, THD* thd); void set_main_dict_put_flags(THD* thd, bool opt_eligible, uint32_t* put_flags); int insert_row_to_main_dictionary(uchar* record, DBT* pk_key, DBT* pk_val, DB_TXN* txn); @@ -792,7 +792,7 @@ public: int optimize(THD * thd, HA_CHECK_OPT * check_opt); int analyze(THD * thd, HA_CHECK_OPT * check_opt); int write_row(uchar * buf); - int update_row(const uchar * old_data, uchar * new_data); + int update_row(const uchar * old_data, const uchar * new_data); int delete_row(const uchar * buf); #if MYSQL_VERSION_ID >= 100000 void start_bulk_insert(ha_rows rows, uint flags); diff --git a/storage/tokudb/ha_tokudb_alter_56.cc b/storage/tokudb/ha_tokudb_alter_56.cc index ba1afbf091a..b4eccf17b57 100644 --- a/storage/tokudb/ha_tokudb_alter_56.cc +++ b/storage/tokudb/ha_tokudb_alter_56.cc @@ -113,7 +113,7 @@ void ha_tokudb::print_alter_info( TOKUDB_TRACE( "name: %s, types: %u %u, nullable: %d, null_offset: %d, is_null_field: " "%d, is_null %d, pack_length %u", - curr_field->field_name, + curr_field->field_name.str, curr_field->real_type(), mysql_to_toku_type(curr_field), curr_field->null_bit, @@ -132,7 +132,7 @@ void ha_tokudb::print_alter_info( TOKUDB_TRACE( "name: %s, types: %u %u, nullable: %d, null_offset: %d, " "is_null_field: %d, is_null %d, pack_length %u", - curr_field->field_name, + curr_field->field_name.str, curr_field->real_type(), mysql_to_toku_type(curr_field), curr_field->null_bit, @@ -398,7 +398,7 @@ enum_alter_inplace_result ha_tokudb::check_if_supported_inplace_alter( TOKUDB_TRACE( "Added column: index %d, name %s", curr_added_index, - curr_added_field->field_name); + curr_added_field->field_name.str); } } result = HA_ALTER_INPLACE_EXCLUSIVE_LOCK; @@ -427,7 +427,7 @@ enum_alter_inplace_result ha_tokudb::check_if_supported_inplace_alter( TOKUDB_TRACE( "Dropped column: index %d, name %s", curr_dropped_index, - curr_dropped_field->field_name); + curr_dropped_field->field_name.str); } } result = HA_ALTER_INPLACE_EXCLUSIVE_LOCK; @@ -1125,7 +1125,7 @@ int ha_tokudb::alter_table_expand_varchar_offsets( static bool field_in_key(KEY *key, Field *field) { for (uint i = 0; i < key->user_defined_key_parts; i++) { KEY_PART_INFO *key_part = &key->key_part[i]; - if (strcmp(key_part->field->field_name, field->field_name) == 0) + if (strcmp(key_part->field->field_name.str, field->field_name.str) == 0) return true; } return false; diff --git a/storage/tokudb/ha_tokudb_alter_common.cc b/storage/tokudb/ha_tokudb_alter_common.cc index d41a676de1f..17f9a4daa39 100644 --- a/storage/tokudb/ha_tokudb_alter_common.cc +++ b/storage/tokudb/ha_tokudb_alter_common.cc @@ -697,8 +697,8 @@ static int find_changed_columns( sql_print_error( "Two fields that were supposedly the same are not: %s in " "original, %s in new", - curr_field_in_orig->field_name, - curr_field_in_new->field_name); + curr_field_in_orig->field_name.str, + curr_field_in_new->field_name.str); retval = 1; goto cleanup; } diff --git a/storage/tokudb/ha_tokudb_update.cc b/storage/tokudb/ha_tokudb_update.cc index 9fe5e729ec4..2e56d4c6698 100644 --- a/storage/tokudb/ha_tokudb_update.cc +++ b/storage/tokudb/ha_tokudb_update.cc @@ -91,7 +91,7 @@ static void dump_item(Item* item) { ":field=%s.%s.%s", field_item->db_name, field_item->table_name, - field_item->field_name); + field_item->field_name.str); break; } case Item::COND_ITEM: { @@ -141,7 +141,7 @@ static Field* find_field_by_name(TABLE* table, Item* item) { Field *found_field = NULL; for (uint i = 0; i < table->s->fields; i++) { Field *test_field = table->s->field[i]; - if (strcmp(field_item->field_name, test_field->field_name) == 0) { + if (strcmp(field_item->field_name.str, test_field->field_name.str) == 0) { found_field = test_field; break; } @@ -290,7 +290,7 @@ static bool check_insert_value(Item* item, const char* field_name) { if (value_item->arg->type() != Item::FIELD_ITEM) return false; Item_field* arg = static_cast<Item_field*>(value_item->arg); - if (strcmp(field_name, arg->field_name) != 0) + if (strcmp(field_name, arg->field_name.str) != 0) return false; return true; } @@ -315,7 +315,7 @@ static bool check_x_op_constant( if (arguments[0]->type() != Item::FIELD_ITEM) return false; Item_field* arg0 = static_cast<Item_field*>(arguments[0]); - if (strcmp(field_name, arg0->field_name) != 0) + if (strcmp(field_name, arg0->field_name.str) != 0) return false; if (!check_int_result(arguments[1])) if (!(allow_insert_value && @@ -359,11 +359,11 @@ static bool check_decr_floor_expression(Field* lhs_field, Item* item) { uint n = item_func->argument_count(); if (n != 3) return false; - if (!check_x_equal_0(lhs_field->field_name, arguments[0])) + if (!check_x_equal_0(lhs_field->field_name.str, arguments[0])) return false; if (arguments[1]->type() != Item::INT_ITEM || arguments[1]->val_int() != 0) return false; - if (!check_x_minus_1(lhs_field->field_name, arguments[2])) + if (!check_x_minus_1(lhs_field->field_name.str, arguments[2])) return false; if (!(lhs_field->flags & UNSIGNED_FLAG)) return false; @@ -394,14 +394,14 @@ static bool check_update_expression( return true; Item* item_constant; if (check_x_op_constant( - lhs_field->field_name, + lhs_field->field_name.str, rhs_item, "+", &item_constant, allow_insert_value)) return true; if (check_x_op_constant( - lhs_field->field_name, + lhs_field->field_name.str, rhs_item, "-", &item_constant, @@ -455,7 +455,7 @@ static bool full_field_in_key(TABLE* table, Field* field) { KEY* key = &table->s->key_info[table->s->primary_key]; for (uint i = 0; i < key->user_defined_key_parts; i++) { KEY_PART_INFO* key_part = &key->key_part[i]; - if (strcmp(field->field_name, key_part->field->field_name) == 0) { + if (strcmp(field->field_name.str, key_part->field->field_name.str) == 0) { return key_part->length == field->field_length; } } diff --git a/storage/tokudb/hatoku_cmp.cc b/storage/tokudb/hatoku_cmp.cc index a8932f78ef8..05a4b2da8c7 100644 --- a/storage/tokudb/hatoku_cmp.cc +++ b/storage/tokudb/hatoku_cmp.cc @@ -3032,7 +3032,7 @@ static uint32_t pack_key_from_desc( } static bool fields_have_same_name(Field* a, Field* b) { - return strcmp(a->field_name, b->field_name) == 0; + return strcmp(a->field_name.str, b->field_name.str) == 0; } static bool fields_are_same_type(Field* a, Field* b) { diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc index 75f4a5a70f0..cee8575eebb 100644 --- a/storage/tokudb/hatoku_hton.cc +++ b/storage/tokudb/hatoku_hton.cc @@ -112,7 +112,7 @@ static int tokudb_discover3( THD* thd, const char* db, const char* name, - char* path, + const char* path, uchar** frmblob, size_t* frmlen); handlerton* tokudb_hton; @@ -1236,7 +1236,7 @@ static int tokudb_discover3( THD* thd, const char* db, const char* name, - char* path, + const char* path, uchar** frmblob, size_t* frmlen) { diff --git a/storage/tokudb/mysql-test/tokudb/r/ext_key_1_innodb.result b/storage/tokudb/mysql-test/tokudb/r/ext_key_1_innodb.result index e61dccc6868..16b3571db9f 100644 --- a/storage/tokudb/mysql-test/tokudb/r/ext_key_1_innodb.result +++ b/storage/tokudb/mysql-test/tokudb/r/ext_key_1_innodb.result @@ -1,7 +1,7 @@ drop table if exists t; select @@optimizer_switch; @@optimizer_switch -index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_grouping_derived=on create table t (id int not null, x int not null, y int not null, primary key(id), key(x)) engine=innodb; insert into t values (0,0,0),(1,1,1),(2,2,2),(3,2,3),(4,2,4); explain select x,id from t force index (x) where x=0 and id=0; diff --git a/storage/tokudb/mysql-test/tokudb/r/ext_key_1_tokudb.result b/storage/tokudb/mysql-test/tokudb/r/ext_key_1_tokudb.result index 9a54bedb02f..961504412a9 100644 --- a/storage/tokudb/mysql-test/tokudb/r/ext_key_1_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb/r/ext_key_1_tokudb.result @@ -1,7 +1,7 @@ drop table if exists t; select @@optimizer_switch; @@optimizer_switch -index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_grouping_derived=on create table t (id int not null, x int not null, y int not null, primary key(id), key(x)) engine=tokudb; insert into t values (0,0,0),(1,1,1),(2,2,2),(3,2,3),(4,2,4); explain select x,id from t force index (x) where x=0 and id=0; diff --git a/storage/tokudb/mysql-test/tokudb/r/ext_key_2_innodb.result b/storage/tokudb/mysql-test/tokudb/r/ext_key_2_innodb.result index 7c0c0a67623..e5796f7a9b1 100644 --- a/storage/tokudb/mysql-test/tokudb/r/ext_key_2_innodb.result +++ b/storage/tokudb/mysql-test/tokudb/r/ext_key_2_innodb.result @@ -1,7 +1,7 @@ drop table if exists t; select @@optimizer_switch; @@optimizer_switch -index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_grouping_derived=on create table t (a int not null, b int not null, c int not null, d int not null, primary key(a,b), key(c,a)) engine=innodb; insert into t values (0,0,0,0),(0,1,0,1); explain select c,a,b from t where c=0 and a=0 and b=1; diff --git a/storage/tokudb/mysql-test/tokudb/r/ext_key_2_tokudb.result b/storage/tokudb/mysql-test/tokudb/r/ext_key_2_tokudb.result index 09143707718..3f1ed9971c3 100644 --- a/storage/tokudb/mysql-test/tokudb/r/ext_key_2_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb/r/ext_key_2_tokudb.result @@ -1,7 +1,7 @@ drop table if exists t; select @@optimizer_switch; @@optimizer_switch -index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_grouping_derived=on create table t (a int not null, b int not null, c int not null, d int not null, primary key(a,b), key(c,a)) engine=tokudb; insert into t values (0,0,0,0),(0,1,0,1); explain select c,a,b from t where c=0 and a=0 and b=1; diff --git a/storage/tokudb/mysql-test/tokudb/r/type_float.result b/storage/tokudb/mysql-test/tokudb/r/type_float.result index 6387cea5384..f8ce24f08c4 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_float.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_float.result @@ -233,12 +233,12 @@ insert into t2 values ("1.23456780"); create table t3 select * from t2 union select * from t1; select * from t3; d -1.2345678 -100000000 +1.234567800 +100000000.000000000 show create table t3; Table Create Table t3 CREATE TABLE `t3` ( - `d` double DEFAULT NULL + `d` double(18,9) DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 drop table t1, t2, t3; create table t1 select 105213674794682365.00 + 0.0 x; diff --git a/storage/tokudb/mysql-test/tokudb/r/type_ranges.result b/storage/tokudb/mysql-test/tokudb/r/type_ranges.result index 1c9cd769a14..38252e870df 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_ranges.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_ranges.result @@ -273,7 +273,7 @@ drop table t2; create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1; show full columns from t2; Field Type Collation Null Key Default Extra Privileges Comment -auto int(11) unsigned NULL NO PRI NULL # +auto bigint(11) unsigned NULL NO PRI NULL # t1 int(1) NULL NO NULL # t2 varchar(1) latin1_swedish_ci NO NULL # t3 varchar(256) latin1_swedish_ci NO NULL # diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result index dff746fa280..1a09412ea08 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result @@ -17,7 +17,7 @@ flush logs;; connection conn1; select DB, command, state, info from information_schema.processlist where id != connection_id(); DB command state info -test Query init flush logs +test Query Init flush logs set tokudb_checkpoint_lock=0; connection default; disconnect conn1; diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result index 6bb98671feb..3ffeaa8abe1 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/part_supported_sql_func_tokudb.result @@ -2318,7 +2318,7 @@ t55 CREATE TABLE `t55` ( `col1` int(11) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 PARTITION BY LIST (`colint`) -SUBPARTITION BY HASH (`col1` % 10) +SUBPARTITION BY HASH (`col1` MOD 10) SUBPARTITIONS 5 (PARTITION `p0` VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = TokuDB, PARTITION `p1` VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result index 3d944dccdb1..410e6fd0ba2 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_2_tokudb.result @@ -1067,7 +1067,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -3084,7 +3084,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3592,7 +3592,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -5081,7 +5081,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -7098,7 +7098,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7606,7 +7606,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -9128,7 +9128,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -11209,7 +11209,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11733,7 +11733,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -13270,7 +13270,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -15351,7 +15351,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15875,7 +15875,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -17384,7 +17384,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -19405,7 +19405,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19914,7 +19914,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -21406,7 +21406,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -23427,7 +23427,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -23936,7 +23936,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -25428,7 +25428,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -27449,7 +27449,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -27958,7 +27958,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result index 7ad3d72441c..093dbbe11c5 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_1_tokudb.result @@ -1385,7 +1385,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -3404,7 +3404,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3912,7 +3912,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -5401,7 +5401,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -7420,7 +7420,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7928,7 +7928,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -9450,7 +9450,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -11533,7 +11533,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -12057,7 +12057,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -13594,7 +13594,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -15677,7 +15677,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -16201,7 +16201,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result index 9f53437fdf7..a05ce5cb71b 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter1_2_tokudb.result @@ -961,7 +961,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2772,7 +2772,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3228,7 +3228,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4561,7 +4561,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6372,7 +6372,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -6828,7 +6828,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8193,7 +8193,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10068,7 +10068,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -10540,7 +10540,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -11893,7 +11893,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -13702,7 +13702,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -14158,7 +14158,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -15491,7 +15491,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -17300,7 +17300,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -17756,7 +17756,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -19122,7 +19122,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -20995,7 +20995,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -21467,7 +21467,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -22848,7 +22848,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -24721,7 +24721,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -25193,7 +25193,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -26543,7 +26543,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -28352,7 +28352,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -28808,7 +28808,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -30141,7 +30141,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -31950,7 +31950,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -32406,7 +32406,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -33771,7 +33771,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -35644,7 +35644,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -36116,7 +36116,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result index d994f5f2654..a398ac33f42 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_1_tokudb.result @@ -994,7 +994,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2869,7 +2869,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3341,7 +3341,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4800,7 +4800,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6827,7 +6827,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7337,7 +7337,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8832,7 +8832,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10859,7 +10859,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11369,7 +11369,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -12893,7 +12893,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -14976,7 +14976,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15500,7 +15500,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -17037,7 +17037,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -19120,7 +19120,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19644,7 +19644,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result index f8c7eadb44c..60cc765a570 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_1_2_tokudb.result @@ -990,7 +990,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2863,7 +2863,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3335,7 +3335,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4796,7 +4796,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6825,7 +6825,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7336,7 +7336,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8834,7 +8834,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10863,7 +10863,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11374,7 +11374,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -12899,7 +12899,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -14980,7 +14980,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15504,7 +15504,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -17041,7 +17041,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -19122,7 +19122,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19646,7 +19646,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result index 1a4d1210a23..0b5d8289ecc 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_1_tokudb.result @@ -998,7 +998,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2877,7 +2877,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3351,7 +3351,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4815,7 +4815,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6846,7 +6846,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7358,7 +7358,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8859,7 +8859,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10890,7 +10890,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11402,7 +11402,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -12932,7 +12932,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -15019,7 +15019,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15545,7 +15545,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -17088,7 +17088,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -19175,7 +19175,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19701,7 +19701,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result index 36be0936c09..67bae3acecb 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter2_2_2_tokudb.result @@ -995,7 +995,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2886,7 +2886,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3361,7 +3361,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4831,7 +4831,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6878,7 +6878,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7392,7 +7392,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8899,7 +8899,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10946,7 +10946,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11460,7 +11460,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, PRIMARY KEY (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -12994,7 +12994,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -15093,7 +15093,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15620,7 +15620,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -17166,7 +17166,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -19265,7 +19265,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19792,7 +19792,7 @@ t1 CREATE TABLE `t1` ( `f_charbig` varchar(1000) DEFAULT NULL, UNIQUE KEY `uidx` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result index 3409f1d380e..808f646dd48 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_alter4_tokudb.result @@ -1004,7 +1004,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2887,7 +2887,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3361,7 +3361,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -4754,7 +4754,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6637,7 +6637,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7111,7 +7111,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -8504,7 +8504,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10387,7 +10387,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -10861,7 +10861,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -12254,7 +12254,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -14137,7 +14137,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -14611,7 +14611,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -16004,7 +16004,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -17887,7 +17887,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -18361,7 +18361,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -19757,7 +19757,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -21640,7 +21640,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -22114,7 +22114,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -23507,7 +23507,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -25390,7 +25390,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -25864,7 +25864,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -27257,7 +27257,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -29140,7 +29140,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -29614,7 +29614,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -31007,7 +31007,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -32890,7 +32890,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -33364,7 +33364,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -34757,7 +34757,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -36640,7 +36640,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -37114,7 +37114,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -38513,7 +38513,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -40400,7 +40400,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -40875,7 +40875,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -42271,7 +42271,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -44158,7 +44158,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -44633,7 +44633,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -46026,7 +46026,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -47909,7 +47909,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -48383,7 +48383,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -49776,7 +49776,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -51659,7 +51659,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -52133,7 +52133,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -53529,7 +53529,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -55416,7 +55416,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -55891,7 +55891,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -57281,7 +57281,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -59156,7 +59156,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -59628,7 +59628,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -61015,7 +61015,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -62890,7 +62890,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -63362,7 +63362,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -65069,7 +65069,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -66944,7 +66944,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -67416,7 +67416,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -68812,7 +68812,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -70695,7 +70695,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -71169,7 +71169,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -72562,7 +72562,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -74445,7 +74445,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -74919,7 +74919,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -76312,7 +76312,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -78195,7 +78195,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -78669,7 +78669,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -80062,7 +80062,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -81945,7 +81945,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -82419,7 +82419,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, @@ -83812,7 +83812,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -85695,7 +85695,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part_1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -86169,7 +86169,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part_1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result index fca6cbe169e..ae20097fdda 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_basic_tokudb.result @@ -991,7 +991,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -2866,7 +2866,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -3337,7 +3337,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -4716,7 +4716,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -6585,7 +6585,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -7056,7 +7056,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -8515,7 +8515,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -10538,7 +10538,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -11046,7 +11046,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -12535,7 +12535,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -14558,7 +14558,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -15066,7 +15066,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -16587,7 +16587,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 4) + PARTITION BY LIST (`f_int1` MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -18674,7 +18674,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int1` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -19198,7 +19198,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int1`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -20708,7 +20708,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -22725,7 +22725,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -23233,7 +23233,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int2`,`f_int1`), UNIQUE KEY `uidx1` (`f_int1`,`f_int2`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -24722,7 +24722,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -26739,7 +26739,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -27247,7 +27247,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`f_int1`,`f_int2`), UNIQUE KEY `uidx1` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, @@ -28768,7 +28768,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST ((`f_int1` + `f_int2`) % 4) + PARTITION BY LIST ((`f_int1` + `f_int2`) MOD 4) (PARTITION `part_3` VALUES IN (-3) ENGINE = TokuDB, PARTITION `part_2` VALUES IN (-2) ENGINE = TokuDB, PARTITION `part_1` VALUES IN (-1) ENGINE = TokuDB, @@ -30849,7 +30849,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 3)) + PARTITION BY LIST (abs(`f_int1` MOD 3)) SUBPARTITION BY HASH (`f_int2` + 1) (PARTITION `part1` VALUES IN (0) (SUBPARTITION `sp11` ENGINE = TokuDB, @@ -31373,7 +31373,7 @@ t1 CREATE TABLE `t1` ( UNIQUE KEY `uidx1` (`f_int1`,`f_int2`), UNIQUE KEY `uidx2` (`f_int2`,`f_int1`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (abs(`f_int1` % 2)) + PARTITION BY LIST (abs(`f_int1` MOD 2)) SUBPARTITION BY KEY (`f_int2`) SUBPARTITIONS 3 (PARTITION `part1` VALUES IN (0) ENGINE = TokuDB, diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result index c84b4601332..1a4bf02cc7c 100644 --- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result +++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result @@ -658,7 +658,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 2) + PARTITION BY LIST (`f_int1` MOD 2) (PARTITION `part1` VALUES IN (NULL) ENGINE = TokuDB, PARTITION `part3` VALUES IN (1) ENGINE = TokuDB) @@ -685,7 +685,7 @@ t1 CREATE TABLE `t1` ( `f_char2` char(20) DEFAULT NULL, `f_charbig` varchar(1000) DEFAULT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 - PARTITION BY LIST (`f_int1` % 2) + PARTITION BY LIST (`f_int1` MOD 2) (PARTITION `part1` VALUES IN (NULL) ENGINE = TokuDB, PARTITION `part2` VALUES IN (0) ENGINE = TokuDB, PARTITION `part3` VALUES IN (1) ENGINE = TokuDB) diff --git a/storage/tokudb/tokudb_dir_cmd.cc b/storage/tokudb/tokudb_dir_cmd.cc index f9995302d49..5431cbab7aa 100644 --- a/storage/tokudb/tokudb_dir_cmd.cc +++ b/storage/tokudb/tokudb_dir_cmd.cc @@ -42,14 +42,14 @@ static int MDL_and_TDC(THD *thd, const char *table, const dir_cmd_callbacks &cb) { int error; - LEX_STRING db_arg; - LEX_STRING table_arg; + LEX_CSTRING db_arg; + LEX_CSTRING table_arg; db_arg.str = const_cast<char *>(db); db_arg.length = strlen(db);; table_arg.str = const_cast<char *>(table); table_arg.length = strlen(table); - Table_ident table_ident(thd, db_arg, table_arg, true);; + Table_ident table_ident(thd, &db_arg, &table_arg, true);; thd->lex->select_lex.add_table_to_list( thd, &table_ident, NULL, 1, TL_UNLOCK, MDL_EXCLUSIVE, 0, 0, 0); /* The lock will be released at the end of mysq_execute_command() */ |