into moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
sql/filesort.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
strings/decimal.c:
Auto merged
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug23443
sql/item_func.cc:
Auto merged
storage/heap/hp_block.c:
Auto merged
storage/heap/hp_write.c:
Manual merge.
into moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443
heap/hp_block.c:
Auto merged
sql/item_func.cc:
Auto merged
heap/hp_write.c:
Manual merge.
server
The problem was that when memory was exhausted HEAP engine could crash
(GROUP BY uses HEAP TABLE). Alternatively, if SET was used, it could
report an error "You may only use constant expressions with SET" instead
of "Out of memory (Needed NNNNNN bytes)".
The solution is:
- pass MY_WME to (some) calls to my_malloc() to get correct message.
- fix heap_write() so that the first key is skipped during cleanup
on ENOMEM because it wasn't inserted and doesn't have to be
deleted.
No test case is provided because we can't test out-of-memory behaviour
in our current test framework.
heap/hp_block.c:
If allocation fails, write an error message.
heap/hp_write.c:
On ENOMEM, skip the first key in cleanup, as it wasn't inserted yet.
sql/item_func.cc:
Add MY_WME so that OOM error will be reported.
correctly in some cases", from 5.0.
In short, calls to a stored function located in another database
than the default database, may fail to replicate if the call was made
by SET, SELECT, or DO.
sp_head.cc automerged, only the test and test's result had to be hand-merged.
mysql-test/r/rpl_sp.result:
manual merge of the result of the test for BUG#19725
mysql-test/r/rpl_switch_stm_row_mixed.result:
the bugfix changes results as expected
mysql-test/t/rpl_sp.test:
manual merge of the test for BUG#19725
into gbichot3.local:/home/mysql_src/mysql-5.1-rpl-19725
sql/sp_head.cc:
Auto merged
mysql-test/r/rpl_sp.result:
using 5.1's version, will merge by hand after running the new test
mysql-test/t/rpl_sp.test:
using 5.1's version, will re-insert the new test portion by hand
correctly in some cases".
In short, calls to a stored function located in another database
than the default database, may fail to replicate if the call was made
by SET, SELECT, or DO.
Longer: when a stored function is called from a statement which does not go
to binlog ("SET @a=somedb.myfunc()", "SELECT somedb.myfunc()",
"DO somedb.myfunc()"), this crafted statement is binlogged:
"SELECT myfunc();" (accompanied with a mention of the default database
if there is one). So, if "somedb" is not the default database,
the slave would fail to find myfunc(). The fix is to specify the
function's database name in the crafted binlogged statement, like this:
"SELECT somedb.myfunc();". Test added in rpl_sp.test.
mysql-test/r/rpl_sp.result:
Because I moved the SHOW BINLOG EVENTS down a bit, big portions of its
output move. Also, the function's database name appears in
SELECT statements.
mysql-test/t/rpl_sp.test:
Adding test for BUG#19725.
Moving the SHOW BINLOG EVENTS down, it is run at the very end to
test everything.
sql/sp_head.cc:
When binlogging a "SELECT myfunc()" (when a stored function is executed
inside a statement which does not go to the binlog (like a SET,
SELECT, DO), we need to write "SELECT db_of_myfunc().myfunc()",
because the function may be in a database which is not the default
database.
- "make_binary_distribution" accepts a dummy "--platform=" argument.
- "MySQL-shared-compat.spec" uses a "version40" define symbol internally.
scripts/make_binary_distribution.sh:
Newer versions of the release build tools call this with a "--platform=" argument
which we seem not to need in 4.0, but which makes the tool crash (happened on SCO).
Rather than add another version check into the build tools, just accept a "--platform="
argument and ignore it, just give a message.
support-files/MySQL-shared-compat.spec.sh:
The current version of "Do-shared-compat" needs two digits to identify the release families
(to differ between 4.0 and 4.1), so the variable "version4" must get renamed to "version40".
into macbook.local:/Users/kgeorge/mysql/work/merge-5.1-opt
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/gis-rtree.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
sql/sql_udf.cc:
SCCS merged
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
Makefile.am:
Auto merged
configure.in:
Auto merged
include/mysql.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqlbug.sh:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/event_queue.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
mysql-test/r/warnings.result:
Manual merge.
mysql-test/t/warnings.test:
Manual merge.
strings/ctype-extra.c:
Manual merge.
Reset the info after using those files.
mysql-test/t/ndb_binlog_ignore_db.test:
Reset the binlog after we include several files that have little
to do with this test.
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
The optimizer removes expressions from GROUP BY/DISTINCT
if they happen to participate in a <expression> = <const>
predicates of the WHERE clause (the idea being that if
it's always equal to a constant it can't have multiple
values).
However for predicates where the expression and the
constant item are of different result type this is not
valid (e.g. a string column compared to 0).
Fixed by additional check of the result types of the
expression and the constant and if they differ the
expression don't get removed from the group by list.
mysql-test/r/distinct.result:
Bug #15881: cast problems
- test case
mysql-test/t/distinct.test:
Bug #15881: cast problems
- test case
sql/sql_select.cc:
Bug #15881: cast problems
- can't use <expr>=<const> to remove GROUP BY/DISTINCT cols
if they're not of the same type.
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
