The cause of this bug was a design flaw due to which the list of natural
join columns was incorrectly computed and stored for nested joins that
are not natural joins, but are operands (possibly indirect) of nested joins.
The patch corrects the flaw in a such a way, that the result columns of a
table reference are materialized only if it is a leaf table (that is, only
if it is a view, stored table, or natural/using join).
mysql-test/r/join.result:
Added test for BUG#15229 and uncommented failing test cases of
BUG#15357 (now fixed by this patch).
mysql-test/t/join.test:
Added test for BUG#15229 and uncommented failing test cases of
BUG#15357 (now fixed by this patch).
sql/sql_base.cc:
- Do not materialize the result columns of regular nested joins
(that are not natural/using joins).
- Moved most of the code that creates/adds new natural join column
references to the method 'get_or_create_column_ref', and simplified
'mark_common_columns'.
- Replaced a call to 'get_or_create_column_ref' with 'get_natural_column_ref'
where it is for sure all columns are alredy created.
sql/table.cc:
- Modified the method 'get_or_create_column_ref' so that it adds itself
the newly created natural join columns to the respective table reference.
sql/table.h:
- Modified the method 'get_or_create_column_ref' so that it adds itself
the newly created natural join columns to the respective table reference.
sql_partition.cc:
Changeing THD charset to utf8 when parsing a frm file.
partition_charset.test, partition_charset.result:
new file
sql/sql_partition.cc:
Bug#14527: Partitions: table unreadable if partition name = c-cedilla
Changering THD charset to utf8 when parsing
a frm file.
into mysql.com:/usr/home/bar/mysql-5.1-new.16315
sql/item_xmlfunc.cc:
Auto merged
mysql-test/r/xml.result:
After merge fix
mysql-test/t/xml.test:
After merge fix
- Fix test case for systems with "lowercase names"
mysql-test/r/grant2.result:
Update test result
mysql-test/t/grant2.test:
Fix for system with "lowercase names", allow erro 1007 to be returned
This test is being performed by:
1. ctype_cp932_binlog_row.test and 2. ctype_cp932_binlog_stm.test
Both of these source the file extra/binlog_tests/ctype_cp932_binlog.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
Delete: mysql-test/t/ctype_cp932_notembedded.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3:
Delete: mysql-test/r/ctype_cp932_notembedded.result
WL#1034
mysql-test/t/events_logs_tests-master.opt:
Rename: mysql-test/t/events_slow_query-master.opt -> mysql-test/t/events_logs_tests-master.opt
sql/event_timed.cc:
ask the anonymous SP to log general statements
sql/sp_head.cc:
save the OPTION_LOG_OFF and restore it after execution
sql/sp_head.h:
add a new flag for general log
mysql-test/r/events_logs_tests.result:
update result file
mysql-test/t/events_logs_tests.test:
add test for general log
Bug #17806 Update on NDB table with list partition causes mysqld to core
- modified complemented_pk_read to be complemented_read, and handle also hidden key
mysql-test/r/ndb_partition_range.result:
Bug #16385 Partitions: crash when updating a range partitioned NDB table
Bug #17806 Update on NDB table with list partition causes mysqld to core
mysql-test/t/ndb_partition_range.test:
Bug #16385 Partitions: crash when updating a range partitioned NDB table
Bug #17806 Update on NDB table with list partition causes mysqld to core
sql/ha_ndbcluster.h:
Bug #16385 Partitions: crash when updating a range partitioned NDB table
Bug #17806 Update on NDB table with list partition causes mysqld to core
union.result, union.test:
Adding test case.
item.cc:
Allow safe character set conversion in UNION
- string constant to column's charset
- to unicode
Thus, UNION now works the same with CONCAT (and other string functions)
in respect of aggregating arguments with different character sets.
sql/item.cc:
Allow character set conversion in UNION
- string to column's charset
- to unicode
Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
mysql-test/t/union.test:
Adding test case.
mysql-test/r/union.result:
Adding test case.
mysql-test/mysql-test-run.pl:
Post-merge fixes.
As the merge brings the backport to this version, this was to be expected -
we really need the handling of this option only once.
mysql-test/mysql-test-run.pl:
Add a "--comment=<string>" option (backport from 5.1).
Its sole purpose is to get logged, so that test evaluation gets easier.
See "Do-compile" for how it is called, and "gen-build-status-page" for its effect.
