Changed --remote to --read-from-remote-server (mysqlbinlog)
client/mysqlbinlog.cc:
Changed --remote to --read-from-remote-server to make option more understandable
mysql-test/t/mysqlbinlog.test:
Fixed test case that --remote broke
BitKeeper/etc/logging_ok:
auto-union
mytest-old.c:
Merge rename: VC++Files/libmysqltest/mytest.c -> mytest-old.c
BitKeeper/deleted/.del-mysqlshutdown.c:
Delete: VC++Files/mysqlshutdown/mysqlshutdown.c
BitKeeper/deleted/.del-mysqlshutdown.rc:
Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc
BitKeeper/deleted/.del-mysqlwatch.c:
Delete: VC++Files/mysqlwatch/mysqlwatch.c
BitKeeper/deleted/.del-thr_test.c:
Delete: VC++Files/thr_test/thr_test.c
BitKeeper/deleted/.del-make_win_src_distribution.sh:
Delete: scripts/make_win_src_distribution.sh
BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d:
Auto merged
BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74:
Auto merged
BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365:
Auto merged
BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e:
Auto merged
BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477:
Auto merged
BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131:
Auto merged
BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4:
Auto merged
BitKeeper/deleted/.del-Default.rge~2218627c2a901409:
Auto merged
BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9:
Auto merged
BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28:
Auto merged
BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81:
Auto merged
BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90:
Auto merged
BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e:
Auto merged
BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903:
Auto merged
BitKeeper/deleted/.del-Servers.fgl~36147accb82f759:
Auto merged
BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34:
Auto merged
BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722:
Auto merged
BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e:
Auto merged
BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6:
Auto merged
BitKeeper/deleted/.del-Setup.rul~14510a994d515f19:
Auto merged
BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a:
Auto merged
BitKeeper/deleted/.del-infolist.txt~58b203247936d266:
Auto merged
BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97:
Auto merged
BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d:
Auto merged
BitKeeper/deleted/.del-value.shl~98c2851db96b919e:
Auto merged
BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d:
Auto merged
configure.in:
Merge with 3.23.58 (Keep old code)
sql/slave.cc:
Merge with 3.23.58 (Keep old code)
sql/sql_parse.cc:
Merge with 3.23.58 (Keep old code)
Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice
innobase/row/row0mysql.c:
Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice
Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it
by moving the test for corruption to Start_log_event::exec_event().
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
I did a separate commit in 4.1 (so this should not be merged to 4.0) because
code is a bit different in 4.1.
A test to see if the slave detects when the master died while writing a
transaction to the binlog (uses a forged truncated binlog I made).
sql/log_event.cc:
When the I/O thread was stopped while copying a long transaction, and restarted,
Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it
by moving the test for corruption to Start_log_event::exec_event().
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
Use forced close of socket to make mysqld shutdown faster when used under valgrind
mysql-test/mysql-test-run.sh:
Added --skip-bdb for valgrind
mysql-test/r/user_var.result:
Extended test for user variables
mysql-test/t/user_var.test:
Extended test for user variables
sql/item_func.cc:
Optimized code for setting user variables with := and fixed some bugs in old code
sql/item_func.h:
Optimized code for setting user variables
sql/log.cc:
Fixed comments
sql/mysqld.cc:
Use forced close of socket to make mysqld shutdown faster when used under valgrind
sql/sql_class.h:
Optimized code for setting user variables
is involving an assembly function.
Testcase was BUG#1194
SELECT @a:=1; SELECT @a, @a:=1;
BUILD/compile-pentium-valgrind-max:
a warning note about Valgrind&assembly.
(a missing synchronization in the test)
mysql-test/r/drop_temp_table.result:
result update
mysql-test/t/drop_temp_table.test:
synchronize to be sure that the ending connection has finished binlogging.
client/mysqltest.c:
Now resetting replace_result patterns after --exec command (in order to be consistent with ordinary query execution).
mysql-test/t/mysqlbinlog.test:
Added additional replaces potentially needed after adding reset of replace conditions for exec
from ulong to ulonglong by defining -DBIG_JOINS
sql/mysql_priv.h:
- enable changing the number of table bits for JOINs to be increased
from ulong to ulonglong by defining BIG_JOINS
Add quoting for use `database` for mysqlbinlog
Removed test ins0000001
Add support for --replace for exec in mysqltest
Don't refer to install dir in mysqlbinlog.result
BitKeeper/deleted/.del-ins000001.result~f45c599efdf8352b:
Delete: mysql-test/r/ins000001.result
BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483:
Delete: mysql-test/t/ins000001.test
client/mysqlbinlog.cc:
Removed random chars after filename for LOAD DATA INFILE
client/mysqltest.c:
Add support for --replace for 'exec'
mysql-test/r/drop_temp_table.result:
Updated results after quoting change
mysql-test/r/fulltext_multi.result:
Updated results after quoting change
mysql-test/r/fulltext_order_by.result:
Updated results after quoting change
mysql-test/r/insert.result:
New tests
mysql-test/r/insert_select.result:
Updated results after quoting change
mysql-test/r/mix_innodb_myisam_binlog.result:
Updated results after quoting change
mysql-test/r/mysqlbinlog.result:
Updated results after quoting change
mysql-test/r/rpl_log.result:
Updated results after quoting change
mysql-test/t/fulltext_multi.test:
Remove 'use'
mysql-test/t/fulltext_order_by.test:
Remove 'use'
mysql-test/t/insert.test:
Merge test with ins0000001.test
mysql-test/t/mysqlbinlog.test:
Don't refer to install dir in result
sql/log_event.cc:
Add quoting for use `database` for mysqlbinlog
support-files/mysql.server.sh:
Move pid_file test after arguments have been parsed
it's just backquoting the db's and table's names
when writing DROP TEMPORARY TABLE to the binlog when a connection ends.
A testcase for this.
sql/sql_base.cc:
backquote db and table name when writing DROP TEMPORARY TABLE to the binlog
when a connection ends.
I am almost sure this is the cause for
BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries?
BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris)
The reason why I think it's wrong is that the normal client code has
uint32 ip_addr.
(of course on 32-bit machines it does not matter, but on 64-bit it does).
the calls of external programs "uname" and "pwd" with Perl builtin
functions "cwd()" and "POSIX::uname()"
sql-bench/as3ap.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/bench-count-distinct.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/bench-init.pl.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
- portability fix: don't call external "uname" in various combinations,
use POSIX::uname() instead.
sql-bench/copy-db.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/crash-me.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
- portability fix: don't call external "uname" in various combinations,
use POSIX::uname() instead.
sql-bench/innotest1.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/innotest1a.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/innotest1b.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/innotest2.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/innotest2a.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/innotest2b.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/run-all-tests.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/test-ATIS.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/test-alter-table.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/test-big-tables.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/test-connect.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/test-create.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/test-insert.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/test-select.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/test-transactions.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
sql-bench/test-wisconsin.sh:
- portability fix: don't call external "pwd" command, use the "cwd()"
builtin function instead.
"If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files"
(the bug is in the master)
mysql-test/r/rpl_loaddata.result:
result update
mysql-test/std_data/rpl_loaddata2.dat:
change to introduce a unique key violation
mysql-test/t/rpl_loaddata.test:
testcase for bug#1391.
sql/sql_load.cc:
fix for bug#1391:
for a small file, we had in the binlog only the Create_file, not the Delete_file
(the Create_file was written when the READ_INFO was destroyed).
