delta/mariadb-git.git/sql/sql_select.cc, branch bb-10.0.22-mdev8989

Backport of commit 904027c820fb344343de6f68a32bcc889f2bd407 to 10.0.21

2016-06-15T14:23:47+00:00

Commit message was:

  Merge branch 'bb-10.1-mdev8989' into 10.1

Some test results are probably not yet updated

Merge branch '5.5' into 10.0

2015-10-09T15:12:26+00:00

Merge remote-tracking branch 'mysql/5.5' into 5.5

2015-10-08T20:54:24+00:00

MDEV-8289: Semijoin inflates number of rows in query result

2015-08-18T19:54:42+00:00

- Make semi-join optimizer not to choose LooseScan
  when 1) the index is not covered and 2) full index
  scan will be required.

- Make sure that the code in make_join_select() that may change
  full index scan into a range scan is not invoked when the table
  uses full scan.

Merge branch 'mysql-5.1' into mysql-5.5

2015-08-07T10:57:48+00:00

Bug #20760261 mysqld crashed in materialized_cursor::

2015-08-07T10:56:10+00:00

send_result_set_metadata

Analysis
--------
Cursor inside trigger accessing NEW/OLD row leads server exit.

The reason for the bug was that implementation of function
create_tmp_table() was not considering Item::TRIGGER_FIELD_ITEM
as possible alternative for type of class being instantiated.
This was resulting in a mismatch between a number of columns
in result list and temp table definition. This mismatch leads
to the failure of assertion
DBUG_ASSERT(send_result_set_metadata.elements == item_list.elements)
in the method Materialized_cursor::send_result_set_metadata
in debug mode.

Fix:
---
Added code to consider Item::TRIGGER_FIELD_ITEM as valid
type while creating fields.

Merge branch 'mysql-5.1' into mysql-5.5

2015-08-04T06:58:56+00:00

Bug #21096444: MYSQL IS TRYING TO PERFORM A CONSISTENT READ BUT THE READ VIEW IS NOT ASSIGNED!

2015-08-04T06:15:02+00:00

Issue: A select for update subquery in having clause
resulted deadlock and its transaction was rolled back
by innodb. val_XXX interfaces do not handle errors and
it do not propogate errors to its caller. sub_select
did not see this error when it called
evaluate_join_record and later made a call to innodb.
As transaction is rolled back innodb asserted.

Fix: Now evaluate_join_record checks if there is any
error reported and then return the same to its caller.

Merge commit '96badb16afcf' into 10.0

2015-08-03T20:09:43+00:00

Conflicts:
	client/mysql_upgrade.c
	mysql-test/r/func_misc.result
	mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
	mysql-test/suite/innodb/r/innodb-fk.result
	mysql-test/t/subselect_sj_mat.test
	sql/item.cc
	sql/item_func.cc
	sql/log.cc
	sql/log_event.cc
	sql/rpl_utility.cc
	sql/slave.cc
	sql/sql_class.cc
	sql/sql_class.h
	sql/sql_select.cc
	storage/innobase/dict/dict0crea.c
	storage/innobase/dict/dict0dict.c
	storage/innobase/handler/ha_innodb.cc
	storage/xtradb/dict/dict0crea.c
	storage/xtradb/dict/dict0dict.c
	storage/xtradb/handler/ha_innodb.cc
	vio/viosslfactories.c

Problem was that for cases like:

2015-06-25T20:26:29+00:00

SELECT ... WHERE XX IN (SELECT YY)
this was transformed to something like:
SELECT ... WHERE IF_EXISTS(SELECT ... HAVING XX=YY)

The bug was that for normal execution XX was fixed in the original outer SELECT context while in PS it was fixed in the sub query context and this confused the optimizer.

Fixed by ensuring that XX is always fixed in the outer context.