mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed test failures

Browse source 
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
This commit is contained in:
Michael Widenius 2014-09-22 23:25:56 +03:00
parent 989dd4d9ec
commit 504c6cccd7
10 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/rpl/t/rpl_gtid_reconnect.test
View file

@ -144,6 +144,7 @@ INSERT INTO t1 VALUES (20);
--connection server_2 --connection server_2
--source include/start_slave.inc --source include/start_slave.inc
--sync_with_master
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;

2
sql/item.cc
View file

@ -686,7 +686,7 @@ void Item::cleanup()
{ {
DBUG_ENTER("Item::cleanup"); DBUG_ENTER("Item::cleanup");
DBUG_PRINT("enter", ("this: %p", this)); DBUG_PRINT("enter", ("this: %p", this));
fixed=0; fixed= 0;
marker= 0; marker= 0;
join_tab_idx= MAX_TABLES; join_tab_idx= MAX_TABLES;
if (orig_name) if (orig_name)

3
sql/item.h
View file

@ -1240,7 +1240,6 @@ public:
virtual bool intro_version(uchar *int_arg) { return 0; } virtual bool intro_version(uchar *int_arg) { return 0; }
virtual bool remove_dependence_processor(uchar * arg) { return 0; } virtual bool remove_dependence_processor(uchar * arg) { return 0; }
virtual bool remove_fixed(uchar * arg) { fixed= 0; return 0; }
virtual bool cleanup_processor(uchar *arg); virtual bool cleanup_processor(uchar *arg);
virtual bool collect_item_field_processor(uchar * arg) { return 0; } virtual bool collect_item_field_processor(uchar * arg) { return 0; }
virtual bool add_field_to_set_processor(uchar * arg) { return 0; } virtual bool add_field_to_set_processor(uchar * arg) { return 0; }
@ -3897,7 +3896,7 @@ public:
{ {
ref= &outer_ref; ref= &outer_ref;
set_properties(); set_properties();
fixed= 0; fixed= 0; /* reset flag set in set_properties() */
} }
Item_outer_ref(Name_resolution_context *context_arg, Item **item, Item_outer_ref(Name_resolution_context *context_arg, Item **item,
const char *table_name_arg, const char *field_name_arg, const char *table_name_arg, const char *field_name_arg,

7
sql/sql_select.cc
View file

@ -21101,7 +21101,7 @@ cp_buffer_from_ref(THD *thd, TABLE *table, TABLE_REF *ref)
ref_pointer_array and all_fields are updated. ref_pointer_array and all_fields are updated.
@param[in] thd Pointer to current thread structure @param[in] thd Pointer to current thread structure
@param[in,out] ref_pointer_array All select, group and order by fields @param[in,out] ref_pointer_array All select, group and order by fields
@param[in] tables List of tables to search in (usually @param[in] tables List of tables to search in (usually
FROM clause) FROM clause)
@ -21147,7 +21147,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
order->in_field_list= 1; order->in_field_list= 1;
order->counter= count; order->counter= count;
order->counter_used= 1; order->counter_used= 1;
return FALSE; return FALSE;
} }
/* Lookup the current GROUP/ORDER field in the SELECT clause. */ /* Lookup the current GROUP/ORDER field in the SELECT clause. */
select_item= find_item_in_list(order_item, fields, &counter, 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,
warning so the user knows that the field from the FROM clause warning so the user knows that the field from the FROM clause
overshadows the column reference from the SELECT list. overshadows the column reference from the SELECT list.
*/ */
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_NON_UNIQ_ERROR, push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
ER_NON_UNIQ_ERROR,
ER(ER_NON_UNIQ_ERROR), ER(ER_NON_UNIQ_ERROR),
((Item_ident*) order_item)->field_name, ((Item_ident*) order_item)->field_name,
current_thd->where); current_thd->where);

2
storage/tokudb/mysql-test/rpl/include/have_tokudb.opt
View file

@ -1 +1 @@
--loose-tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0

2
storage/tokudb/mysql-test/tokudb/suite.opt
View file

@ -1 +1 @@
--tokudb --plugin-load-add=$HA_TOKUDB_SO --tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0

2
storage/tokudb/mysql-test/tokudb_add_index/suite.opt
View file

@ -1 +1 @@
--tokudb --plugin-load-add=$HA_TOKUDB_SO --tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0

2
storage/tokudb/mysql-test/tokudb_alter_table/suite.opt
View file

@ -1 +1 @@
--tokudb --plugin-load-add=$HA_TOKUDB_SO --tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0

2
storage/tokudb/mysql-test/tokudb_bugs/suite.opt
View file

@ -1 +1 @@
--tokudb --plugin-load-add=$HA_TOKUDB_SO --tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0

2
storage/tokudb/mysql-test/tokudb_mariadb/suite.opt
View file

@ -1 +1 @@
--tokudb --plugin-load-add=$HA_TOKUDB_SO --tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0