Merge branch 'mysql-5.6' into mysql-5.7

Sreeharsha Ramanavarapu · Sreeharsha Ramanavarapu · commit 8977f70e5335 · 2017-07-05T08:27:00.000+05:30
diff --git a/mysql-test/r/partition_locking.result b/mysql-test/r/partition_locking.result
@@ -5339,7 +5339,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered
 1	SIMPLE	t2	p1	const	PRIMARY	PRIMARY	4	const	#	100.00	NULL
 Warnings:
 Warning	1681	'PARTITIONS' is deprecated and will be removed in a future release.
-Note	1003	/* select#1 */ select '1' AS `a`,'1' AS `b` from `test`.`t2` where ('1' = `sf_a_from_t1b_d`('1'))
+Note	1003	/* select#1 */ select '1' AS `a`,'1' AS `b` from `test`.`t2` where 1
 FLUSH STATUS;
 START TRANSACTION;
 SELECT * FROM t2 WHERE a = sf_a_from_t1b_d('1');
@@ -5472,10 +5472,10 @@ HANDLER_WRITE	17
 UNLOCK TABLES;
 EXPLAIN PARTITIONS SELECT * FROM t2 WHERE a = sf_a_from_t1b_d('1') AND a = 2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	p2	const	PRIMARY	PRIMARY	4	const	#	100.00	NULL
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	Impossible WHERE
 Warnings:
 Warning	1681	'PARTITIONS' is deprecated and will be removed in a future release.
