3646 Tatiana A. Nurnberg 2009-11-02 [merge]
auto-merge
removed:
mysql-test/include/default_client.cnf
mysql-test/r/mysql_locale_posix.result
mysql-test/t/mysql_locale_posix.test
added:
mysql-test/collections/mysql-6.0-backup-merge.push
mysql-test/include/default_client.cnf
mysql-test/include/have_case_insensitive_fs.inc
mysql-test/r/case_insensitive_fs.require
mysql-test/r/grant_lowercase_fs.result
mysql-test/r/mysql_locale_posix.result
mysql-test/suite/backup/include/basic_data.inc
mysql-test/suite/backup/include/check_filesize.inc
mysql-test/suite/backup/include/error_name_to_number.inc
mysql-test/suite/backup/include/test_for_error.inc
mysql-test/suite/backup/r/backup_all.result
mysql-test/suite/backup/r/backup_errors_debug_1.result
mysql-test/suite/backup/r/backup_errors_debug_2.result
mysql-test/suite/backup/r/backup_errors_debug_3.result
mysql-test/suite/backup/r/backup_log_filesize.result
mysql-test/suite/backup/r/backup_row_size.result
mysql-test/suite/backup/t/backup_all.test
mysql-test/suite/backup/t/backup_errors_debug_1-master.opt
mysql-test/suite/backup/t/backup_errors_debug_1.test
mysql-test/suite/backup/t/backup_errors_debug_2.test
mysql-test/suite/backup/t/backup_errors_debug_3.test
mysql-test/suite/backup/t/backup_log_filesize.test
mysql-test/suite/backup/t/backup_row_size.test
mysql-test/suite/backup_extra/init_flightstat_stress.txt
mysql-test/suite/backup_extra/r/flightstat_stress_delete.result
mysql-test/suite/backup_extra/r/flightstat_stress_init.result
mysql-test/suite/backup_extra/r/flightstat_stress_insert.result
mysql-test/suite/backup_extra/r/flightstat_stress_restore.result
mysql-test/suite/backup_extra/r/flightstat_stress_update.result
mysql-test/suite/backup_extra/r/restore_stress.result
mysql-test/suite/backup_extra/r/start_masterslave.result
mysql-test/suite/backup_extra/run_flightstat_stress.txt
mysql-test/suite/backup_extra/run_flightstat_stress_with_restore.txt
mysql-test/suite/backup_extra/stress_basedir/
mysql-test/suite/backup_extra/t/flightstat_stress_cleanup.test
mysql-test/suite/backup_extra/t/flightstat_stress_delete.test
mysql-test/suite/backup_extra/t/flightstat_stress_init.test
mysql-test/suite/backup_extra/t/flightstat_stress_insert.test
mysql-test/suite/backup_extra/t/flightstat_stress_restore.test
mysql-test/suite/backup_extra/t/flightstat_stress_update.test
mysql-test/suite/backup_extra/t/restore_stress-master.opt
mysql-test/suite/backup_extra/t/restore_stress.test
mysql-test/suite/backup_extra/t/start_masterslave.test
mysql-test/suite/backup_extra/vptest/
mysql-test/suite/backup_extra/vptest/flightstats_alter.sql
mysql-test/suite/backup_extra/vptest/run_vp_test.pl
mysql-test/suite/backup_extra/vptest/tmp/
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
mysql-test/suite/rpl/t/rpl_get_master_version_and_clock-slave.opt
mysql-test/t/grant_lowercase_fs.test
mysql-test/t/mysql_locale_posix.test
plugin/semisync/CMakeLists.txt
renamed:
mysql-test/r/bug40113.result => mysql-test/r/innodb_lock_wait_timeout_1.result
mysql-test/t/bug40113-master.opt => mysql-test/t/innodb_lock_wait_timeout_1-master.opt
mysql-test/t/bug40113.test => mysql-test/t/innodb_lock_wait_timeout_1.test
modified:
CMakeLists.txt
Makefile.am
client/backup_stream.c
client/mysqlbackup.cc
client/mysqlbinlog.cc
include/myisamchk.h
mysql-test/Makefile.am
mysql-test/collections/default.experimental
mysql-test/collections/mysql-6.0-backup.daily
mysql-test/collections/mysql-6.0-backup.weekly
mysql-test/include/have_semisync_plugin.inc
mysql-test/mysql-test-run.pl
mysql-test/r/analyse.result
mysql-test/r/grant.result
mysql-test/r/join.result
mysql-test/r/locale.result
mysql-test/r/lowercase_fs_off.result
mysql-test/r/myisam.result
mysql-test/r/mysql_upgrade.result
mysql-test/r/olap.result
mysql-test/r/ps_grant.result
mysql-test/r/select.result
mysql-test/r/select_jcl6.result
mysql-test/r/subselect.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/r/system_mysql_db.result
mysql-test/r/xa.result
mysql-test/suite/backup/r/backup_client_coverage.result
mysql-test/suite/backup/r/backup_compression.result
mysql-test/suite/backup/r/backup_errors.result
mysql-test/suite/backup/r/backup_errors_compression.result
mysql-test/suite/backup/r/backup_intr_errors.result
mysql-test/suite/backup/r/backup_logs.result
mysql-test/suite/backup/r/backup_namecase.result
mysql-test/suite/backup/r/backup_objects.result
mysql-test/suite/backup/r/backup_objects_dependency.result
mysql-test/suite/backup/r/backup_security.result
mysql-test/suite/backup/r/backup_security_check.result
mysql-test/suite/backup/r/backup_table_grants.result
mysql-test/suite/backup/r/backup_views.result
mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result
mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result
mysql-test/suite/backup/std_data/backup_xpfm_compat_lctn0-linux_x86.bak
mysql-test/suite/backup/std_data/backup_xpfm_compat_lctn0-linux_x86_64.bak
mysql-test/suite/backup/std_data/backup_xpfm_compat_lctn0-sol_sparc_64.bak
mysql-test/suite/backup/std_data/backup_xpfm_compat_lctn1-linux_x86.bak
mysql-test/suite/backup/std_data/backup_xpfm_compat_lctn1-linux_x86_64.bak
mysql-test/suite/backup/std_data/backup_xpfm_compat_lctn1-sol_sparc_64.bak
mysql-test/suite/backup/std_data/backup_xpfm_compat_lctn1-windows_32.bak
mysql-test/suite/backup/std_data/backup_xpfm_compat_lctn1-windows_64.bak
mysql-test/suite/backup/std_data/backup_xpfm_compat_lctn2-windows_32.bak
mysql-test/suite/backup/std_data/backup_xpfm_compat_lctn2-windows_64.bak
mysql-test/suite/backup/t/backup_charsets.test
mysql-test/suite/backup/t/backup_client_coverage.test
mysql-test/suite/backup/t/backup_compression.test
mysql-test/suite/backup/t/backup_db_grants.test
mysql-test/suite/backup/t/backup_logs.test
mysql-test/suite/backup/t/backup_no_data.test
mysql-test/suite/backup/t/backup_objects.test
mysql-test/suite/backup/t/backup_objects_dependency.test
mysql-test/suite/backup/t/backup_security.test
mysql-test/suite/backup/t/backup_stream_errors.test
mysql-test/suite/backup/t/disabled.def
mysql-test/suite/backup_engines/include/backup_restore_interrupt.inc
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_statistics.result
mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
mysql-test/suite/rpl/r/rpl_semi_sync.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
mysql-test/suite/rpl/t/rpl_semi_sync.test
mysql-test/t/analyse.test
mysql-test/t/disabled.def
mysql-test/t/join.test
mysql-test/t/locale.test
mysql-test/t/lowercase_fs_off.test
mysql-test/t/myisam.test
mysql-test/t/mysql_upgrade.test
mysql-test/t/olap.test
mysql-test/t/select.test
mysql-test/t/subselect.test
mysql-test/t/xa.test
mysys/my_getopt.c
mysys/typelib.c
plugin/semisync/Makefile.am
plugin/semisync/semisync_master.cc
plugin/semisync/semisync_master.h
plugin/semisync/semisync_master_plugin.cc
plugin/semisync/semisync_slave.cc
plugin/semisync/semisync_slave.h
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_fix.sql
sql-common/client.c
sql/backup/backup_aux.h
sql/backup/backup_info.cc
sql/backup/backup_info.h
sql/backup/backup_kernel.h
sql/backup/be_native.h
sql/backup/data_backup.cc
sql/backup/image_info.cc
sql/backup/image_info.h
sql/backup/kernel.cc
sql/backup/logger.cc
sql/backup/logger.h
sql/backup/stream.cc
sql/backup/stream.h
sql/backup/stream_v1.c
sql/backup/stream_v1.h
sql/backup/stream_v1_services.h
sql/backup/stream_v1_transport.c
sql/handler.cc
sql/log.cc
sql/set_var.cc
sql/share/errmsg-utf8.txt
sql/share/errmsg.txt
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_class.cc
sql/sql_locale.cc
sql/sql_plugin.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_yacc.yy
sql/transaction.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/myisam/ha_myisam.cc
storage/myisam/mi_check.c
storage/myisam/sort.c
unittest/backup/bstr_callback_errors-t.c
unittest/backup/catalog.c
vio/viosslfactories.c
mysql-test/r/innodb_lock_wait_timeout_1.result
mysql-test/t/innodb_lock_wait_timeout_1.test
=== modified file 'mysql-test/r/explain.result'
--- a/mysql-test/r/explain.result 2009-10-12 09:08:34 +0000
+++ b/mysql-test/r/explain.result 2009-11-02 08:04:07 +0000
@@ -197,6 +197,22 @@ dt
2001-01-01 01:01:01
drop tables t1, t2;
set optimizer_switch=default;
+#
+# Bug#48295:
+# explain extended crash with subquery and ONLY_FULL_GROUP_BY sql_mode
+#
+CREATE TABLE t1 (f1 INT);
+SELECT @@session.sql_mode INTO @old_sql_mode;
+SET SESSION sql_mode='ONLY_FULL_GROUP_BY';
+EXPLAIN EXTENDED SELECT 1 FROM t1
+WHERE f1 > ALL( SELECT t.f1 FROM t1,t1 AS t );
+ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
+SHOW WARNINGS;
+Level Code Message
+Error 1140 Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause
+Note 1003 select 1 AS `1` from `test`.`t1` where <not>(<exists>(...))
+SET SESSION sql_mode=@old_sql_mode;
+DROP TABLE t1;
End of 5.1 tests.
explain select 1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
=== modified file 'mysql-test/t/explain.test'
--- a/mysql-test/t/explain.test 2009-10-12 09:08:34 +0000
+++ b/mysql-test/t/explain.test 2009-11-02 08:04:07 +0000
@@ -168,6 +168,26 @@ SELECT OUTR.dt FROM t1 AS OUTR WHERE OUT
drop tables t1, t2;
set optimizer_switch=default;
+--echo #
+--echo # Bug#48295:
+--echo # explain extended crash with subquery and ONLY_FULL_GROUP_BY sql_mode
+--echo #
+
+CREATE TABLE t1 (f1 INT);
+
+SELECT @@session.sql_mode INTO @old_sql_mode;
+SET SESSION sql_mode='ONLY_FULL_GROUP_BY';
+
+# EXPLAIN EXTENDED (with subselect). used to crash. should give NOTICE.
+--error ER_MIX_OF_GROUP_FUNC_AND_FIELDS
+EXPLAIN EXTENDED SELECT 1 FROM t1
+ WHERE f1 > ALL( SELECT t.f1 FROM t1,t1 AS t );
+SHOW WARNINGS;
+
+SET SESSION sql_mode=@old_sql_mode;
+
+DROP TABLE t1;
+
--echo End of 5.1 tests.
--enable_metadata
=== modified file 'sql/item_subselect.cc'
--- a/sql/item_subselect.cc 2009-10-12 09:08:34 +0000
+++ b/sql/item_subselect.cc 2009-11-02 08:04:07 +0000
@@ -377,9 +377,14 @@ void Item_subselect::update_used_tables(
void Item_subselect::print(String *str, enum_query_type query_type)
{
- str->append('(');
- engine->print(str, query_type);
- str->append(')');
+ if (engine)
+ {
+ str->append('(');
+ engine->print(str, query_type);
+ str->append(')');
+ }
+ else
+ str->append("(...)");
}
Attachment: [text/bzr-bundle] bzr/azundris@mysql.com-20091102080407-tvjzvb1q7lhn53i8.bundle
| Thread |
|---|
| • bzr push into mysql-pe branch (azundris:3646) | Tatiana A. Nurnberg | 2 Nov |
