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
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
the warnings came from MSFT compiler (output of pushbuild)
sql/event.cc:
fix compiler warnings: precision loses, unused vars
sql/event_executor.cc:
fix compiler warnings: precision loses, unused vars
sql/event_timed.cc:
fix compiler warnings: precision loses, unused vars
fix for bug#17793 (Scheduler uses class event_timed should be Event_timed)
sql/event.cc:
class event_timed -> Event_timed
sql/event.h:
class event_timed -> Event_timed
sql/event_executor.cc:
class event_timed -> Event_timed
sql/event_priv.h:
class event_timed -> Event_timed
sql/event_timed.cc:
class event_timed -> Event_timed
sql/sql_lex.h:
class event_timed -> Event_timed
sql/sql_show.cc:
class event_timed -> Event_timed
sql/sql_yacc.yy:
class event_timed -> Event_timed
- 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
(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
- too little space was allocated for receiving events, partition uses extra column in table
mysql-test/r/ndb_partition_range.result:
Bug#16385, Partitions: crash when updating a range partitioned NDB table
mysql-test/t/ndb_partition_range.test:
Bug#16385, Partitions: crash when updating a range partitioned NDB table
- error string wrongly formatted
mysql-test/r/ndb_partition_error.result:
Bug #17763 mysqld cores with list partitioning if update to missing partition
mysql-test/t/ndb_partition_error.test:
Bug #17763 mysqld cores with list partitioning if update to missing partition
mysql-test/r/events.result:
Auto merged
mysql-test/t/events.test:
Auto merged
sql/event.cc:
Auto merged
sql/event.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
- now when the event is created and STARTS is omitted then STARTS is implicitly
CURRENT_TIMESTAMP
- This CS also fixed incorrect presentation of STARTS/ENDS in I_S.EVENTS
(incorporated review changes)
mysql-test/r/events.result:
results of new test cases
mysql-test/t/events.test:
new test cases for bug #16537 (Events: mysql.event.starts is null)
sql/event.cc:
- check whether event_timed::starts_null only in case
event_timed::expression is set, so for recurring events only
- disable binlogging of CREATE EVENT statement. It should not be
replicated but the result of the execution. Still the replication is
untouched topic.
sql/event.h:
- add flags whether starts, ends and execute_at are null or not
sql/event_executor.cc:
- check whether xxx_null instead of !xxxx.year
sql/event_timed.cc:
- introduce xxx_null and change the usage of xxx.year to !xxx_null
sql/sql_show.cc:
- don't show 0000-00-00 in I_S.EVENTS when the value is NULL
sql/sql_yacc.yy:
- if STARTS is omitted default to current_timestamp
xml.result, xml.test:
Adding test case.
item_xmlfunc.cc:
Fixed that the "!" character written at the end was ignored.
Now if we try to scan "!=", and if "!" is not
followed by "=", we rollback lex scanner back
to "!" token, so the parser will start to check
the next rule from the "!" character again.
Previously parser started from the next character,
which was EOF in the example in xml.test,
which led to query being successfully parsed,
instead of producing a syntax error.
sql/item_xmlfunc.cc:
Bug#16313 XML: extractvalue() ignores '!' in names
'!' at the end was ignored.
Now if we try to scan "!=", and if "!" is not
followed by "=", we rollback lex scanner back
to "!" token, so the parser will start to check
the next rule from the "!" character again.
Previously it started from the next character,
which was EOF in the example in xml.test, and
which led to query being successfully parsed,
instead of producing a syntax error.
mysql-test/t/xml.test:
Adding test case.
mysql-test/r/xml.result:
Adding test case.
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisammrg/myrg_queue.c:
Auto merged
sql/sql_rename.cc:
Manual merge.
sql/sql_trigger.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
sql/field.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_select.h:
Manual merge.
