3758 Mattias Jonsson 2012-05-07
WL#4443
Fix for Item_func_sp::const_item.
And one test result fix (same as in trunk)
modified:
mysql-test/suite/rpl/r/rpl_parallel_change_master.result
sql/item_func.cc
sql/item_func.h
3757 Mattias Jonsson 2012-04-27 [merge]
WL#4443
Merged into latest mysql-trunk for getting rid of dependency bug fixes.
added:
mysql-test/collections/mysql-trunk-wl4443.push
mysql-test/r/partition_locking.result
mysql-test/t/partition_locking.test
modified:
include/my_bitmap.h
mysql-test/include/commit.inc
mysql-test/r/commit_1innodb.result
mysql-test/r/derived.result
mysql-test/r/explain.result
mysql-test/r/func_if.result
mysql-test/r/grant_cache_no_prot.result
mysql-test/r/innodb_explain_json_non_select_all.result
mysql-test/r/innodb_explain_json_non_select_none.result
mysql-test/r/innodb_explain_non_select_all.result
mysql-test/r/innodb_explain_non_select_none.result
mysql-test/r/myisam_explain_json_non_select_all.result
mysql-test/r/myisam_explain_json_non_select_none.result
mysql-test/r/myisam_explain_non_select_all.result
mysql-test/r/myisam_explain_non_select_none.result
mysql-test/r/myisam_icp.result
mysql-test/r/myisam_icp_all.result
mysql-test/r/partition_binlog.result
mysql-test/r/partition_datatype.result
mysql-test/r/partition_error.result
mysql-test/r/partition_explicit_prune.result
mysql-test/r/partition_pruning.result
mysql-test/r/partition_truncate.result
mysql-test/r/type_date.result
mysql-test/suite/binlog/r/binlog_unsafe.result
mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
mysql-test/suite/parts/inc/partition-dml-1-9.inc
mysql-test/suite/parts/r/partition-dml-1-9-innodb.result
mysql-test/suite/parts/r/partition-dml-1-9-myisam.result
mysql-test/suite/perfschema/r/part_table_io.result
mysql-test/suite/perfschema/r/stage_mdl_function.result
mysql-test/suite/rpl/r/rpl_parallel_change_master.result
mysql-test/t/explain.test
mysql-test/t/partition_binlog.test
mysql-test/t/partition_explicit_prune.test
mysql-test/t/partition_pruning.test
mysql-test/t/partition_truncate.test
mysql-test/t/type_date.test
mysys/my_bitmap.c
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_func.h
sql/item_strfunc.h
sql/item_subselect.cc
sql/log_event.cc
sql/opt_explain.cc
sql/opt_range.cc
sql/opt_range.h
sql/partition_info.cc
sql/partition_info.h
sql/rpl_info_table_access.cc
sql/share/errmsg-utf8.txt
sql/sql_base.cc
sql/sql_base.h
sql/sql_cache.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_delete.cc
sql/sql_executor.cc
sql/sql_insert.cc
sql/sql_insert.h
sql/sql_join_buffer.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_optimizer.cc
sql/sql_parse.cc
sql/sql_parse.h
sql/sql_partition.cc
sql/sql_partition_admin.cc
sql/sql_prepare.cc
sql/sql_resolver.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_union.cc
sql/sql_update.cc
sql/sql_view.cc
sql/table.cc
sql/table.h
unittest/gunit/my_bitmap-t.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_change_master.result revid:mattias.jonsson@stripped
+++ b/mysql-test/suite/rpl/r/rpl_parallel_change_master.result revid:mattias.jonsson@stripped
@@ -9,8 +9,6 @@ include/stop_slave.inc
SET @save.slave_parallel_workers=@@global.slave_parallel_workers;
SET @@global.slave_parallel_workers=2;
include/start_slave.inc
-Warnings:
-Note 1750 slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
CREATE DATABASE d1;
CREATE DATABASE d2;
CREATE TABLE d1.t1 (a int unique) ENGINE=INNODB;
@@ -20,21 +18,15 @@ FLUSH LOGS;
include/stop_slave.inc
CHANGE MASTER TO MASTER_DELAY=5;
include/start_slave.inc
-Warnings:
-Note 1750 slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
INSERT INTO d1.t1 VALUES (3);
INSERT INTO d1.t1 VALUES (5);
FLUSH LOGS;
include/stop_slave.inc
CHANGE MASTER TO RELAY_LOG_FILE=FILE, RELAY_LOG_POS= POS;
include/start_slave.inc
-Warnings:
-Note 1750 slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
include/stop_slave.inc
CHANGE MASTER TO RELAY_LOG_FILE=FILE, RELAY_LOG_POS= POS, MASTER_DELAY=0;
include/start_slave.inc
-Warnings:
-Note 1750 slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
BEGIN;
INSERT INTO d1.t1 VALUES (13);
INSERT INTO d1.t1 VALUES (6);
=== modified file 'sql/item_func.cc'
--- a/sql/item_func.cc revid:mattias.jonsson@stripped
+++ b/sql/item_func.cc revid:mattias.jonsson@stripped
@@ -6976,16 +6976,6 @@ void Item_func_sp::update_used_tables()
}
-bool Item_func_sp::const_item() const
-{
- if (const_item_cache)
- return true;
- if (can_be_evaluated_now())
- const_cast<Item_func_sp*>(this)->const_item_cache= true;
- return const_item_cache;
-}
-
-
/**
Check if it is OK to evaluate the item now.
=== modified file 'sql/item_func.h'
--- a/sql/item_func.h revid:mattias.jonsson@stripped
+++ b/sql/item_func.h revid:mattias.jonsson@stripped
@@ -2116,7 +2116,6 @@ public:
return sp_result_field;
}
- virtual bool const_item() const;
virtual void update_null_value();
virtual bool can_be_evaluated_now() const;
};
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (mattias.jonsson:3757 to 3758) WL#4443 | Mattias Jonsson | 9 May |
