Fixing typo and potential memory problem.
Reducing number of concurrent mysqlslap threads since tests fail
in pushbuild due to too many threads.
mysql-test/r/rpl_insert.result:
Result change.
mysql-test/t/rpl_insert.test:
Reducing number of threads since it doesn't pass pushbuild.
sql/sql_insert.cc:
Fixing typo and potential memory problem.
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
BitKeeper/etc/ignore:
auto-union
libmysqld/Makefile.am:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/r/myisam.result:
Manual merge.
mysql-test/t/myisam.test:
Manual merge.
sql/set_var.cc:
Manual merge.
sql/set_var.h:
Manual merge.
sql/sql_cache.cc:
Manual merge.
sql/sql_class.cc:
Manual merge.
mysql-test/r/type_newdecimal.result:
Make test clean up after itself.
mysql-test/t/ps_1general.test:
Remove improperly merged lines.
mysql-test/t/type_newdecimal.test:
Make test clean up after itself.
(the bug itself is not repeatable any more).
mysql-test/r/lock.result:
Update test results (Bug#18884)
mysql-test/t/lock.test:
Add a test case for Bug#18884 "lock table + global read lock = crash"
BitKeeper/etc/ignore:
Modify ignore list to work with BitKeeper 4
mysql-test/t/mysqldump.test:
Fix the test for Bug#18462 to use MYSQLTEST_VARDIR instead of mysql-test/
directory for temporary files.
into dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.1/bug19188_graved_temp
mysql-test/r/rpl_temporary.result:
use local.
mysql-test/t/rpl_temporary.test:
use local.
sql/sql_base.cc:
use local
sql/mysql_priv.h:
added is_user_table
Small post-patch fixes
mysql-test/r/federated.result:
BUG #19773
Test result fixes
mysql-test/t/federated.test:
BUG #19774
Removed failing line to test.
sql/ha_federated.cc:
BUG #19773
method declartion and definition not the same.
into bodhi.local:/opt/local/work/mysql-5.0-runtime
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_update.cc:
Manual merge.
- keep accounting for aoutstanding drop trigger requests
- also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)
Disable test cases ndb_alter_table3, ndb_autodiscover3, ndb_dd_advance,
and ndb_multi in statement-based binlogging mode until bug can be fixed.
mysql-test/t/ndb_alter_table3.test:
Disable test in statement-based binlogging mode.
mysql-test/t/ndb_autodiscover3.test:
Disable test in statement-based binlogging mode.
mysql-test/t/ndb_dd_advance.test:
Disable test in statement-based binlogging mode.
mysql-test/t/ndb_multi.test:
Disable test in statement-based binlogging mode.
mysql-test/lib/mtr_process.pl:
Resolved a previous bad merge of two different attempts at fixing the same problem.
mysql-test/mysql-test-run.pl:
Default for verbose should be Off.
in pushbuild on Replication/Backup team tree.
include/my_sys.h:
Using "char" instead of "byte" for my_strndup().
mysys/safemalloc.c:
Using "char" instead of "byte" for my_strndup().
into jabberwock.site:/home/dlenev/mysql-5.1-bg18437
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
sql/sql_table.cc:
Manual merge.
ndb/src/kernel/blocks/ERROR_codes.txt:
DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
DbtupTabDesMan: add merge with left buddies
ndb/test/ndbapi/testDict.cpp:
DbtupTabDesMan: add merge with left buddies
ndb/test/run-test/daily-basic-tests.txt:
DbtupTabDesMan: add merge with left buddies
BUG#20850: Assert during slave shutdown in many rpl_* tests.
This was caused by a race condition at the end of handle_slave_io
which under some circumstances allowed the cleanup to proceed before
the thread had completed.
sql/slave.cc:
BUG#20850: Assert during slave shutdown in many rpl_* tests.
This was caused by a race condition at the end of handle_slave_io
which under some circumstances allowed the cleanup to proceed before
the thread had completed.
sql/event_timed.cc:
After merge fixes: dbname can never be NULL.
sql/events.cc:
After merge fixes: use a new signature of sp_use_new_db
sql/sp_head.cc:
After merge fixes: replace assert with an if for events code to work.
sql/sql_parse.cc:
After merge fixes: put back free_items, it's used in partitioning.
Whether it is not a bug is to be investigated.
Remove check_db_used, as planned.
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-merge1
mysql-test/r/federated.result:
BUG #19773
Hand-merge conflicts from 5.0 to 5.1
mysql-test/t/federated.test:
BUG #19773
Hand-merge conflicts from 5.0 to 5.1
sql/ha_federated.cc:
BUG #19773
Hand-merge conflicts from 5.0 to 5.1
sql/ha_federated.h:
BUG #19773
Hand-merge conflicts from 5.0 to 5.1
Fix random failures in test 'wait_timeout' that depend on exact timing.
1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.
2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.
mysql-test/r/wait_timeout.result:
Fix two races in test.
mysql-test/t/wait_timeout.test:
Fix two races in test.
statement-based" (bugfix was committed today):
we verify that now it works in mixed mode. And a comment.
mysql-test/r/rpl_switch_stm_row_mixed.result:
result update
mysql-test/t/rpl_switch_stm_row_mixed.test:
testcase for BUG#20633
sql/sql_insert.cc:
the #ifdef was not necessary; a comment.
into chilla.local:/home/mydev/mysql-5.0-amerge
mysql-test/r/key.result:
Auto merged
mysql-test/t/key.test:
Auto merged
sql-common/client.c:
Auto merged
sql/table.cc:
Auto merged