-Note	1003	/* select#1 */ select '2' AS `a`,'2' AS `b` from `test`.`t2` where ((2 = `sf_a_from_t1b_d`('1')))
+Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` where 0
 FLUSH STATUS;
 START TRANSACTION;
 SELECT * FROM t2 WHERE a = sf_a_from_t1b_d('1') AND a = 2;
@@ -5485,7 +5485,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_EXTERNAL_LOCK	4
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 FLUSH STATUS;
@@ -5498,7 +5498,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
 HANDLER_EXTERNAL_LOCK	2
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 UNLOCK TABLES;
@@ -5705,7 +5705,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered
 1	SIMPLE	t2	p1	const	PRIMARY	PRIMARY	4	const	#	100.00	NULL
 Warnings:
 Warning	1681	'PARTITIONS' is deprecated and will be removed in a future release.
-Note	1003	/* select#1 */ select (`sf_add_1`('1') - 1) AS `sf_add_1(a) - 1`,`sf_add_hello`('1') AS `sf_add_hello(b)` from `test`.`t2` where ('1' = `sf_a_from_t1b_d`('1'))
+Note	1003	/* select#1 */ select (`sf_add_1`('1') - 1) AS `sf_add_1(a) - 1`,`sf_add_hello`('1') AS `sf_add_hello(b)` from `test`.`t2` where 1
 FLUSH STATUS;
 START TRANSACTION;
 SELECT sf_add_1(a) - 1, sf_add_hello(b) FROM t2 WHERE a = sf_a_from_t1b_d('1');
@@ -5838,10 +5838,10 @@ HANDLER_WRITE	17
 UNLOCK TABLES;
 EXPLAIN PARTITIONS SELECT sf_add_1(a) - 1, sf_add_hello(b) FROM t2 WHERE a = sf_a_from_t1b_d('1') AND a = 2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	p2	const	PRIMARY	PRIMARY	4	const	#	100.00	NULL
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	Impossible WHERE
 Warnings:
 Warning	1681	'PARTITIONS' is deprecated and will be removed in a future release.
-Note	1003	/* select#1 */ select (`sf_add_1`('2') - 1) AS `sf_add_1(a) - 1`,`sf_add_hello`('2') AS `sf_add_hello(b)` from `test`.`t2` where ((2 = `sf_a_from_t1b_d`('1')))
+Note	1003	/* select#1 */ select (`sf_add_1`(`test`.`t2`.`a`) - 1) AS `sf_add_1(a) - 1`,`sf_add_hello`(`test`.`t2`.`b`) AS `sf_add_hello(b)` from `test`.`t2` where 0
 FLUSH STATUS;
 START TRANSACTION;
 SELECT sf_add_1(a) - 1, sf_add_hello(b) FROM t2 WHERE a = sf_a_from_t1b_d('1') AND a = 2;
@@ -5851,7 +5851,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_EXTERNAL_LOCK	4
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 FLUSH STATUS;
@@ -5864,7 +5864,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
 HANDLER_EXTERNAL_LOCK	2
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 UNLOCK TABLES;
@@ -6271,7 +6271,7 @@ ROLLBACK;
 UNLOCK TABLES;
 EXPLAIN PARTITIONS UPDATE t2 SET b = CONCAT('+', b) WHERE a = sf_a_from_t1b_d('1') AND a = 2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	UPDATE	t2	p2	range	PRIMARY	PRIMARY	4	const	#	100.00	Using where
+1	UPDATE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	Impossible WHERE
 Warnings:
 Warning	1681	'PARTITIONS' is deprecated and will be removed in a future release.
 FLUSH STATUS;
@@ -6282,7 +6282,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_EXTERNAL_LOCK	4
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 SELECT * FROM t2;
@@ -6300,7 +6300,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
 HANDLER_EXTERNAL_LOCK	2
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 SELECT * FROM t2;
@@ -6731,7 +6731,7 @@ ROLLBACK;
 UNLOCK TABLES;
 EXPLAIN PARTITIONS UPDATE t2 SET b = sf_add_hello(b) WHERE a = sf_a_from_t1b_d('1') AND a = 2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	UPDATE	t2	p2	range	PRIMARY	PRIMARY	4	const	#	100.00	Using where
+1	UPDATE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	Impossible WHERE
 Warnings:
 Warning	1681	'PARTITIONS' is deprecated and will be removed in a future release.
 FLUSH STATUS;
@@ -6742,7 +6742,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_EXTERNAL_LOCK	4
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 SELECT * FROM t2;
@@ -6760,7 +6760,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
 HANDLER_EXTERNAL_LOCK	2
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 SELECT * FROM t2;
@@ -7199,7 +7199,7 @@ ROLLBACK;
 UNLOCK TABLES;
 EXPLAIN PARTITIONS UPDATE t2 SET a = sf_add_1(a) + 4 WHERE a = sf_a_from_t1b_d('1') AND a = 2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	UPDATE	t2	p2	range	PRIMARY	PRIMARY	4	const	#	100.00	Using where; Using temporary
+1	UPDATE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	Impossible WHERE
 Warnings:
 Warning	1681	'PARTITIONS' is deprecated and will be removed in a future release.
 FLUSH STATUS;
@@ -7210,7 +7210,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_EXTERNAL_LOCK	4
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 SELECT * FROM t2;
@@ -7228,7 +7228,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
 HANDLER_EXTERNAL_LOCK	2
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 SELECT * FROM t2;
@@ -7650,7 +7650,7 @@ ROLLBACK;
 UNLOCK TABLES;
 EXPLAIN PARTITIONS DELETE FROM t2 WHERE a = sf_a_from_t1b_d('1') AND a = 2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	DELETE	t2	p2	range	PRIMARY	PRIMARY	4	const	#	100.00	Using where
+1	DELETE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	Impossible WHERE
 Warnings:
 Warning	1681	'PARTITIONS' is deprecated and will be removed in a future release.
 FLUSH STATUS;
@@ -7661,7 +7661,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_EXTERNAL_LOCK	4
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 SELECT * FROM t2;
@@ -7679,7 +7679,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
 HANDLER_EXTERNAL_LOCK	2
-HANDLER_READ_KEY	4
+HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
 HANDLER_WRITE	17
 SELECT * FROM t2;
diff --git a/sql/item_func.cc b/sql/item_func.cc
@@ -493,8 +493,6 @@ void Item_func_sp::fix_after_pullout(SELECT_LEX *parent_select,
             doesn't reference any tables.
   */
   used_tables_cache|= PARAM_TABLE_BIT;
-
-  const_item_cache= used_tables_cache == 0;
 }
 
 
@@ -8837,8 +8835,6 @@ Item_func_sp::fix_fields(THD *thd, Item **ref)
 
   /* These is reset/set by Item_func::fix_fields. */
   with_stored_program= true;
-  if (!m_sp->m_chistics->detistic || !tables_locked_cache)
-    const_item_cache= false;
 
   if (res)
     DBUG_RETURN(res);
@@ -8876,9 +8872,6 @@ void Item_func_sp::update_used_tables()
 {
   Item_func::update_used_tables();
 
-  if (!m_sp->m_chistics->detistic)
-    const_item_cache= false;
-
   /* This is reset by Item_func::update_used_tables(). */
   with_stored_program= true;
 }
diff --git a/sql/item_func.h b/sql/item_func.h
@@ -2808,6 +2808,22 @@ class Item_func_sp :public Item_func
   }
 
   virtual void update_null_value();
+
+  /**
+    Ensure that deterministic functions are not evaluated in preparation phase
+    by returning false before tables are locked and true after they are locked.
+    (can_be_evaluated_now() handles this because a function has the
+    has_subquery() property).
+
+     @retval true if tables are locked for deterministic functions
+     @retval false Otherwise
+  */
+  bool const_item() const
+  {
+    if (used_tables() == 0)
+      return can_be_evaluated_now();
+    return false;
+  }
 };
 
 
