into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/t/join.test:
Auto merged
use $MAX_TABLES mysqltest variable to make join test portable
make test now works with the manager on IA64 Linux
client/mysqltest.c:
added MAX_TABLES variable
libmysql/libmysql.c:
portability fixes for 64-bit systems
mysql-test/mysql-test-run.sh:
fixed bug - wrong values of -display in xterm in gdb mode
mysql-test/r/join.result:
make test work on both 32-bit and 64-bit systems
mysql-test/t/join.test:
make test work on both 32-bit and 64-bit systems
sql/mini_client.cc:
64-bit portability fixes
sql/mini_client.h:
64-bit portability fixes
sql/slave.cc:
64-bit portability fixes
tools/mysqlmanager.c:
64-bit portability fixes
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
BitKeeper/etc/ignore:
auto-union
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/fulltext_order_by.result:
Auto merged
mysql-test/r/fulltext_multi.result:
Auto merged
mysql-test/r/fulltext_cache.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/r/fulltext_left_join.result:
Auto merged
sql/handler.h:
Auto merged
fixed bug in master - unregister slaves when they disconnect
client/mysqlmanagerc.c:
changed default port
include/mysql.h:
use my_net_*
libmysql/manager.c:
use my_net_*
mysql-test/mysql-test-run.sh:
added support for client strace
sql/sql_parse.cc:
unregister slaves on disconnect
sql/sql_repl.cc:
unregister slaves on disconnect
sql/sql_repl.h:
unregister slaves on disconnect
tools/mysqlmanager.c:
changed to use my_net_*
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
mysql-test/r/rpl_failsafe.result:
Auto merged
mysql-test/t/rpl_failsafe.test:
Auto merged
mysql-test/t/rpl000018.test:
Auto merged
a bit more work on failsafe replication
client/mysqltest.c:
added require_manager support
mysql-test/mysql-test-run.sh:
added --no-manager
mysql-test/r/rpl_failsafe.result:
updated result
mysql-test/t/rpl000018.test:
must have manager
mysql-test/t/rpl_failsafe.test:
must have manager
sql/repl_failsafe.cc:
more work
sql/repl_failsafe.h:
more work
sql/slave.cc:
update replication status for fail-safe replication on different events
client/mysqlmanagerc.c:
Only use needed include files
libmysql/manager.c:
cleanup include files
scripts/make_binary_distribution.sh:
Fixed wrong filename
sql/mysqld.cc:
cleanup
tools/mysqlmanager.c:
Read with retrys
Docs/manual.texi:
Added info to foreign key section.
BitKeeper/etc/ignore:
Added libmysqld/repl_failsafe.cc to the ignore list
libmysqld/Makefile.am:
Added missing files
mysql-test/r/innodb.result:
Fixed explain results after new innodb optimizations
support-files/mysql.spec.sh:
Added missing files
BitKeeper/etc/logging_ok:
auto-union
sql/handler.cc:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
sql/sql_table.cc:
Auto merged
Fixed bug with long log-filenames in Innobase.
mysql-test/r/select.result:
Turn off SCCS flag
mysql-test/t/alias.test:
Turn off SCCS flag
mysql-test/t/backup.test:
Turn off SCCS flag
mysql-test/t/bdb-crash.test:
Turn off SCCS flag
mysql-test/t/bench_count_distinct.test:
Turn off SCCS flag
mysql-test/t/bulk_replace.test:
Turn off SCCS flag
mysql-test/t/check.test:
Turn off SCCS flag
mysql-test/t/count_distinct2-master.opt:
Turn off SCCS flag
mysql-test/t/count_distinct2.test:
Turn off SCCS flag
mysql-test/t/dirty-close.test:
Turn off SCCS flag
mysql-test/t/drop.test:
Turn off SCCS flag
mysql-test/t/flush.test:
Turn off SCCS flag
mysql-test/t/fulltext_cache.test:
Turn off SCCS flag
mysql-test/t/fulltext_distinct.test:
Turn off SCCS flag
mysql-test/t/fulltext_left_join.test:
Turn off SCCS flag
mysql-test/t/fulltext_update.test:
Turn off SCCS flag
mysql-test/t/fulltext_var.test:
Turn off SCCS flag
mysql-test/t/handler.test:
Turn off SCCS flag
mysql-test/t/having.test:
Turn off SCCS flag
mysql-test/t/innodb.test:
Turn off SCCS flag
mysql-test/t/join_crash.test:
Turn off SCCS flag
mysql-test/t/kill.test:
Turn off SCCS flag
mysql-test/t/lock.test:
Turn off SCCS flag
mysql-test/t/multi_update.test:
Turn off SCCS flag
mysql-test/t/myisam.test:
Turn off SCCS flag
mysql-test/t/openssl_1.test:
Turn off SCCS flag
mysql-test/t/openssl_2.test:
Turn off SCCS flag
mysql-test/t/order_fill_sortbuf-master.opt:
Turn off SCCS flag
mysql-test/t/order_fill_sortbuf.test:
Turn off SCCS flag
mysql-test/t/overflow.test:
Turn off SCCS flag
mysql-test/t/rpl000007-slave.opt:
Turn off SCCS flag
mysql-test/t/rpl000008-slave.opt:
Turn off SCCS flag
mysql-test/t/rpl000009-slave.opt:
Turn off SCCS flag
mysql-test/t/rpl000010-slave.opt:
Turn off SCCS flag
mysql-test/t/rpl000013-slave.opt:
Turn off SCCS flag
mysql-test/t/rpl000015-slave-master-info.opt:
Turn off SCCS flag
mysql-test/t/rpl000015-slave.sh:
Turn off SCCS flag
mysql-test/t/rpl000016-master.opt:
Turn off SCCS flag
mysql-test/t/rpl000016-slave-master-info.opt:
Turn off SCCS flag
mysql-test/t/rpl000016-slave.sh:
Turn off SCCS flag
mysql-test/t/rpl000017-slave.opt:
Turn off SCCS flag
mysql-test/t/rpl000017-slave.sh:
Turn off SCCS flag
mysql-test/t/rpl000017.test:
Turn off SCCS flag
mysql-test/t/rpl000018-master.opt:
Turn off SCCS flag
mysql-test/t/rpl000018-slave.opt:
Turn off SCCS flag
mysql-test/t/rpl000018.test:
Turn off SCCS flag
mysql-test/t/rpl_log.test:
Turn off SCCS flag
mysql-test/t/rpl_magic.test:
Turn off SCCS flag
mysql-test/t/rpl_mystery22.test:
Turn off SCCS flag
mysql-test/t/rpl_sporadic_master-master.opt:
Turn off SCCS flag
mysql-test/r/alias.result:
Turn off SCCS flag
mysql-test/r/backup.result:
Turn off SCCS flag
mysql-test/r/bdb-crash.result:
Turn off SCCS flag
mysql-test/r/bench_count_distinct.result:
Turn off SCCS flag
mysql-test/r/big_test.require:
Turn off SCCS flag
mysql-test/r/bulk_replace.result:
Turn off SCCS flag
mysql-test/r/check.result:
Turn off SCCS flag
mysql-test/r/count_distinct2.result:
Turn off SCCS flag
mysql-test/r/dirty-close.result:
Turn off SCCS flag
mysql-test/r/drop.result:
Turn off SCCS flag
mysql-test/r/flush.result:
Turn off SCCS flag
mysql-test/r/fulltext_cache.result:
Turn off SCCS flag
mysql-test/r/fulltext_distinct.result:
Turn off SCCS flag
mysql-test/r/fulltext_left_join.result:
Turn off SCCS flag
mysql-test/r/fulltext_multi.result:
Turn off SCCS flag
mysql-test/r/fulltext_order_by.result:
Turn off SCCS flag
mysql-test/r/fulltext_update.result:
Turn off SCCS flag
mysql-test/r/fulltext_var.result:
Turn off SCCS flag
mysql-test/r/func_timestamp.result:
Turn off SCCS flag
mysql-test/t/rpl_sporadic_master.test:
Turn off SCCS flag
mysql-test/t/select_found.test:
Turn off SCCS flag
mysql-test/t/status.test:
Turn off SCCS flag
mysql-test/t/symlink.test:
Turn off SCCS flag
mysql-test/t/type_decimal.test:
Turn off SCCS flag
mysql-test/t/union.test:
Turn off SCCS flag
mysql-test/t/user_var.test:
Turn off SCCS flag
mysql-test/r/handler.result:
Turn off SCCS flag
mysql-test/r/have_bdb.require:
Turn off SCCS flag
mysql-test/r/have_innodb.require:
Turn off SCCS flag
mysql-test/r/have_isam.require:
Turn off SCCS flag
mysql-test/r/have_openssl.require:
Turn off SCCS flag
mysql-test/r/have_openssl_1.require:
Turn off SCCS flag
mysql-test/r/have_openssl_2.require:
Turn off SCCS flag
mysql-test/r/have_raid.require:
Turn off SCCS flag
mysql-test/r/have_symlink.require:
Turn off SCCS flag
mysql-test/r/having.result:
Turn off SCCS flag
mysql-test/r/innodb.result:
Turn off SCCS flag
mysql-test/r/join_crash.result:
Turn off SCCS flag
mysql-test/r/kill.result:
Turn off SCCS flag
mysql-test/r/lock.result:
Turn off SCCS flag
mysql-test/r/multi_update.result:
Turn off SCCS flag
mysql-test/r/myisam.result:
Turn off SCCS flag
mysql-test/r/openssl_1.result:
Turn off SCCS flag
mysql-test/r/openssl_2.result:
Turn off SCCS flag
mysql-test/r/order_fill_sortbuf.result:
Turn off SCCS flag
mysql-test/r/rpl000001.result:
Turn off SCCS flag
mysql-test/r/rpl000004.result:
Turn off SCCS flag
mysql-test/r/rpl000017.result:
Turn off SCCS flag
mysql-test/r/rpl000018.result:
Turn off SCCS flag
mysql-test/r/rpl_log.result:
Turn off SCCS flag
mysql-test/r/rpl_magic.result:
Turn off SCCS flag
mysql-test/r/rpl_mystery22.result:
Turn off SCCS flag
mysql-test/r/rpl_sporadic_master.result:
Turn off SCCS flag
mysql-test/r/select_found.result:
Turn off SCCS flag
mysql-test/r/status.result:
Turn off SCCS flag
mysql-test/r/symlink.result:
Turn off SCCS flag
mysql-test/r/type_decimal.result:
Turn off SCCS flag
mysql-test/r/union.result:
Turn off SCCS flag
mysql-test/r/user_var.result:
Turn off SCCS flag
Docs/manual.texi:
Fixed typo.
innobase/log/log0log.c:
Fixed too short filename buffer.
mysys/mf_sort.c:
Ensure that radix isn't used for VERY big arrrays.
scripts/make_binary_distribution.sh:
Add mysqlmanager-pwgen and mysqlmanagerc into binary distribution.
sql-bench/test-insert.sh:
Time out update_with_key_prefix
sql/ha_innobase.cc:
Use current directory as base dir, if we are not using the embedded version.
tools/mysqlmanager.c:
Portability fix
mysqltest can run without connecting to the manager for tests that do not
require manager operations
client/mysqltest.c:
make mysqltest work without having to connect to the manager
mysql-test/mysql-test-run.sh:
init-rpl-role option to servers
pass manager-host to mysqltest
mysql-test/r/rpl_failsafe.result:
updated result
mysql-test/t/rpl_failsafe.test:
check for Rpl_status
sql/mysqld.cc:
fixed bad merge
sql/repl_failsafe.cc:
fixed bug
sql/repl_failsafe.h:
fixed compile error
sql/sql_show.cc:
fixed compile error
Add mysqlmanager to binary distribution.
Build-tools/Do-compile:
Always build thread safe client libraries.
Docs/manual.texi:
More info about SET
client/mysqldump.c:
Cleanup
scripts/make_binary_distribution.sh:
Add mysqlmanager
support-files/mysql.spec.sh:
Added mysqlmanager to RPM
ut0ut.c Merge changes in InnoDB-3.23.43b
trx0purge.c Merge changes in InnoDB-3.23.43b
trx0rec.c Merge changes in InnoDB-3.23.43b
trx0trx.c Merge changes in InnoDB-3.23.43b
trx0undo.c Merge changes in InnoDB-3.23.43b
thr0loc.c Merge changes in InnoDB-3.23.43b
sync0arr.c Merge changes in InnoDB-3.23.43b
sync0rw.c Merge changes in InnoDB-3.23.43b
sync0sync.c Merge changes in InnoDB-3.23.43b
srv0srv.c Merge changes in InnoDB-3.23.43b
srv0start.c Merge changes in InnoDB-3.23.43b
row0ins.c Merge changes in InnoDB-3.23.43b
row0mysql.c Merge changes in InnoDB-3.23.43b
row0purge.c Merge changes in InnoDB-3.23.43b
row0sel.c Merge changes in InnoDB-3.23.43b
row0umod.c Merge changes in InnoDB-3.23.43b
row0upd.c Merge changes in InnoDB-3.23.43b
row0vers.c Merge changes in InnoDB-3.23.43b
rem0cmp.c Merge changes in InnoDB-3.23.43b
que0que.c Merge changes in InnoDB-3.23.43b
pars0opt.c Merge changes in InnoDB-3.23.43b
pars0pars.c Merge changes in InnoDB-3.23.43b
lexyy.c Merge changes in InnoDB-3.23.43b
pars0grm.c Merge changes in InnoDB-3.23.43b
page0page.c Merge changes in InnoDB-3.23.43b
os0file.c Merge changes in InnoDB-3.23.43b
mtr0log.c Merge changes in InnoDB-3.23.43b
mem0pool.c Merge changes in InnoDB-3.23.43b
log0log.c Merge changes in InnoDB-3.23.43b
log0recv.c Merge changes in InnoDB-3.23.43b
lock0lock.c Merge changes in InnoDB-3.23.43b
ibuf0ibuf.c Merge changes in InnoDB-3.23.43b
fil0fil.c Merge changes in InnoDB-3.23.43b
dict0crea.c Merge changes in InnoDB-3.23.43b
dict0dict.c Merge changes in InnoDB-3.23.43b
dict0load.c Merge changes in InnoDB-3.23.43b
dict0mem.c Merge changes in InnoDB-3.23.43b
data0data.c Merge changes in InnoDB-3.23.43b
data0type.c Merge changes in InnoDB-3.23.43b
buf0buf.c Merge changes in InnoDB-3.23.43b
buf0lru.c Merge changes in InnoDB-3.23.43b
btr0btr.c Merge changes in InnoDB-3.23.43b
btr0cur.c Merge changes in InnoDB-3.23.43b
btr0pcur.c Merge changes in InnoDB-3.23.43b
btr0sea.c Merge changes in InnoDB-3.23.43b
data0type.ic Merge changes in InnoDB-3.23.43b
dict0dict.ic Merge changes in InnoDB-3.23.43b
mtr0mtr.ic Merge changes in InnoDB-3.23.43b
row0upd.ic Merge changes in InnoDB-3.23.43b
sync0ipm.ic Merge changes in InnoDB-3.23.43b
sync0rw.ic Merge changes in InnoDB-3.23.43b
sync0sync.ic Merge changes in InnoDB-3.23.43b
trx0rseg.ic Merge changes in InnoDB-3.23.43b
btr0pcur.ic Merge changes in InnoDB-3.23.43b
buf0buf.ic Merge changes in InnoDB-3.23.43b
data0data.ic Merge changes in InnoDB-3.23.43b
row0upd.h Merge changes in InnoDB-3.23.43b
srv0srv.h Merge changes in InnoDB-3.23.43b
sync0arr.h Merge changes in InnoDB-3.23.43b
sync0rw.h Merge changes in InnoDB-3.23.43b
sync0sync.h Merge changes in InnoDB-3.23.43b
trx0trx.h Merge changes in InnoDB-3.23.43b
ut0mem.h Merge changes in InnoDB-3.23.43b
data0data.h Merge changes in InnoDB-3.23.43b
data0type.h Merge changes in InnoDB-3.23.43b
db0err.h Merge changes in InnoDB-3.23.43b
dict0crea.h Merge changes in InnoDB-3.23.43b
dict0dict.h Merge changes in InnoDB-3.23.43b
dict0load.h Merge changes in InnoDB-3.23.43b
dict0mem.h Merge changes in InnoDB-3.23.43b
dict0types.h Merge changes in InnoDB-3.23.43b
fil0fil.h Merge changes in InnoDB-3.23.43b
ibuf0ibuf.h Merge changes in InnoDB-3.23.43b
lock0lock.h Merge changes in InnoDB-3.23.43b
log0log.h Merge changes in InnoDB-3.23.43b
mtr0mtr.h Merge changes in InnoDB-3.23.43b
rem0cmp.h Merge changes in InnoDB-3.23.43b
row0ins.h Merge changes in InnoDB-3.23.43b
row0mysql.h Merge changes in InnoDB-3.23.43b
btr0cur.h Merge changes in InnoDB-3.23.43b
btr0pcur.h Merge changes in InnoDB-3.23.43b
btr0sea.h Merge changes in InnoDB-3.23.43b
buf0buf.h Merge changes in InnoDB-3.23.43b
sql_table.cc Merge changes in InnoDB-3.23.43b
sql_db.cc Merge changes in InnoDB-3.23.43b
ha_innobase.cc Merge changes in InnoDB-3.23.43b
handler.cc Merge changes in InnoDB-3.23.43b
ha_innobase.h Merge changes in InnoDB-3.23.43b
handler.h Merge changes in InnoDB-3.23.43b
sql/ha_innobase.h:
Merge changes in InnoDB-3.23.43b
sql/handler.h:
Merge changes in InnoDB-3.23.43b
sql/ha_innobase.cc:
Merge changes in InnoDB-3.23.43b
sql/handler.cc:
Merge changes in InnoDB-3.23.43b
sql/sql_db.cc:
Merge changes in InnoDB-3.23.43b
sql/sql_table.cc:
Merge changes in InnoDB-3.23.43b
innobase/include/btr0cur.h:
Merge changes in InnoDB-3.23.43b
innobase/include/btr0pcur.h:
Merge changes in InnoDB-3.23.43b
innobase/include/btr0sea.h:
Merge changes in InnoDB-3.23.43b
innobase/include/buf0buf.h:
Merge changes in InnoDB-3.23.43b
innobase/include/data0data.h:
Merge changes in InnoDB-3.23.43b
innobase/include/data0type.h:
Merge changes in InnoDB-3.23.43b
innobase/include/db0err.h:
Merge changes in InnoDB-3.23.43b
innobase/include/dict0crea.h:
Merge changes in InnoDB-3.23.43b
innobase/include/dict0dict.h:
Merge changes in InnoDB-3.23.43b
innobase/include/dict0load.h:
Merge changes in InnoDB-3.23.43b
innobase/include/dict0mem.h:
Merge changes in InnoDB-3.23.43b
innobase/include/dict0types.h:
Merge changes in InnoDB-3.23.43b
innobase/include/fil0fil.h:
Merge changes in InnoDB-3.23.43b
innobase/include/ibuf0ibuf.h:
Merge changes in InnoDB-3.23.43b
innobase/include/lock0lock.h:
Merge changes in InnoDB-3.23.43b
innobase/include/log0log.h:
Merge changes in InnoDB-3.23.43b
innobase/include/mtr0mtr.h:
Merge changes in InnoDB-3.23.43b
innobase/include/rem0cmp.h:
Merge changes in InnoDB-3.23.43b
innobase/include/row0ins.h:
Merge changes in InnoDB-3.23.43b
innobase/include/row0mysql.h:
Merge changes in InnoDB-3.23.43b
innobase/include/row0upd.h:
Merge changes in InnoDB-3.23.43b
innobase/include/srv0srv.h:
Merge changes in InnoDB-3.23.43b
innobase/include/sync0arr.h:
Merge changes in InnoDB-3.23.43b
innobase/include/sync0rw.h:
Merge changes in InnoDB-3.23.43b
innobase/include/sync0sync.h:
Merge changes in InnoDB-3.23.43b
innobase/include/trx0trx.h:
Merge changes in InnoDB-3.23.43b
innobase/include/ut0mem.h:
Merge changes in InnoDB-3.23.43b
innobase/include/btr0pcur.ic:
Merge changes in InnoDB-3.23.43b
innobase/include/buf0buf.ic:
Merge changes in InnoDB-3.23.43b
innobase/include/data0data.ic:
Merge changes in InnoDB-3.23.43b
innobase/include/data0type.ic:
Merge changes in InnoDB-3.23.43b
innobase/include/dict0dict.ic:
Merge changes in InnoDB-3.23.43b
innobase/include/mtr0mtr.ic:
Merge changes in InnoDB-3.23.43b
innobase/include/row0upd.ic:
Merge changes in InnoDB-3.23.43b
innobase/include/sync0ipm.ic:
Merge changes in InnoDB-3.23.43b
innobase/include/sync0rw.ic:
Merge changes in InnoDB-3.23.43b
innobase/include/sync0sync.ic:
Merge changes in InnoDB-3.23.43b
innobase/include/trx0rseg.ic:
Merge changes in InnoDB-3.23.43b
innobase/btr/btr0btr.c:
Merge changes in InnoDB-3.23.43b
innobase/btr/btr0cur.c:
Merge changes in InnoDB-3.23.43b
innobase/btr/btr0pcur.c:
Merge changes in InnoDB-3.23.43b
innobase/btr/btr0sea.c:
Merge changes in InnoDB-3.23.43b
innobase/buf/buf0buf.c:
Merge changes in InnoDB-3.23.43b
innobase/buf/buf0lru.c:
Merge changes in InnoDB-3.23.43b
innobase/data/data0data.c:
Merge changes in InnoDB-3.23.43b
innobase/data/data0type.c:
Merge changes in InnoDB-3.23.43b
innobase/dict/dict0crea.c:
Merge changes in InnoDB-3.23.43b
innobase/dict/dict0dict.c:
Merge changes in InnoDB-3.23.43b
innobase/dict/dict0load.c:
Merge changes in InnoDB-3.23.43b
innobase/dict/dict0mem.c:
Merge changes in InnoDB-3.23.43b
innobase/fil/fil0fil.c:
Merge changes in InnoDB-3.23.43b
innobase/ibuf/ibuf0ibuf.c:
Merge changes in InnoDB-3.23.43b
innobase/lock/lock0lock.c:
Merge changes in InnoDB-3.23.43b
innobase/log/log0log.c:
Merge changes in InnoDB-3.23.43b
innobase/log/log0recv.c:
Merge changes in InnoDB-3.23.43b
innobase/mem/mem0pool.c:
Merge changes in InnoDB-3.23.43b
innobase/mtr/mtr0log.c:
Merge changes in InnoDB-3.23.43b
innobase/os/os0file.c:
Merge changes in InnoDB-3.23.43b
innobase/page/page0page.c:
Merge changes in InnoDB-3.23.43b
innobase/pars/lexyy.c:
Merge changes in InnoDB-3.23.43b
innobase/pars/pars0grm.c:
Merge changes in InnoDB-3.23.43b
innobase/pars/pars0opt.c:
Merge changes in InnoDB-3.23.43b
innobase/pars/pars0pars.c:
Merge changes in InnoDB-3.23.43b
innobase/que/que0que.c:
Merge changes in InnoDB-3.23.43b
innobase/rem/rem0cmp.c:
Merge changes in InnoDB-3.23.43b
innobase/row/row0ins.c:
Merge changes in InnoDB-3.23.43b
innobase/row/row0mysql.c:
Merge changes in InnoDB-3.23.43b
innobase/row/row0purge.c:
Merge changes in InnoDB-3.23.43b
innobase/row/row0sel.c:
Merge changes in InnoDB-3.23.43b
innobase/row/row0umod.c:
Merge changes in InnoDB-3.23.43b
innobase/row/row0upd.c:
Merge changes in InnoDB-3.23.43b
innobase/row/row0vers.c:
Merge changes in InnoDB-3.23.43b
innobase/srv/srv0srv.c:
Merge changes in InnoDB-3.23.43b
innobase/srv/srv0start.c:
Merge changes in InnoDB-3.23.43b
innobase/sync/sync0arr.c:
Merge changes in InnoDB-3.23.43b
innobase/sync/sync0rw.c:
Merge changes in InnoDB-3.23.43b
innobase/sync/sync0sync.c:
Merge changes in InnoDB-3.23.43b
innobase/thr/thr0loc.c:
Merge changes in InnoDB-3.23.43b
innobase/trx/trx0purge.c:
Merge changes in InnoDB-3.23.43b
innobase/trx/trx0rec.c:
Merge changes in InnoDB-3.23.43b
innobase/trx/trx0trx.c:
Merge changes in InnoDB-3.23.43b
innobase/trx/trx0undo.c:
Merge changes in InnoDB-3.23.43b
innobase/ut/ut0mem.c:
Merge changes in InnoDB-3.23.43b
innobase/ut/ut0ut.c:
Merge changes in InnoDB-3.23.43b
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
include/my_global.h:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
myself a run of compile-pentium-debug. I have not even tried to compile the
new code
sql/Makefile.am:
added repl_failsafe.*
sql/mysqld.cc:
added Rpl_status
sql/sql_show.cc:
added rpl_status
sql/structs.h:
rpl_status
mysql-test/mysql-test-run.sh:
start three slaves in failover test
mysql-test/r/rpl_failsafe.result:
check two more slaves
mysql-test/t/rpl_failsafe.test:
check two more slaves
Build-tools/Do-compile:
Fix for new mysqlmanager
Build-tools/Do-rpm:
Make build safer
Docs/manual.texi:
Cleanup limitations section
tools/mysqlmanager.c:
Cleanup used include files
BUILD/compile-pentium-pgcc:
Update to 4.0
Docs/manual.texi:
Added info about --with-embedded-server
libmysqld/Makefile.am:
Don't depend on mit-pthreads include files
tools/mysqlmanager.c:
Remove warnings
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-ft_search.c~c011cb6e8041bb59:
the file is deleted anyway
include/my_global.h:
merder
myisam/ft_boolean_search.c:
huh?
mysql-test/r/fulltext.result:
use local
mysql-test/r/fulltext_cache.result:
ur
mysql-test/r/fulltext_left_join.result:
ur
mysql-test/r/fulltext_multi.result:
ur
mysql-test/r/fulltext_order_by.result:
ur
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
mysql-test/r/drop.result:
Auto merged
mysql-test/r/err000001.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/overflow.result:
Auto merged
Do-rpm remove the file before doing a cp
Do-rpm print out the log file name
Build-tools/Do-rpm:
remove the file before doing a cp
print out the log file name
support-files/mysql.spec.sh:
fix typo in embedded section
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
Portability fixes.
Docs/manual.texi:
Updated upgrading from 3.23 -> 4.0
client/mysqladmin.c:
Portability fixes
client/mysqlshow.c:
Portability fixes
extra/resolveip.c:
Portability fixes
include/my_global.h:
Portability fixes
include/my_net.h:
One should not only have to include my_net.h to work with sockets.
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
include/mysql_com.h:
Portability fixes
libmysql/net.c:
Portability fixes
libmysqld/lib_vio.c:
Portability fixes
mysql-test/r/drop.result:
Fix crashed tests
mysql-test/r/err000001.result:
Fix crashed tests
mysql-test/r/innodb.result:
Fix crashed tests
mysql-test/r/overflow.result:
Fix crashed tests
sql/net_serv.cc:
Use new my_net.h
vio/vio.c:
Use new my_net.h
vio/viosocket.c:
Use new my_net.h
vio/viossl.c:
Use new my_net.h
Docs/manual.texi:
Removed wrong web links
include/mysql_com.h:
Portability fix
libmysqld/Makefile.am:
Fix 'make dist'
mysys/mf_dirname.c:
Bugfix for last push
scripts/explain_log.sh:
Nicer output
scripts/mysql_install_db.sh:
Removed warnings when using 'mysql_install_db'
sql/sql_parse.cc:
Ensure that thd->query_length is always set
sql/sql_show.cc:
cleanup
sql/sql_yacc.yy:
Fix bug in last push
vio/vio.c:
Merge with violite.cc
vio/viosocket.c:
Merge with violite.cc
