extra/cmakelists.txt:
Another attempt at fixing the comp_err/GenError dependency problem.
sql/cmakelists.txt:
Another attempt at fixing the comp_err/GenError dependency problem.
client/cmakelists.txt:
Another attempt at fixing the comp_err/GenError dependency problem.
libmysql/cmakelists.txt:
Another attempt at fixing the comp_err/GenError dependency problem.
server-tools/instance-manager/cmakelists.txt:
Another attempt at fixing the comp_err/GenError dependency problem.
client/cmakelists.txt:
Fix dependency problem with the old GenError target.
extra/cmakelists.txt:
Fix dependency problem with the old GenError target.
libmysql/cmakelists.txt:
Fix dependency problem with the old GenError target.
server-tools/instance-manager/cmakelists.txt:
Fix dependency problem with the old GenError target.
sql/cmakelists.txt:
Fix dependency problem with the old GenError target.
win/README:
Fix dependency problem with the old GenError target.
into xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2
include/config-win.h:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/sql_select.cc:
Auto merged
sql/mysql_priv.h:
merge bug#14575 forwards
sql/mysqld.cc:
merge bug#14575 forwards
A crash after ALTER TABLE t1 RENAME ...
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/sql_lex.h:
Introduced like name for CREATE TABLE t1 LIKE t2
sql/sql_parse.cc:
Introduced like name for CREATE TABLE t1 LIKE t2
sql/sql_partition.cc:
Introduced like name for CREATE TABLE t1 LIKE t2
sql/sql_yacc.yy:
Introduced like name for CREATE TABLE t1 LIKE t2
into mysql.com:/usr/local/mysql/mysql-5.1-new
mysql-test/lib/mtr_timer.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
mysql-test/lib/mtr_timer.pl:
Fix bug where ^C would trigger cleanup handler in both parent and
timeout child processes, causing duplicated messages and potential
conflicts.
Unable to reproduce failure: some of the 17400 tests pass, other have other failures.
The test in the bug report passes.
Enabling some tests that pass, rebranding others.
mysql-test/t/disabled.def:
Enabling tests that pass
Rebranding disabled tests
¨MySQL server crashes if you try to access to InnoDB table¨
crash caused by schizophrenic mysqld - 2 memory locations for logically same function
with conflicting values.
Fixed by backporting from 5.1 changes to have_xyz_db declarations.
sql/mysql_priv.h:
Backport have_xyz_db changes from 5.1
sql/mysqld.cc:
Backport have_xyz_db changes from 5.1
SHOW AUTHORS caused 'Packets out of order' in stored functions:
add the corresponding SQLCOM to sp_get_flags_for_command so that
it'd return sp-related flags for it.
Fix Bug#17403 "Events: packets out of order with show create event"
in the same chaneset.
mysql-test/r/events.result:
Update the results (Bug#17403)
mysql-test/r/sp-error.result:
Test results fixed (Bug#16164)
mysql-test/t/events.test:
Add a test case for Bug#17403 "Events: packets out of order with
show create event"
mysql-test/t/sp-error.test:
Add a test case for Bug#16164 "Easter egg"
sql/sp_head.cc:
Add SHOW AUTHORS to the list of commands that return a result
set: such commands are not allowed in stored functions and
triggers. Add SHOW CREATE EVENT for the same reason.
- Replication of tables with autoincrement not supported when maste and or slave uses storage engine "ndb"
mysql-test/t/disabled.def:
Remove disabling of testscase
mysql-test/t/rpl_ndb_multi_update2.test:
Only run this test when row based replication is available
rows for SEs using injector):
Table truncation ("DELETE FROM t1" and "TRUNCATE t1") was logged as
a statement even when the storage engine deletes the rows individually
using the injector.
sql/sql_delete.cc:
Don't log a truncate statement if the storage engine is using the injector.
removed double entries for sql_yacc.* and added -p MYSQL define to call to bison
win/cmakefiles/sql:
removed double entries for sql_yacc.* and added -p MYSQL define to call to bison
Adding test.
item_xmlfunc.cc:
Bug #18171 XML: ExtractValue: the XPath position() function crashes the server!
Disallowing use of position() and last() without context.
sql/item_xmlfunc.cc:
Bug #18171 XML: ExtractValue: the XPath position() function crashes the server!
Disallowing use of position() and last() without context.
mysql-test/t/xml.test:
Adding test.
mysql-test/r/xml.result:
Adding test.
Afterfix for bug#17366: Unchecked Item_int results in server crash
sql/sql_select.cc:
Afterfix for bug#17366: Unchecked Item_int results in server crash
- Add HAVE_OPENSSL and HAVE_YASSL to config-win.h
include/config-win.h:
Define HAVE_OPENSSL and HAVE_YASSL to make the server and client enable SSL support
(nothing to document, this bug was not released).
mysql-test/t/disabled.def:
bug is fixed, enabling test case
mysql-test/t/rpl_rbr_to_sbr.test:
making test portable
mysql-test/r/rpl_rbr_to_sbr.result:
result update
