into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
Post-merge fix: replace xid=* with XID to isolate from number of transactions
mysql-test/r/binlog.result:
Post-merge fix: replace xid=* with XID to isolate from number of transactions
mysql-test/t/binlog.test:
Post-merge fix: replace xid=* with XID to isolate from number of transactions
Problem: Temporary buffer which is used for quoting and escaping
was initialized to character set utf8, and thus didn't allow
to store data in other character sets.
Fix: changing character set of the buffer to be able to
store any arbitrary sequence of bytes.
mysql-test/r/csv.result:
Adding test case
mysql-test/t/csv.test:
Adding test case
sql/examples/ha_tina.cc:
Changing character set of the buffer to "binary".
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/binlog.result:
Auto merged
mysql-test/r/have_log_bin.require:
Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test:
Auto merged
mysql-test/t/binlog.test:
Auto merged
mysql-test/t/ctype_cp932_binlog.test:
Auto merged
mysql-test/t/ctype_ucs_binlog.test:
Auto merged
mysql-test/t/flush_block_commit_notembedded.test:
Auto merged
mysql-test/t/insert_select-binlog.test:
Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/sp_trans.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
Use local
mysql-test/t/blackhole.test:
manual merge
mysql-test/t/drop_temp_table.test:
manual merge
mysql-test/t/mix_innodb_myisam_binlog.test:
Use local
mysql-test/t/mysqlbinlog.test:
Use local
In many cases, binaries can no longer dump core after calling setuid().
Where the PR_SET_DUMPABLE macro is set, use the prctl() system call
to tell the kernel that it's allowed to dump the core of the server.
configure.in:
Test system for "sys/prctl.h", to get access to prctl().
sql/mysqld.cc:
Add a process-control operation that tells the Linux kernel that it
is allowed to dump core after setuid().
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
client/mysqltest.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/innodb_mysql.result:
merging
mysql-test/t/innodb_mysql.test:
merging
sql/sql_select.cc:
merging
ndb/include/debugger/EventLogger.hpp:
add definition for new printLogEvent() function in CommandInterpreter.cpp
ndb/src/mgmclient/CommandInterpreter.cpp:
add a printLogEvent() function to print log event;
filter "<PING>" by ndb_logevent_get_next() in event_thread_run();
filter "<PING>" by ndb_logevent_get_next() in executeStartBackup();
and make executeStartBackup() same in both 5.0 and 5.1
ndb/src/mgmclient/Makefile.am:
add link to use ndb_logevent_get_next()
mysql-test/r/ndb_backup_print.result:
testcase result for ndb_backup_print
produced by mysql_test_run.pl
mysql-test/t/ndb_backup_print.test:
add testcase for ndb_mgm -e "start backup", check outupt format
SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
This solves embedded merge test failure.
mysql-test/r/merge.result:
BUG#26976 - Missing table in merge not noted in related error msg +
SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
sql/ha_myisammrg.cc:
BUG#26976 - Missing table in merge not noted in related error msg +
SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
