BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
srv0srv.c One can now specify innodb_unix_file_flush_method in my.cnf
srv0start.c One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.cc One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.h One can now specify innodb_unix_file_flush_method in my.cnf
mysqld.cc One can now specify innodb_unix_file_flush_method in my.cnf
sql/ha_innobase.cc:
One can now specify innodb_unix_file_flush_method in my.cnf
sql/ha_innobase.h:
One can now specify innodb_unix_file_flush_method in my.cnf
sql/mysqld.cc:
One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0srv.c:
One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0start.c:
One can now specify innodb_unix_file_flush_method in my.cnf
innobase/include/srv0srv.h:
One can now specify innodb_unix_file_flush_method in my.cnf
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Small cleanups
Docs/manual.texi:
Updated how to add new native functions
mysql-test/r/func_crypt.result:
Fix for crypt on FreeBSD
mysql-test/t/func_crypt.test:
Fix for crypt on FreeBSD
mysys/thr_lock.c:
Changed to use statistics_increment macro for statistic variables.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
acconfig.h openssl support
acinclude.m4 openssl support
acinclude.m4:
openssl support
acconfig.h:
openssl support
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Delete: libmysql/violite.c
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
myisam/mi_search.c:
Auto merged
sql/sql_select.cc:
Auto merged
manual.texi change "InnoDB consinsten read" to
manual.texi "InnoDB consistent read" in @node lines
manual.texi (to match section's actual title)
manual.texi cleanups to "installing from development source
manual.texi tree" section
Docs/manual.texi:
more development tree section changes
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
log0log.c Retrieve a dummy value from a function to prevent gcc crashing on HP-UX
innobase/log/log0log.c:
Retrieve a dummy value from a function to prevent gcc crashing on HP-UX
innobase/ibuf/ibuf0ibuf.c:
Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
include/myisam.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Auto merged
client/mysqltest.c:
Auto merged
sql/lex.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
Docs/manual.texi:
merged
client/errmsg.c:
merged
configure.in:
merged
sql/mysqld.cc:
merged
sql/sql_select.cc:
merged, needs manual fixing
sql/sql_yacc.yy:
merged, needs manual fixing
CHECK, REPAIR, ANALYZE and OPTIMIZE instead of myisamchk, when
MySQL server is running. Documentation to MySQL manual will follow
shortly.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
SCCS merged
sql/Makefile.am:
SCCS merged
univ.i Change pthread_yield to sched_yield
configure.in Change pthread_yield to sched_yield
innobase/configure.in:
Change pthread_yield to sched_yield
innobase/include/univ.i:
Change pthread_yield to sched_yield
innobase/os/os0thread.c:
Change pthread_yield to sched_yield
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Added a stern warning in a visible (in my opinion) place to make sure
to compile with -fno-exceptions when using gcc
Wrote a new paragraphs on OS comparison/choice in the Which OS section
Docs/manual.texi:
Added a stern warning in a visible (in my opinion) place to make sure
to compile with -fno-exceptions when using gcc
Wrote a new paragraphs on OS comparison/choice in the Which OS section
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_delete.cc:
Auto merged
log0log.c Change Innobase text to InnoDB
srv0start.c Change Innobase text to InnoDB
srv0srv.c Change Innobase text to InnoDB
ha_innobase.cc Change Innobase text to InnoDB
sql/ha_innobase.cc:
Change Innobase text to InnoDB
innobase/srv/srv0srv.c:
Change Innobase text to InnoDB
innobase/srv/srv0start.c:
Change Innobase text to InnoDB
innobase/log/log0log.c:
Change Innobase text to InnoDB
innobase/log/log0recv.c:
Change Innobase text to InnoDB
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
myisam/mi_search.c:
the ugliest merge I've ever done! And I already see this has introduced a bug - will have to do a fix-up afterwards
start slave thread if master.info is present and server_id is set
updates for rpl000015 and rpl000016 to remove master.info to make sure
master info struct does not get auto-initialized
Docs/manual.texi:
updates for recent changes
mysql-test/r/rpl000001.result:
update for test case change
mysql-test/t/rpl000001.test:
fixed bugs in the test case
mysql-test/t/rpl000015.test:
wrong change - to be reversed
sql/mysqld.cc:
start slave thread if master.info is present and server_id is set
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
innobase/os/os0file.c:
Change pwrite to os_file_pwrite to allow compilation if no pwrite
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted