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.
mysql-test/r/bigint.result:
test result
mysql-test/t/bigint.test:
testcase
sql/item.h:
unsigned_arg is a separate parameter now
sql/item_cmpfunc.cc:
we can get unsigned field from the signed Item - from string
like '1234'
mysql-test/mysql-test-run.sh:
Add a "--comment=<string>" option, to get it logged when the test is run.
The purpose is to allow a better analysis when generating the status page
("gen-build-status-page").
See "Do-compile" for how it is used.
The idea of the fix is to extend support of non-SUID triggers for backward
compatibility. Formerly non-SUID triggers were appeared when "new" server
is being started against "old" database. Now, they are also created when
"new" slave receives updates from "old" master.
mysql-test/r/rpl_trigger.result:
Updated the result file with the results of the test for BUG#16266.
mysql-test/t/rpl_trigger.test:
Added the test case for BUG#16266.
sql/mysql_priv.h:
Added an utility operation to be used from sql_yacc.yy.
sql/sql_parse.cc:
Add a utility operation to be used from sql_yacc.yy.
sql/sql_trigger.cc:
Extend support of non-SUID triggers.
sql/sql_view.cc:
Initialize LEX::definer if DEFINER-clause is missing.
sql/sql_yacc.yy:
Extended support of non-SUID triggers.
mysql-test/std_data/bug16266.000001:
A new binlog file for testing a patch for BUG#16266.
xml.result, xml.test:
Adding test case.
item_xmlfunc.cc:
Adding a special function to handle "self" axis.
Previously "child" and "self" were handled the same.
sql/item_xmlfunc.cc:
Bug#16315 XML: extractvalue() handles self badly
Adding a special function to handle "self" axis.
Previously "child" and "self" were handled the same.
mysql-test/t/xml.test:
Adding test case.
mysql-test/r/xml.result:
Adding test case.
store copy of partition function string
mysql-test/r/partition.result:
Fix for bug#14363 Partitions: failure if create in stored procedure
test case
mysql-test/t/partition.test:
Fix for bug#14363 Partitions: failure if create in stored procedure
test case
added '_' to allowed tag body symbols
mysql-test/r/xml.result:
Bug#16320 XML: extractvalue() won't accept names containing underscores
test case
mysql-test/t/xml.test:
Bug#16320 XML: extractvalue() won't accept names containing underscores
test case
mysql-test/r/events_slow_query.result:
fix result
mysql-test/t/events_slow_query.test:
create different event because the executor is buggy and won't catch the difference if
the memory address does not change (will be reported as bug separately)
sql/sp_head.cc:
this was an error which passed code review. thd->enable_slow_log could be
changed and it should not be relied
Events: Event-caused statements don't appear in the slow query log
WL#1034
sql/event_executor.cc:
enable slow logging
sql/event_timed.cc:
enable slow logging for the anonymous SP
sql/sp_head.cc:
allow thd->enable_slow_log to be TRUE if only
m_flags & sp_head::LOG_SLOW_STATEMENTS
Because usually enable_slow_log is 1 in user mode, this second
check is needed backup the mode otherwise.
sql/sp_head.h:
add a new constant for slow queries. SP by default does not log slow queries in the
body just the whole CALL could be considered as slow if taking too much time and
called directly from the user
sql/sql_parse.cc:
let us see in the the trace log
configure.in:
Auto merged
client/mysqlimport.c:
Auto merged
include/config-win.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/field.h:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/mysqldump.test:
SCCS merged
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
Fix URLs.
README:
Fix URL.
mysqltest.result:
Update test result for real_sleep error message.
mysqltest.c:
Fix do_sleep() to print correct command name for real_sleep.
client/mysqltest.c:
Fix do_sleep() to print correct command name for real_sleep.
mysql-test/r/mysqltest.result:
Update test result for real_sleep error message.
mysql-test/README:
Fix URL.
mysql-test/mysql-test-run.sh:
Fix URLs.
- moved initialization of used_partitions
- more tests
+ removed reference to fixed bugs
mysql-test/r/ndb_partition_range.result:
Bug #17499 continued
- more testing
mysql-test/t/disabled.def:
removed reference to fixed bugs
mysql-test/t/ndb_partition_range.test:
Bug #17499 continued
- more testing
sql/ha_ndbcluster.cc:
Bug #17499 continued
- moved initialization of used_partitions
sql/sql_partition.cc:
Bug #17499 continued
- moved initialization of used_partitions
mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
Updated from review comments
mysql-test/include/rpl_multi_engine3.inc:
Updated from review comments
(post-review pre-push changes)
coding style (mostly trailing spaces removed)
mysql-test/r/events.result:
fix result file
sql/event.cc:
- remove trailing spaces
- add a missing initializer (gcc warning)
- C++ to C comments
sql/event_executor.cc:
- fix coding style (C++ to C comments, remove trailing spaces)
- fix wrong indexing buggie not found till now (queue indexing is 0 based,
not 1 based)
sql/event_timed.cc:
- fix coding style
