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
into moonbone.local:/work/17726-bug-5.1-new-mysql
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_cmpfunc.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.
mysql-test/r/rpl_ndb_blob.result:
test case for varsize PK + blob
mysql-test/t/rpl_ndb_blob.test:
test case for varsize PK + blob
storage/ndb/include/ndbapi/NdbBlob.hpp:
table PK in blob part key is fixed-sized so keep extra bytes zero if varsize PK
storage/ndb/src/ndbapi/NdbBlob.cpp:
table PK in blob part key is fixed-sized so keep extra bytes zero if varsize PK
Updated results
rpl_ndb_dd_advance.test:
Updated test case from comments in Tomas's review
Changes bug number comment
mysql-test/t/rpl_ndb_dd_advance.test:
Updated test case from comments in Tomas's review
mysql-test/r/rpl_ndb_dd_advance.result:
Updated results
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
storage/ndb/include/ndbapi/NdbBlob.hpp:
fast fix bug#18075
storage/ndb/include/ndbapi/NdbOperation.hpp:
fast fix bug#18075
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
fast fix bug#18075
storage/ndb/src/ndbapi/NdbBlob.cpp:
fast fix bug#18075
storage/ndb/src/ndbapi/NdbBlobImpl.hpp:
fast fix bug#18075
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
fast fix bug#18075
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
fast fix bug#18075
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
fast fix bug#18075
storage/ndb/src/ndbapi/ndberror.c:
fast fix bug#18075
storage/ndb/test/ndbapi/testBlobs.cpp:
fast fix bug#18075
into neptunus.(none):/home/msvensson/mysql/bug10656/my51-bug10656
mysql-test/r/sp.result:
Auto merged
mysql-test/r/sp_trans.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
-Add test case
Move testcase that needs innodb from sp.test => sp_trans.test
mysql-test/r/sp.result:
Move test cases tyhat requires innodb to sp_trans.test
mysql-test/r/sp_trans.result:
Move test cases tyhat requires innodb to sp_trans.test
Add test case for bug#10656
mysql-test/t/sp.test:
Move test cases tyhat requires innodb to sp_trans.test
mysql-test/t/sp_trans.test:
Add test case for bug#10656
Move test cases that require innodb to sp_trans.test
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
