Skip to content

Commit 504c6cc

Browse files
committed
Fixed test failures
Added comments Ensure that tokudb test works even if jemalloc is not installed Removed not referenced function Item::remove_fixed() mysql-test/suite/rpl/t/rpl_gtid_reconnect.test: Fixed race condition sql/item.cc: Indentation fix sql/item.h: Removed not used function Added comment sql/sql_select.cc: Fixed indentation storage/tokudb/mysql-test/rpl/include/have_tokudb.opt: Ensure that tokudb test works even if jemalloc is not installed storage/tokudb/mysql-test/tokudb/suite.opt: Ensure that tokudb test works even if jemalloc is not installed storage/tokudb/mysql-test/tokudb_add_index/suite.opt: Ensure that tokudb test works even if jemalloc is not installed storage/tokudb/mysql-test/tokudb_alter_table/suite.opt: Ensure that tokudb test works even if jemalloc is not installed storage/tokudb/mysql-test/tokudb_bugs/suite.opt: Ensure that tokudb test works even if jemalloc is not installed storage/tokudb/mysql-test/tokudb_mariadb/suite.opt: Ensure that tokudb test works even if jemalloc is not installed
1 parent 989dd4d commit 504c6cc

File tree

10 files changed

+13
-12
lines changed

10 files changed

+13
-12
lines changed

mysql-test/suite/rpl/t/rpl_gtid_reconnect.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ INSERT INTO t1 VALUES (20);
144144

145145
--connection server_2
146146
--source include/start_slave.inc
147+
--sync_with_master
147148
SELECT * FROM t1 ORDER BY a;
148149

149150

sql/item.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ void Item::cleanup()
686686
{
687687
DBUG_ENTER("Item::cleanup");
688688
DBUG_PRINT("enter", ("this: %p", this));
689-
fixed=0;
689+
fixed= 0;
690690
marker= 0;
691691
join_tab_idx= MAX_TABLES;
692692
if (orig_name)

sql/item.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,6 @@ class Item {
12401240
virtual bool intro_version(uchar *int_arg) { return 0; }
12411241

12421242
virtual bool remove_dependence_processor(uchar * arg) { return 0; }
1243-
virtual bool remove_fixed(uchar * arg) { fixed= 0; return 0; }
12441243
virtual bool cleanup_processor(uchar *arg);
12451244
virtual bool collect_item_field_processor(uchar * arg) { return 0; }
12461245
virtual bool add_field_to_set_processor(uchar * arg) { return 0; }
@@ -3897,7 +3896,7 @@ class Item_outer_ref :public Item_direct_ref
38973896
{
38983897
ref= &outer_ref;
38993898
set_properties();
3900-
fixed= 0;
3899+
fixed= 0; /* reset flag set in set_properties() */
39013900
}
39023901
Item_outer_ref(Name_resolution_context *context_arg, Item **item,
39033902
const char *table_name_arg, const char *field_name_arg,

sql/sql_select.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21101,7 +21101,7 @@ cp_buffer_from_ref(THD *thd, TABLE *table, TABLE_REF *ref)
2110121101

2110221102
ref_pointer_array and all_fields are updated.
2110321103

21104-
@param[in] thd Pointer to current thread structure
21104+
@param[in] thd Pointer to current thread structure
2110521105
@param[in,out] ref_pointer_array All select, group and order by fields
2110621106
@param[in] tables List of tables to search in (usually
2110721107
FROM clause)
@@ -21147,7 +21147,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
2114721147
order->in_field_list= 1;
2114821148
order->counter= count;
2114921149
order->counter_used= 1;
21150-
return FALSE;
21150+
return FALSE;
2115121151
}
2115221152
/* Lookup the current GROUP/ORDER field in the SELECT clause. */
2115321153
select_item= find_item_in_list(order_item, fields, &counter,
@@ -21215,7 +21215,8 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
2121521215
warning so the user knows that the field from the FROM clause
2121621216
overshadows the column reference from the SELECT list.
2121721217
*/
21218-
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_NON_UNIQ_ERROR,
21218+
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
21219+
ER_NON_UNIQ_ERROR,
2121921220
ER(ER_NON_UNIQ_ERROR),
2122021221
((Item_ident*) order_item)->field_name,
2122121222
current_thd->where);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--loose-tokudb --plugin-load-add=$HA_TOKUDB_SO
1+
--loose-tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--tokudb --plugin-load-add=$HA_TOKUDB_SO
1+
--tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--tokudb --plugin-load-add=$HA_TOKUDB_SO
1+
--tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--tokudb --plugin-load-add=$HA_TOKUDB_SO
1+
--tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--tokudb --plugin-load-add=$HA_TOKUDB_SO
1+
--tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--tokudb --plugin-load-add=$HA_TOKUDB_SO
1+
--tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0

0 commit comments

Comments
 (0)