BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
mysys/mf_tempfile.c:
Auto merged
mysql-test/r/rpl_heap.result:
Auto merged
mysql-test/t/rpl_heap.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().
mysql-test/r/rpl_heap.result:
result update
mysql-test/t/rpl_heap.test:
changing test to test a bug (but anyway, mysql-test-run --manager looks like not working in 4.1 currently,
so this test is never run).
sql/log.cc:
new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/mysql_priv.h:
removing argument no_log from mysql_create_table(); no_log was not perfect as some
binlogging could still be done by open_unireg_entry() for a HEAP table.
sql/sql_class.h:
new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/sql_parse.cc:
removing no_log arg from mysql_create_table()
sql/sql_table.cc:
removing no_log from mysql_create_table(); instead using new class Disable_binlog.
Disabling binlogging in some cases, where the binlogging is done later by some other code
(case of CREATE SELECT and ALTER).
logging_ok:
Logging to logging@openlogging.org accepted
mysql_priv.h, my_time.h:
Moved declaration of days_in_month array from mysql_priv.h to my_time.h to correct Windows build issues
include/my_time.h:
Moved declaration of days_in_month array from mysql_priv.h to my_time.h to correct Windows build issues
sql/mysql_priv.h:
Moved declaration of days_in_month array from mysql_priv.h to my_time.h to correct Windows build issues
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
innobase_mysql_tmpfile(): call dup() and my_close() on the file
returned by create_temp_file()
in order to avoid memory leak caused by my_open() being paired with close()
sql/ha_innodb.cc:
innobase_mysql_tmpfile(): call dup() and my_close() on the file
returned by create_temp_file()
in order to avoid memory leak caused by my_open() being paired with close()
Removed improper casts.
Thanks to Joerg Bruehe for the fix.
include/my_global.h:
Build bug on 64-Bit platforms.
Removed improper casts.
Changed to uniform writing style.
Appended 'L' to 32-Bit constants which doesn't hurt on 32-Bit,
but can be important for some 64-Bit compilers.
include/mysql.h:
Fixed symbol name change.
include/mysql_com.h:
Reverted parts of previous changeset (name changes) to make it build.
libmysql/libmysql.c:
Fixed symbol name change.
sql/sql_parse.cc:
Fixed symbol name change.
my_getopt.c:
Moved the inclusion of my_getopt.h down below the inclusion of my_sys.h so that enum loglevel definition would be available
my_sys.h, my_getopt.h:
moved definition of enum loglevel from my_getopt.h to my_sys.h
include/my_getopt.h:
moved definition of enum loglevel from my_getopt.h to my_sys.h
include/my_sys.h:
moved definition of enum loglevel from my_getopt.h to my_sys.h
mysys/my_getopt.c:
Moved the inclusion of my_getopt.h down below the inclusion of my_sys.h so that enum loglevel definition would be available
mysqld.cc:
Changed LOGLEVEL enum to loglevel
mysql_priv.h, log.cc:
Changed LOGLEVEL to loglevel. Removed startup_ from some of the DBUG_ENTER macros. Removed the print_msg_to_log function as it was unused.
my_getopt.c, my_getopt.h:
Renamed LOGLEVEL to loglevel to match coding standards
include/my_getopt.h:
Renamed LOGLEVEL to loglevel to match coding standards
mysys/my_getopt.c:
Renamed LOGLEVEL to loglevel to match coding standards
sql/log.cc:
Changed LOGLEVEL to loglevel. Removed startup_ from some of the DBUG_ENTER macros. Removed the print_msg_to_log function as it was unused.
sql/mysql_priv.h:
Changed LOGLEVEL to loglevel. Removed startup_ from some of the DBUG_ENTER macros. Removed the print_msg_to_log function as it was unused.
sql/mysqld.cc:
Changed LOGLEVEL enum to loglevel
ndb/src/mgmsrv/MgmtSrvr.cpp:
atoll missing on some platforms
ndb/src/ndbapi/NdbScanOperation.cpp:
compile error on some platforms
ndb/test/ndbapi/testIndex.cpp:
Added some explicit templates
ndb/test/ndbapi/testNdbApi.cpp:
Added some explicit templates
ndb/test/ndbapi/testRestartGci.cpp:
Added some explicit templates
ndb/test/ndbapi/testScan.cpp:
Added some explicit templates
ndb/test/run-test/main.cpp:
Added some explicit templates
ndb/test/src/HugoOperations.cpp:
Added some explicit templates
ndb/test/tools/cpcc.cpp:
Added some explicit templates
still better names for enum; removing unneeded symbol
include/mysql_com.h:
still better names for enum; removing unneeded symbol
VC++Files/winmysqladmin/mysql_com.h:
still better names for enum; removing unneeded symbol
Better names for defines, as these are visible in API
include/mysql_com.h:
Better names for defines, as these are visible in API
VC++Files/winmysqladmin/mysql_com.h:
Better names for defines, as these are visible in API
into deer.(none):/home/hf/work/mysql-4.1.emb
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Fix for binary collations for MyISAM and HEAP BTREE.
This patch also changes trailing spaces behaviour for
binary collations. Binary collations now have PAD
characteristic too.
