into mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
mysql-test/t/sp.test:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
After the ChangeSet 1.1892.20.1 2005/08/24 (Bug #12562) SYSDATE() is not an alias
of NOW() and is unsafe for replication.
`SYSDATE()' backward compatible aliasing clashes with the idea #12562
fix. To make it safe-replicatable we have to either use RBR or to restore
the pre-5.0 style.
--sysdate-is-now command line flag was introduced to provide backward compatibility.
sql/mysqld.cc:
New option to force SYSDATE's backward compatible with 4.1 aliasing to NOW (not default)
sql/sql_class.h:
new slot to fill at init time and check at parse
sql/sql_yacc.yy:
calling NOW's branches when --sysdate-is-now
mysql-test/r/sysdate_is_now.result:
New BitKeeper file ``mysql-test/r/sysdate_is_now.result''
mysql-test/t/sysdate_is_now-master.opt:
New BitKeeper file ``mysql-test/t/sysdate_is_now-master.opt''
mysql-test/t/sysdate_is_now.test:
New BitKeeper file ``mysql-test/t/sysdate_is_now.test''
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
w/o definer if --skip-grant-tables specified.
The previous patch does not allow to specify empty host name in
DEFINER-clause explicitly.
mysql-test/r/skip_grants.result:
Updated the result file.
mysql-test/r/view_grant.result:
Updated the result file.
mysql-test/t/skip_grants.test:
Added test cases for BUG#16777; re-organized tests.
mysql-test/t/view_grant.test:
Updated after final fix of BUG#16777.
sql/sql_parse.cc:
The final part of fixing BUG#16777: allow empty host name in explicitly
specified DEFINER-clause.
sql/sql_show.cc:
Quote an identifier if it is empty.
produce wrong data
By default Item_sp_func::val_str() returns string from it's result_field
internal buffer. When grouping is present Item_copy_string is used to
store SP function result, but it doesn't additionally buffer the result.
When the next record is read, internal buffer is overwritten, due to
this Item_copy_string::val_str() will have wrong data. Thus producing
weird query result.
The Item_func_sp::val_str() now makes a copy of returned value to prevent
occasional corruption.
mysql-test/t/sp.test:
Added test case for bug#13575: SP funcs in select with distinct/group and order by can
produce wrong data
mysql-test/r/sp.result:
Added test case for bug#13575: SP funcs in select with distinct/group and
order by can produce wrong data
sql/item_func.h:
Fixed bug#13575: SP funcs in select with distinct/group and order by can
produce wrong data
The Item_func_sp::val_str() now makes a copy of returned value to prevent
occasinal corruption.
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/rpl_ndb_blob.result:
Merge
mysql-test/t/disabled.def:
Merge
mysql-test/t/rpl_ndb_blob.test:
Merge
into calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/event_timed.cc:
Auto merged
into zim.(none):/home/brian/mysql/mysql-5.1-new
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
the '-E' or '--events' flag. (Closes Bug#16853 and Bug#17714.)
WARNING:
At present, these tests fail due to b*g number 18078.
client/mysqldump.c:
Added code to dump events, when asked to do so via the --events parameter.
Also cleaned up some surrounding code.
mysql-test/r/mysqldump.result:
Added a test to create an event, dump it, restore it, add more events, dump
all of them, and restore all of them.
mysql-test/t/mysqldump.test:
Added a test to create an event, dump it, restore it, add more events, dump
all of them, and restore all of them.
sql/event_timed.cc:
No longer qualify SHOW CREATE EVENT names with the database name.
BitKeeper/etc/ignore:
Removing accidentally 'ignored' bogus file entry.
into zim.(none):/home/brian/mysql/mysql-5.1-new
configure.in:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Makes you wonder what I am up to, doesn't?
configure.in:
Adjusts bison to not create symbols that clash.
sql/sql_analyse.cc:
Adding define to make sure sql_yacc.h gets included.
sql/sql_lex.cc:
Fixing it so that sql_yacc.h is included
sql/sql_lex.h:
Fixing include rules
sql/sql_parse.cc:
Adding flag to compile sql_yacc.yy
mysql-test/r/trigger-grant.result:
Updated the result file.
mysql-test/r/view_grant.result:
Updated the result file.
mysql-test/t/trigger-grant.test:
A patch for BUG#13198 has been merged, so need to update the test case.
mysql-test/t/view_grant.test:
A patch for BUG#16777 has been merged, so need to update the test case.
sql/sql_parse.cc:
After-merge fix (should have been a part of fix for BUG#16777).
sql/sql_show.cc:
After-merge fix -- empty identifier should be quoted.
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
client/mysqldump.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/rpl_ddl.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/rpl_trigger.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/rpl_trigger.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/lib/mtr_cases.pl:
Manually merged.
sql/sp.cc:
Manually merged.
sql/sql_yacc.yy:
Manually merged.
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
mysql-test/t/sp.test:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
Fix of merge conflict
Test fixes
mysql-test/r/binlog_stm_ctype_cp932.result:
Fixed result file
mysql-test/r/rpl_switch_stm_row_mixed.result:
Fixed result file
mysql-test/t/disabled.def:
Disabled test case
mysql-test/t/rpl_switch_stm_row_mixed.test:
Fix test
sql/handler.cc:
Fix to not replicate mysql.event table
sql/ha_ndbcluster_binlog.cc:
Bug #18106 Ndb: Online add index together with replication may cause mysqld core
- move initialization of Ndb share ndb_values from ndbcluster_binlog_open_table to
ndbcluster_binlog_init_share so that ndbcluster_binlog_open_table can be used for reinitializing
after frm change
- free table share on remote mysqld on online alter (call ndbcluster_binlog_close_table)
- free share before calling ndb_create_table_from_engine to be able to handle trailing share correctly
+ debug printouts
+ extra nulling of some variables
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Bug #18106 Ndb: Online add index together with replication may cause mysqld core
- reinitialize event operation rec attrs after online schema change
into mysql.com:/usr/home/bar/mysql-5.1-new.b16318
sql/item_xmlfunc.cc:
Auto merged
mysql-test/r/xml.result:
After merge fix
mysql-test/t/xml.test:
After merge fix
Post-merge patches.
mysql-test/t/disabled.def:
Disabling test that fails due to no-error patch.
sql/log_event.cc:
Using definite constant instead of machine-dependent constant.
Handling case where null_bytes can be zero.
sql/sql_base.cc:
Using definite constant instead of machine-dependent constant.
sql/sql_class.cc:
Using definite constant instead of machine-dependent constant.
sql/table.cc:
Using definite constant instead of machine-dependent constant.
-added setting up of binlogging after receiving rename table
+cleanup
mysql-test/r/ndb_binlog_ddl_multi.result:
Bug #17838 binlog not setup on seconday master after rename
mysql-test/t/ndb_binlog_ddl_multi.test:
Bug #17838 binlog not setup on seconday master after rename
mysql-test/include/show_binlog_events.inc:
New BitKeeper file ``mysql-test/include/show_binlog_events.inc''
Changes according to review comments.
sql/log.cc:
Moving a comment.
sql/log_event.cc:
Adding a note that the solution is a temporary solution.
sql/log_event.h:
Removing dead code.
sql/sql_class.cc:
Removing dead code. Adding a TODO comment.
Print a warning instead of error on failure to open non-existing table.
This is a temporary patch to prevent a bug in NDB from stopping the slave.
mysql-test/r/rpl_ndb_blob.result:
result change
mysql-test/t/disabled.def:
Disabling problematic tests.
mysql-test/t/rpl_ndb_blob.test:
Don't show binlog since it's not deterministic.
sql/log_event.cc:
Print a warning instead of error on failure to open non-existing table.
This is a temporary patch to prevent a bug in NDB from stopping the slave.
fixed test case from previous commit
mysql-test/r/ndb_lock.result:
fixed result file form previous commit
sql/ha_ndbcluster.cc:
cleanup of ndb invalidate dictionary cache
sql/ha_ndbcluster.h:
cleanup of ndb invalidate dictionary cache
