mysql-test/t/warnings-master.opt:
Added skip-innodb option (which was what it once was...)
mysql-test/t/warnings.test:
Removed un-needed variable setting. Bug only had to do with unterimated string.
into siva.hindu.god:/home/tsmith/m/bk/51-build
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/ha/ha0ha.c:
Auto merged
storage/innobase/ha/hash0hash.c:
Auto merged
storage/innobase/include/hash0hash.h:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
- Put back "libmygcc.a", found no real reason it was removed.
- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture.
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
scripts/make_binary_distribution.sh:
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
support-files/mysql.spec.sh:
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
Fixes:
- Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields
- Bug #24386: Performance degradation caused by instrumentation in mutex_struct
- Bug #24190: many exportable definitions of field_in_record_is_null
- Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?
storage/innobase/buf/buf0buf.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1045:
buf_page_init_for_read(): Correct the indentation.
storage/innobase/buf/buf0flu.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1038:
Port r983 from branches/zip: Enclose some more debug code in
#ifdef UNIV_SYNC_DEBUG to allow the code to be built
with UNIV_DEBUG but without UNIV_SYNC_DEBUG.
storage/innobase/dict/dict0dict.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1124:
Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
adding a second parameter, adjust callers.
storage/innobase/ha/ha0ha.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1039:
Port r1034 from branches/zip: Remove some instrumentation and reduce
the output of SHOW MUTEX STATUS in non-debug builds. (Bug #24386)
storage/innobase/ha/hash0hash.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1039:
Port r1034 from branches/zip: Remove some instrumentation and reduce
the output of SHOW MUTEX STATUS in non-debug builds. (Bug #24386)
storage/innobase/handler/ha_innodb.cc:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1028:
Merge a change from MySQL AB.
ChangeSet
2006/11/10 17:22:43+02:00 aelkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
Bug #24190 many exportable definitions of field_in_record_is_null
mysql had several(2) exportable definitions of field_in_record_is_null function.
Fixed with adding static.
storage/innobase/handler/ha_innodb.cc
2006/11/10 17:22:36+02:00 aelkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi +1 -1
made static
Revision r1008:
Minor cleanup.
ha_innobase::rnd_pos(): Use correct format in DBUG_PRINT statements.
buf_page_release(): Remove the local variable buf_fix_count.
Revision r1039:
Port r1034 from branches/zip: Remove some instrumentation and reduce
the output of SHOW MUTEX STATUS in non-debug builds. (Bug #24386)
Revision r1124:
Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
adding a second parameter, adjust callers.
Revision r1134:
Fix a potential bug in ha_innodb.cc:innobase_query_is_update() where the
function can be called with "current_thd == NULL". Minor non-functional fix
in log0recv.c
Revision r1098:
Fix bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect
time fields
Revision r1109:
ha_innodb.cc: Remove unused define MAX_ULONG_BIT.
storage/innobase/include/btr0sea.h:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1088:
Replace the Latin abbreviation "cf." in comments.
storage/innobase/include/buf0buf.ic:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1008:
Minor cleanup.
ha_innobase::rnd_pos(): Use correct format in DBUG_PRINT statements.
buf_page_release(): Remove the local variable buf_fix_count.
storage/innobase/include/data0type.ic:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1088:
Replace the Latin abbreviation "cf." in comments.
storage/innobase/include/dict0dict.h:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1124:
Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
adding a second parameter, adjust callers.
storage/innobase/include/ha0ha.h:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1039:
Port r1034 from branches/zip: Remove some instrumentation and reduce
the output of SHOW MUTEX STATUS in non-debug builds. (Bug #24386)
storage/innobase/include/hash0hash.h:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1039:
Port r1034 from branches/zip: Remove some instrumentation and reduce
the output of SHOW MUTEX STATUS in non-debug builds. (Bug #24386)
storage/innobase/include/sync0rw.h:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1039:
Port r1034 from branches/zip: Remove some instrumentation and reduce
the output of SHOW MUTEX STATUS in non-debug builds. (Bug #24386)
storage/innobase/include/sync0sync.h:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1038:
Port r983 from branches/zip: Enclose some more debug code in
#ifdef UNIV_SYNC_DEBUG to allow the code to be built
with UNIV_DEBUG but without UNIV_SYNC_DEBUG.
Revision r1037:
Port r972 from branches/zip: Enclose some debug code in #ifdef UNIV_SYNC_DEBUG.
The code was previously unused in non-debug builds.
Revision r1039:
Port r1034 from branches/zip: Remove some instrumentation and reduce
the output of SHOW MUTEX STATUS in non-debug builds. (Bug #24386)
Revision r1084:
Remove the unused constants SYNC_INFINITE_TIME and SYNC_TIME_EXCEEDED.
storage/innobase/include/sync0sync.ic:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1039:
Port r1034 from branches/zip: Remove some instrumentation and reduce
the output of SHOW MUTEX STATUS in non-debug builds. (Bug #24386)
storage/innobase/include/univ.i:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1006:
Introduce #define UNIV_LIST_DEBUG for enabling the debug code in
UT_LIST_REMOVE_CLEAR().
Revision r1088:
Replace the Latin abbreviation "cf." in comments.
Revision r1083:
univ.i: Document the debug flags (UNIV_DEBUG et al).
storage/innobase/include/ut0lst.h:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1006:
Introduce #define UNIV_LIST_DEBUG for enabling the debug code in
UT_LIST_REMOVE_CLEAR().
storage/innobase/lock/lock0lock.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1009:
Remove duplicate printing of row lock counts in SHOW INNODB STATUS, and in
the remaining print, add a comma so it doesn't get combined with the heap
size. Both problems were introduced in r383.
storage/innobase/log/log0recv.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1134:
Fix a potential bug in ha_innodb.cc:innobase_query_is_update() where the
function can be called with "current_thd == NULL". Minor non-functional fix
in log0recv.c
Revision r1078:
Merge r1067:1077 from branches/5.0:
innobase_start_or_create_for_mysql(): Remove unnecessary delay now that
we moved the setting sync_order_checks_on=TRUE to log0recv.c,
to the start of the rollback phase in crash recovery.
Fix assertion failure sync0sync.c line 1239
(the latter ut_error in sync_thread_reset_level())
in crash recovery when UNIV_SYNC_DEBUG is enabled.
Revision r1080:
Merge r1079 from branches/5.0:
recv_recovery_from_checkpoint_finish(): Add 1 sec delay
before switching on the sync order checks in crash recovery, so that
file I/O threads have time to suspend themselves.
storage/innobase/row/row0ins.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1124:
Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
adding a second parameter, adjust callers.
storage/innobase/row/row0sel.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1038:
Port r983 from branches/zip: Enclose some more debug code in
#ifdef UNIV_SYNC_DEBUG to allow the code to be built
with UNIV_DEBUG but without UNIV_SYNC_DEBUG.
Revision r1124:
Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
adding a second parameter, adjust callers.
storage/innobase/row/row0upd.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1124:
Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
adding a second parameter, adjust callers.
storage/innobase/srv/srv0start.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1038:
Port r983 from branches/zip: Enclose some more debug code in
#ifdef UNIV_SYNC_DEBUG to allow the code to be built
with UNIV_DEBUG but without UNIV_SYNC_DEBUG.
Revision r1078:
Merge r1067:1077 from branches/5.0:
innobase_start_or_create_for_mysql(): Remove unnecessary delay now that
we moved the setting sync_order_checks_on=TRUE to log0recv.c,
to the start of the rollback phase in crash recovery.
Fix assertion failure sync0sync.c line 1239
(the latter ut_error in sync_thread_reset_level())
in crash recovery when UNIV_SYNC_DEBUG is enabled.
Revision r1070:
Remove another accidentally committed change to srv0start.c.
The change was accidentally committed with the merge in r1068.
This revision corresponds to r1051 with a properly merged
r1067 of branches/5.0.
Revision r1068:
Merge r1067 from branches/5.0:
trx_rollback_for_mysql(), trx_commit_for_mysql():
Protect the creation of trx_dummy_sess with kernel_mutex.
This error was introduced in r1046 and r1050.
Revision r1069:
Remove an accidentally committed change to srv0start.c.
The change was accidentally committed with the merge in r1068.
storage/innobase/sync/sync0rw.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1039:
Port r1034 from branches/zip: Remove some instrumentation and reduce
the output of SHOW MUTEX STATUS in non-debug builds. (Bug #24386)
storage/innobase/sync/sync0sync.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1038:
Port r983 from branches/zip: Enclose some more debug code in
#ifdef UNIV_SYNC_DEBUG to allow the code to be built
with UNIV_DEBUG but without UNIV_SYNC_DEBUG.
Revision r1037:
Port r972 from branches/zip: Enclose some debug code in #ifdef UNIV_SYNC_DEBUG.
The code was previously unused in non-debug builds.
Revision r1039:
Port r1034 from branches/zip: Remove some instrumentation and reduce
the output of SHOW MUTEX STATUS in non-debug builds. (Bug #24386)
storage/innobase/trx/trx0roll.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1049:
Merge r1048 from branches/5.0:
trx_rollback_for_mysql(): Do not set trx->sess back to NULL.
This bug was introduced in r1046.
Revision r1047:
Merge r1046 from branches/5.0:
branches/5.0: trx_rollback_for_mysql(): Ensure that trx->sess is non-NULL
when calling trx_general_rollback_for_mysql(). This removes a segmentation
fault when rolling back a prepared transaction in XA recovery. (Bug #21468)
Revision r1068:
Merge r1067 from branches/5.0:
trx_rollback_for_mysql(), trx_commit_for_mysql():
Protect the creation of trx_dummy_sess with kernel_mutex.
This error was introduced in r1046 and r1050.
Revision r1051:
Merge r1050 from branches/5.0:
trx_rollback_for_mysql(): Fix the comment introduced in r1046.
trx_commit_for_mysql(): Use the dummy trx->sess also for committing a prepared
transaction in XA recovery, just in case our code would need the session
object also in that case (does not seem to need it right now).
storage/innobase/trx/trx0trx.c:
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
Revision r1009:
Remove duplicate printing of row lock counts in SHOW INNODB STATUS, and in
the remaining print, add a comma so it doesn't get combined with the heap
size. Both problems were introduced in r383.
Revision r1068:
Merge r1067 from branches/5.0:
trx_rollback_for_mysql(), trx_commit_for_mysql():
Protect the creation of trx_dummy_sess with kernel_mutex.
This error was introduced in r1046 and r1050.
Revision r1051:
Merge r1050 from branches/5.0:
trx_rollback_for_mysql(): Fix the comment introduced in r1046.
trx_commit_for_mysql(): Use the dummy trx->sess also for committing a prepared
transaction in XA recovery, just in case our code would need the session
object also in that case (does not seem to need it right now).
mysql-test/r/csv.result:
Fixed test case for format change. Added new test for floating point numbers.
mysql-test/t/csv.test:
Fixed test for format change. Added test case for floating point numbers.
storage/csv/ha_tina.cc:
Updated code to handle numbers as raw unquotes types in CSV
storage/csv/transparent_file.cc:
BitKeeper file /home/brian/mysql/merge-5.1/storage/csv/transparent_file.cc
storage/csv/transparent_file.h:
BitKeeper file /home/brian/mysql/merge-5.1/storage/csv/transparent_file.h
storage/csv/CMakeLists.txt:
Updated for windows
storage/csv/Makefile.am:
Updated to add new class
storage/csv/ha_tina.cc:
Removed hidden class
storage/csv/ha_tina.h:
Remove hidden class
into trift2.:/MySQL/M51/push-5.1
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/rpl_000015.test:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
sql/log_event.cc:
Auto merged
Delete compiler-specific flag setting - it makes builds break.
server-tools/instance-manager/Makefile.am:
Delete compiler-specific flag setting - it makes builds break.
If this is really wanted, it must be done through "configure", caring about the compiler differences.
into mysql.com:/d2/hf/common/my51-common
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
into mysql.com:/d2/hf/common/my50-common
mysql-test/t/mysqladmin.test:
Auto merged
sql/item_func.cc:
Auto merged
libmysqld/lib_sql.cc:
merging
mysql-test/t/distinct.test:
merging
sql/sql_prepare.cc:
SCCS merged
libmysqld/lib_sql.cc:
error message moved to 'stmt'
mysql-test/t/distinct.test:
temporary disabled in embedded server
mysql-test/t/mysqladmin.test:
disabled in embedded server
sql/sql_prepare.cc:
superfluous #ifndef removed
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/ha/ha0ha.c:
Auto merged
storage/innobase/ha/hash0hash.c:
Auto merged
storage/innobase/include/hash0hash.h:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/thr/thr0loc.c:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
innobase/buf/buf0buf.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/ha/ha0ha.c:
Auto merged
innobase/include/hash0hash.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/buf/buf0buf.c:
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/dict/dict0dict.c:
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/fil/fil0fil.c:
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/ha/ha0ha.c:
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/ha/hash0hash.c:
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/include/hash0hash.h:
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/lock/lock0lock.c:
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/log/log0recv.c:
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/thr/thr0loc.c:
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
