BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/russian/errmsg.txt:
merged (partially translated)
include/ft_global.h:
I have to checkin to be able to pull
myisam/ft_boolean_search.c:
I have to checkin to be able to pull
myisam/ft_nlq_search.c:
I have to checkin to be able to pull
myisam/ftdefs.h:
I have to checkin to be able to pull
sql/item_func.cc:
I have to checkin to be able to pull
sql/item_func.h:
I have to checkin to be able to pull
Docs/manual.texi:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/null.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/slave.cc:
keep local copy
BUILD/FINISH.sh:
Remove all config.cache files
BUILD/compile-alpha-debug:
Update
BUILD/compile-ia64-debug-max:
Update
Docs/manual.texi:
Added auto_increment example
sql/sql_select.cc:
Fix bugs in LEFT JOIN and field=NULL
sql/sql_yacc.yy:
Remove compiler warnings
Added missing InnoDB variables to SHOW VARIABLES.
Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
Fixed bug when doing 'LEFT JOIN ... ON (column_name = constant) WHERE column_name = constant'
Docs/manual.texi:
Changelog
libmysql/libmysql.c:
Don't use signal() on windows.
mysql-test/r/join_outer.result:
Test for bugfix
mysql-test/r/null.result:
Test for bugfix
mysql-test/t/join_outer.test:
Test for bugfix
mysql-test/t/null.test:
Test for bugfix
sql/mysqld.cc:
Add missing InnoDB variables to SHOW VARIABLES.
sql/sql_select.cc:
Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
Fixed bug when doing 'LEFT JOIN ... ON (column_name = constant) WHERE column_name = constant'
If I ruined anything, write your complaints to sasha@mysql.com
sql/sql_delete.cc:
Unchecked changes, so that I could run mysql-test
sql/sql_lex.h:
Unchecked changes, so that I could run mysql-test
sql/sql_parse.cc:
Unchecked changes, so that I could run mysql-test
sql/sql_union.cc:
Unchecked changes, so that I could run mysql-test
sql/sql_yacc.yy:
Unchecked changes, so that I could run mysql-test
BitKeeper/etc/ignore:
Added libmysqld/examples/link_sources to the ignore list
Safer, a bit faster filesort.
Code changes to avoid calls to current_thd() (faster code).
Removed all compiler warnings from readline.
BitKeeper/etc/ignore:
Add my_global.h back.
Docs/manual.texi:
4.0.1 Changelog
include/my_sys.h:
Added strmake_root
libmysql/libmysql.c:
Don't do signal() on windows (Causes instability problems)
mysys/my_alloc.c:
Added strmake_root
readline/bind.c:
Remove warnings
readline/complete.c:
Remove warnings
readline/display.c:
Remove warnings
readline/funmap.c:
Remove warnings
readline/histexpand.c:
Remove warnings
readline/histfile.c:
Remove warnings
readline/history.h:
Remove warnings
readline/histsearch.c:
Remove warnings
readline/isearch.c:
Remove warnings
readline/kill.c:
Remove warnings
readline/macro.c:
Remove warnings
readline/readline.c:
Remove warnings
readline/readline.h:
Remove warnings
readline/rltty.c:
Remove warnings
readline/search.c:
Remove warnings
readline/shell.c:
Remove warnings
readline/terminal.c:
Remove warnings
readline/tilde.c:
Remove warnings
readline/tilde.h:
Remove warnings
readline/undo.c:
Remove warnings
readline/util.c:
Remove warnings
readline/vi_mode.c:
Remove warnings
sql-bench/server-cfg.sh:
Added use of truncate table
sql-bench/test-insert.sh:
Added use of truncate table
Changed some tests to use keys instead of 'range'
sql-bench/test-wisconsin.sh:
Cleanup
sql/field.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/field.h:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/filesort.cc:
Safer memory allocation; Don't allocate pointer to buffers directly, but use an IO_CACHE instead.
This will allow us to use more memory for keys and will also work better if the number of rows that is to be sorted is much larger than expected.
sql/item.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item.h:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item_func.h:
Cleanup
sql/opt_range.cc:
Use mem_root instead of sql_alloc() to get more speed
sql/sql_class.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_class.h:
Added strmake()
sql/sql_handler.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_lex.cc:
Use mem_root instead of sql_alloc() to get more speed
sql/sql_select.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
tests/fork2_test.pl:
Fixed typos
tests/fork_big.pl:
Fixed typos
tests/insert_and_repair.pl:
Fixed typos
tests/rename_test.pl:
Fixed typos
tests/test_delayed_insert.pl:
Fixed typos
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
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
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
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
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
client/mysqltest.c:
Don't write error message to log if there is more than one possible error message
include/mysqld_error.h:
Made error messages more general
libmysqld/Makefile.am:
md5 is now in mysys
mysql-test/include/have_isam.inc:
Update to new result format
mysql-test/include/not_embedded.inc:
Update to new result format
mysql-test/mysql-test-run.sh:
Update to new result format
mysql-test/r/auto_increment.result:
Update to new result format
mysql-test/r/count_distinct2.result:
Update to new result format
mysql-test/r/create.result:
Update to new result format
mysql-test/r/func_system.result:
Update to new result format
mysql-test/r/isam.result:
Update to new result format
mysql-test/r/lock.result:
Update to new result format
mysql-test/r/lock_multi.result:
Update to new result format
mysql-test/r/rename.result:
Update to new result format
mysql-test/r/rpl000001.result:
Fix wrong test
mysql-test/r/tablelock.result:
Update to new result format
mysql-test/t/rename.test:
Update to new result format
sql/share/czech/errmsg.txt:
Made error messages more general
sql/share/danish/errmsg.txt:
Made error messages more general
sql/share/dutch/errmsg.txt:
Made error messages more general
sql/share/english/errmsg.txt:
Made error messages more general
sql/share/estonian/errmsg.txt:
Made error messages more general
sql/share/french/errmsg.txt:
Made error messages more general
sql/share/german/errmsg.txt:
Made error messages more general
sql/share/greek/errmsg.txt:
Made error messages more general
sql/share/hungarian/errmsg.txt:
Made error messages more general
sql/share/italian/errmsg.txt:
Made error messages more general
sql/share/japanese/errmsg.txt:
Made error messages more general
sql/share/korean/errmsg.txt:
Made error messages more general
sql/share/norwegian-ny/errmsg.txt:
Made error messages more general
sql/share/norwegian/errmsg.txt:
Made error messages more general
sql/share/polish/errmsg.txt:
Made error messages more general
sql/share/portuguese/errmsg.txt:
Made error messages more general
sql/share/romanian/errmsg.txt:
Made error messages more general
sql/share/russian/errmsg.txt:
Made error messages more general
sql/share/slovak/errmsg.txt:
Made error messages more general
sql/share/spanish/errmsg.txt:
Made error messages more general
sql/share/swedish/errmsg.txt:
Made error messages more general
sql/share/ukrainian/errmsg.txt:
Made error messages more general
sql/sql_lex.cc:
We can't remove lex->thd because sql_yacc uses it.
sql/sql_lex.h:
We can't remove lex->thd because sql_yacc uses it.
sql/sql_yacc.yy:
Cleanup
support-files/mysql.spec.sh:
Create MySQL-embedded rpm
tools/mysqlmanager.c:
Fix bug in merge
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/count_distinct2.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
libmysqld/Makefile.am:
Added back md5.c
Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version. All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86
BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7:
Delete: mysys/mf_pack2.c
Docs/manual.texi:
Updated chapter about embedded version
acinclude.m4:
Fix for using BDB and InnoDB with embedded
client/completion_hash.cc:
Speed up memory allocation
client/completion_hash.h:
Speed up memory allocation
client/mysql.cc:
Speed up memory allocation
client/mysqldump.c:
Fix to use now convert_dirname
client/mysqltest.c:
Fixed memory allocation bugs.
Added --basedir=#, --compress=#, --server-arg, --server-file.
Fixes for embedded version
Changed silent mode to -s instead of -q
include/my_global.h:
Update to use HAVE_ISAM
include/my_sys.h:
Cleanup of fn_format()
include/mysql.h:
Prepare FIELD struct for 4.1
include/mysql_embed.h:
Don't use ISAM in embedded version
innobase/include/srv0srv.h:
Make InnoDB startup/shutdown silent in embedded version
innobase/log/log0log.c:
Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0srv.c:
Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0start.c:
Make InnoDB startup/shutdown silent in embedded version
isam/isamlog.c:
new convert_dirname
libmysql/libmysql.c:
Prepare for 4.1
libmysqld/Makefile.am:
Changed to create one libmysqld.a file that includes all other libraries.
libmysqld/examples/Makefile.am:
Changed to use new libmysqld.a
libmysqld/examples/test-run:
Lot's of fixes to get new mysqltest with embedded MySQL to work.
libmysqld/lib_sql.cc:
Changed type of arguments for mysql_server_init() to make code more portable.
libmysqld/libmysqld.c:
Cleanup
merge/Makefile.am:
Rename to use common prefix.
merge/mrg_close.c:
Rename to use common prefix.
merge/mrg_create.c:
Rename to use common prefix.
merge/mrg_def.h:
Rename to use common prefix.
merge/mrg_delete.c:
Rename to use common prefix.
merge/mrg_extra.c:
Rename to use common prefix.
merge/mrg_info.c:
Rename to use common prefix.
merge/mrg_locking.c:
Rename to use common prefix.
merge/mrg_open.c:
Rename to use common prefix.
merge/mrg_panic.c:
Rename to use common prefix.
merge/mrg_rrnd.c:
Rename to use common prefix.
merge/mrg_rsame.c:
Rename to use common prefix.
merge/mrg_static.c:
Rename to use common prefix.
merge/mrg_update.c:
Rename to use common prefix.
myisam/myisamlog.c:
Use new convert_dirname
myisammrg/Makefile.am:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_close.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_create.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_def.h:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_delete.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_extra.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_info.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_locking.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_open.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_panic.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_queue.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rfirst.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rkey.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rlast.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rnext.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rprev.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rrnd.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rsame.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_static.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_update.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_write.c:
Renamed mymrgdef.h -> myrg_def.h
mysql-test/include/master-slave.inc:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/mysql-test-run.sh:
cleanup
mysql-test/r/auto_increment.result:
Cleanup of tests for embedded version
mysql-test/r/func_system.result:
Cleanup of tests for embedded version
mysql-test/r/isam.result:
Cleanup of tests for embedded version
mysql-test/r/lock.result:
Cleanup of tests for embedded version
mysql-test/r/show_check.result:
Cleanup of tests for embedded version
mysql-test/t/auto_increment.test:
Cleanup of tests for embedded version
mysql-test/t/backup.test:
Cleanup of tests for embedded version
mysql-test/t/count_distinct2-master.opt:
Cleanup of tests for embedded version
mysql-test/t/count_distinct2.test:
Cleanup of tests for embedded version
mysql-test/t/create.test:
Cleanup of tests for embedded version
mysql-test/t/flush.test:
Cleanup of tests for embedded version
mysql-test/t/func_system.test:
Cleanup of tests for embedded version
mysql-test/t/isam.test:
Cleanup of tests for embedded version
mysql-test/t/kill.test:
Cleanup of tests for embedded version
mysql-test/t/lock.test:
Cleanup of tests for embedded version
mysql-test/t/order_fill_sortbuf-master.opt:
Cleanup of tests for embedded version
mysql-test/t/rpl000015.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000016.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000017.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000018.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/show_check.test:
Move ISAM specific tests to isam.test
mysql-test/t/status.test:
Cleanup of tests for embedded version
mysql-test/t/tablelock.test:
Cleanup
mysys/Makefile.am:
Removed not used mf_pack2.c
mysys/charset.c:
new convert_dirname
mysys/default.c:
new convert_dirname
mysys/mf_dirname.c:
Changed convert_dirname() to be more general
mysys/mf_format.c:
Changed bit flags to fn_format() to defines.
Added handling of relative filenames
BitKeeper/etc/ignore:
Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list
mysys/mf_pack.c:
new convert_dirname
mysys/mf_tempfile.c:
new convert_dirname
scripts/Makefile.am:
Adde mysql_explain_log
scripts/mysql_config.sh:
Added support of --libmysqld-libs
sql/Makefile.am:
Fix to use 'innodb_system_libs'
sql/ha_innobase.cc:
Make InnoDB startup/shutdown silent in embedded version
sql/ha_isam.cc:
Added handling of HAVE_ISAM
sql/ha_isammrg.cc:
Added handling of HAVE_ISAM
sql/ha_myisam.cc:
Handle relative paths; Needed to support BACKUP TABLE in embedded version
sql/ha_myisammrg.cc:
Rename of filenames
sql/handler.cc:
Added handling of HAVE_ISAM
sql/item_func.cc:
Fix for ecc (Intel Compiler)
sql/mysql_priv.h:
Added global variable 'mysql_embedded'
sql/mysqld.cc:
Use HAVE_ISAM
sql/sql_parse.cc:
Use new convert_dirname
sql/sql_select.cc:
Fix for ecc (Intel Compiler)
sql/sql_table.cc:
Added handling of relative filenames
strings/Makefile.am:
Don't compile both assembler and C functions on x86
strings/bchange.c:
cleanup
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
Docs/manual.texi:
Auto merged
client/mysqladmin.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_lex.cc:
SCCS merged
mysql-test/t/rpl000001.test:
test for coredump on slave while trying to print aborted query
sql/slave.cc:
do not coredump printing aborted query if it has % in it.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
updated results - now ready to push
mysql-test/r/rpl000017.result:
fix for new test format
mysql-test/r/type_enum.result:
updated result
sql/mysqld.cc:
fixed freeing NULL pointer
