into mysql.com:/home/ram/work/b31154/b31154.5.1
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
into mysql.com:/home/ram/work/b30885/b30885.5.1
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/t/heap_btree.test:
Auto merged
storage/heap/hp_hash.c:
the code was changed to use bitmaps instead of key length, so ul
mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
manual merge from 5.0
mysql-test/r/innodb.result:
results changed
mysql-test/r/multi_update.result:
results changed
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
manual merge: results re-recorded
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
results changed
mysql-test/suite/manual/r/rpl_replication_delay.result:
results recorded for 5.1
mysql-test/t/innodb.test:
removing bug27716 regression test as one exists in binlog suite already.
mysql-test/t/multi_update.test:
manual merge plus refining for execution in both binlog_format.
sql/log_event.cc:
bloody manual merge;
the fact that an event is artificial is encode with setting timestamp argument to zero.
rli's last_master_timestamp won't be updated in stmt_done in such case.
sql/rpl_rli.cc:
simulation and the real fixing code.
Don't update last_master_timestamp with zero.
sql/sql_delete.cc:
manual merge
into koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
mysql-test/t/multi_update.test:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
manual merge use local; another file has to be changed in 5_1.
mysql-test/r/innodb.result:
manual merge use local to re-record the results
mysql-test/r/multi_update.result:
manual merge use local to re-record the results
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
manual merge use local to re-record the results
mysql-test/t/innodb.test:
restoring bug#27716 snippet
sql/log_event.cc:
trasfering simulation to another file: rpl_rli.cc
similar to bug_27716, but it was stressed on in the synopsis on that there is another
side of the artifact affecting behaviour in transaction.
Fixed with deploying multi_delete::send_error() - otherwise never called - and refining its logic
to perform binlogging job if needed.
The changeset includes the following side effects:
- added tests to check bug_23333's scenarios on the mixture of tables for multi_update;
- fixes bug@30763 with two-liner patch and a test coinciding to one added for bug_23333.
mysql-test/r/innodb.result:
results changed
mysql-test/r/mix_innodb_myisam_binlog.result:
results changed
mysql-test/r/multi_update.result:
results changed
mysql-test/t/innodb.test:
trans table specific test added
mysql-test/t/mix_innodb_myisam_binlog.test:
multi-update and multi-delete of mixure of ta and not-ta tables tests added (relates to bug_23333).
mysql-test/t/multi_update.test:
testing another branch of mult-delete: send_eof() (binloggin there), send_error (early return)
sql/sql_class.h:
a new flag to designate the fact the statement's error has been handled.
The flag is checked by ::send_error() methods (multi_update and _delete classes)
sql/sql_delete.cc:
expanding multi_delete::send_error to
1. early return if error_handled == t
2. binlogging locally if there was a non-trans table modified side effect
sql/sql_parse.cc:
adding multi_update::send_error which can perform binlogging and rollback job in needed
sql/sql_update.cc:
issues relating to
1. bug_27716 with zeroing of `updated' to serve as the flag of early return from send_error().
The flag is changed to be a new member error_handled; also moved outside binlogging branch.
The reason for this change is that bug_23333 fixes were pushed after the bug_27716's and they
left this flaw (also no test coverage).
2. bug_30763 with assertion on trans_safe. I decide to make 2 liner fix for that bug here instead of to remove
those two assertions. This new bug test case is the same as for multi-update on the mixure of tables.
The rational for this fix:
presumption for mutli_update::trans_safe to be set to zero at
multi_update::multi_update or multi_update::initialize_tables() is incorrect.
trans_safe := false should happen only when a non-transactional table gets modified.
Therefore, at initialization the member must be be set to true.
into magare.gmz:/home/kgeorge/mysql/work/B31156-5.1-opt
mysql-test/r/func_group.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
BitKeeper/deleted/.del-changelog~8457b43736642c:
Auto merged
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
Auto merged
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
Auto merged
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
Auto merged
BitKeeper/deleted/.del-README.debian~223f0edd363d08af:
Auto merged
BitKeeper/deleted/.del-aa~f8c7e976fa99167f:
Auto merged
BitKeeper/deleted/.del-ab~1145a71fc2a5dbb8:
Auto merged
BitKeeper/deleted/.del-ac~66b41066a435209:
Auto merged
BitKeeper/deleted/.del-ad~9296238d4d7d5bb3:
Auto merged
BitKeeper/deleted/.del-ae~c54b032746985759:
Auto merged
BitKeeper/deleted/.del-az~45092291b7eff90a:
Auto merged
BitKeeper/deleted/.del-control~a2146883b4ed7c94:
Auto merged
BitKeeper/deleted/.del-gomi~bcec57fe6195deee:
Auto merged
BitKeeper/deleted/.del-libmysqlclient10.dirs~24c90ade3a371b6f:
Auto merged
BitKeeper/deleted/.del-libmysqlclient10.postinst~5829f4e4a7c0206b:
Auto merged
BitKeeper/deleted/.del-libmysqlclient9.dirs~4420713260a0eb40:
Auto merged
BitKeeper/deleted/.del-libmysqlclient9.postinst~80ad5f1e4633a219:
Auto merged
BitKeeper/deleted/.del-move~6b750ba06050bc92:
Auto merged
BitKeeper/deleted/.del-mysql-bench.dirs~3407d505223bf583:
Auto merged
BitKeeper/deleted/.del-mysql-client.dirs~3f347d1649db13e1:
Auto merged
BitKeeper/deleted/.del-mysql-dev.dirs~c6cacea9b3289f33:
Auto merged
BitKeeper/deleted/.del-mysql-doc.dirs~a468f79189ff27ad:
Auto merged
BitKeeper/deleted/.del-mysql-max-debug.dirs~58d766ce6caffa2b:
Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postinst~36f2faba601ed8a:
Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postrm~26bdf891820d3671:
Auto merged
BitKeeper/deleted/.del-mysql-max-shared.dirs~38f36e6773ac0e79:
Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postinst~3406aa3bae283fe0:
Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postrm~92193bedc2b75355:
Auto merged
BitKeeper/deleted/.del-mysql-max.dirs~be29c2b464db6050:
Auto merged
BitKeeper/deleted/.del-mysql-max.postinst~cc8a0b3de02b23e0:
Auto merged
BitKeeper/deleted/.del-mysql-max.postrm~66c355bd3081578b:
Auto merged
BitKeeper/deleted/.del-mysql-server-debug.dirs~7b6329c9df635ce4:
Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postinst~12af8ffb8a145fae:
Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postrm~ae113145ebc34ac8:
Auto merged
BitKeeper/deleted/.del-mysql-server-shared.dirs~cb56821f47811c7c:
Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postinst~c6fee24788b634a7:
Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postrm~f3d7f9c6bfb3ca9b:
Auto merged
BitKeeper/deleted/.del-mysql-server.conffiles~566a6664d16909f0:
Auto merged
BitKeeper/deleted/.del-mysql-server.dirs~b12380a091807c5e:
Auto merged
BitKeeper/deleted/.del-mysql-server.postinst~d72bf57a84001364:
Auto merged
BitKeeper/deleted/.del-mysql-server.postrm~68a988229b41c3bb:
Auto merged
BitKeeper/deleted/.del-mysql-server.prerm~4445eacc70e74899:
Auto merged
BitKeeper/deleted/.del-shlibs~3fe34471c220623c:
Auto merged
BitKeeper/deleted/.del-ta~ec794c5d9d922b6c:
Auto merged
BitKeeper/deleted/.del-tb~8844e8c985e40d4e:
Auto merged
Post-merge fixes. Setting write bit before calling Field::store() since the function asserts that
the write bit has been set.
sql/field.cc:
Setting bit in write set to prevent assertion from throwing when calling Field::store().
If mysql_lock_tables fails because the lock was aborted, we need to
reset thd->some_tables_delete, otherwise we might loop indefinitely
because handler's tables are not closed in a standard way, meaning
that close_thread_tables() (which resets some_tables_deleted) is not
used.
This patch fixes sporadical failures of handler_myisam/innodb tests
which were introduced by previous fix for this bug.
sql/sql_handler.cc:
Properly reset thd->some_tables_deleted if mysql_lock_tables
fails for some reason.
into kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/rpl_record.cc:
Manual merge.
into mysql.com:/home/hf/work/31155/my51-31155
sql/item.h:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/item.cc:
merging
sql/item_geofunc.cc:
merging
(compiler issue ?)
Problem:
Improper compile-time flags on AIX prevented use of files > 2 GB. This
resulted in Max_data_length being truncated to 2 GB by MyISAM code.
Solution:
Reverted large-file changes from the fix for bug10776. We need to define
_LARGE_FILES on AIX to have support for files > 2 GB.
Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
automatically defined by including standards.h, we also need a
workaround to avoid this conflict.
config/ac-macros/large_file.m4:
Reverted large-file changes from the fix for bug10776. We need to define
_LARGE_FILES on AIX to have support for files > 2 GB.
include/my_global.h:
_LARGE_FILE_API is defined in standards.h that is automatically included
by at least some C++ compilers on AIX. Since it is also incompatible
with _LARGE_FILES which is required for POSIX IO calls to be
largefile-safe, the only workaround is to explicitely #undef
_LARGE_FILE_API.
into sin.intern.azundris.com:/home/tnurnberg/30951/51-30951
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
sql-common/my_time.c:
Auto merged
makedate() will fold years below 100 into the 1970-2069 range. CS removes code
that also wrongly folded years between 100 and 200 into that range, which should
be left unchanged. Backport from 5.1.
mysql-test/r/func_sapdb.result:
Show that makedate() works correctly for 100 <= year < 200.
mysql-test/t/func_sapdb.test:
Show that makedate() works correctly for 100 <= year < 200.
sql-common/my_time.c:
Remove unnecessary date magic. Syncs behaviour with 5.1+
and manual.
Options to mysqld were not processed correctly because switch statement
was missing some "break"s. CS adds them.
No test case; would require .opt file and server restart. Manually tested.
sql/mysqld.cc:
Add missing "break"s to switch() in mysqld to fix option processing.
into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
BitKeeper/deleted/.del-changelog:
Auto merged
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in:
Auto merged
BitKeeper/deleted/.del-mysql-client-BASE.files.in:
Auto merged
BitKeeper/deleted/.del-mysql-server-BASE.files.in:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-mysql-test-BASE.files.in:
Auto merged
BitKeeper/deleted/.del-rules:
Auto merged
Makefile.am:
Merged in removal of debian dir from 5.0-maint
