into pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
configure.in:
Auto merged
include/mysql/plugin.h:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/partition_innodb.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/partition_innodb.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
into mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
Additonal after merge fix
mysql-test/r/ctype_cp1250_ch.result:
Auto merged
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_cp1250_ch.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
Auto merged
sql/item_create.cc:
After merge fix
into buzz.(none):/home/davi/mysql-5.1-runtime
mysql-test/r/ps.result:
Auto merged
mysql-test/t/limit.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/item.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_user_variables.result:
Manual merge
mysql-test/suite/rpl/t/rpl_user_variables.test:
Manual merge
sql/sql_yacc.yy:
Manual merge
log-slave-updates and circul repl
After merge fixes.
mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt:
Rename: mysql-test/t/rpl_dual_pos_advance-slave.opt -> mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt
mysql-test/include/wait_for_slave_sql_to_stop.inc:
Do not change connection if it was requested by caller (needed for
circular replication tests).
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
Let include/wait_for_slave_sql_to_stop.inc know that we do not want to
change connection to slave.
sql/rpl_rli.cc:
After merge fix.
sql/rpl_rli.h:
After merge fix.
sql/slave.cc:
After merge fix.
into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
mysql-test/suite/rpl/r/rpl_dual_pos_advance.result:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.h:
Use local.
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
Manual merge.
sql/slave.cc:
Manual merge.
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
client/mysqltest.c:
Auto merged
mysql-test/r/view.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_connect.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Manually merged.
mysql-test/t/disabled.def:
Manually merged.
Fixed a missed case in the patch for Bug#31931.
Also makes Bug#33722 a duplicate of Bug#31931.
Added tests for better coverage.
Replaced some legacy function calls.
mysql-test/r/partition.result:
Added tests for better coverage
mysql-test/r/partition_datatype.result:
Added tests for better coverage
mysql-test/r/partition_error.result:
Added tests for better coverage
mysql-test/suite/parts/inc/partition_engine.inc:
Bug#31931: Mix of handlers error message
Bug#33722 is fixed within this patch too
mysql-test/suite/parts/r/partition_engine_innodb.result:
Bug#31931: Mix of handlers error message
Bug#33722 is fixed within this patch too
mysql-test/suite/parts/r/partition_engine_myisam.result:
Bug#31931: Mix of handlers error message
Bug#33722 is fixed within this patch too
mysql-test/t/partition.test:
Added tests for better coverage
mysql-test/t/partition_datatype.test:
Added tests for better coverage
mysql-test/t/partition_error.test:
Added tests for Bug#31931
sql/partition_info.cc:
Bug#31931: Mix of handlers error message
Fixed case where given info->db_type not matched
thd->lex->create_info.db_type
And the check for inconsistent subpartition engines-clauses.
sql/sql_partition.cc:
Changed ha_legacy_type to ha_resolve_storage_engine_name
sql/sql_table.cc:
Changed ha_legacy_type to ha_resolve_storage_engine_name
Test file fixes for bugs 20129, 31931 and 34225
mysql-test/suite/parts/r/partition_basic_symlink_innodb.result:
Manual merge, new test case to be modified for Bug#20129
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
Manual merge, new test case to be modified for Bug#20129
mysql-test/suite/parts/r/partition_engine_innodb.result:
Manual merge, fix for bug#31931
mysql-test/suite/parts/r/partition_engine_myisam.result:
Manual merge, fix for bug#31931
mysql-test/suite/parts/t/disabled.def:
These should work now since Bug#34225 is fixed
sql/ha_partition.cc:
Bug#20129: partition maintenance command not working with crashed tables
Fix for compiler warnings.
into witty.:/Users/mattiasj/clones/topush-51
mysql-test/r/partition.result:
Auto merged
mysql-test/suite/ndb/r/ndb_partition_key.result:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_key.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/partition_info.cc:
SCCS merged
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
extra/yassl/src/handshake.cpp:
Auto merged
extra/yassl/src/template_instnt.cpp:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/ndb/src/common/util/OutputStream.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Auto merged
storage/ndb/tools/waiter.cpp:
Auto merged
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
mysql-test/suite/ndb_team/t/ndb_autodiscover.test:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/suite/ndb_team/t/ndb_autodiscover3.test:
Manual merge, use already existing way in 5.1
into dipika.(none):/opt/local/work/mysql-5.1-2pc-opt-merge-push
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Manual merge.
a SELECT doesn't cause ROLLBACK of statem".
The idea of the fix is to ensure that we always commit the current
statement at the end of dispatch_command(). In order to not issue
redundant disc syncs, an optimization of the two-phase commit
protocol is implemented to bypass the two phase commit if
the transaction is read-only.
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
Update test results.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Update test results.
mysql-test/suite/rpl_ndb/t/disabled.def:
Disable the tests, for which this changeset reveals a bug:
the injector thread does not always add 'statement commit' to the
rows injected in circular replication set up.
To be investigated separately.
sql/ha_ndbcluster_binlog.cc:
Add close_thread_tables() to run_query: this ensures
that all tables are closed and there is no pending statement transaction.
sql/handler.cc:
Implement optimisation of read-only transactions.
If a transaction consists only of DML statements that do not change
data, we do not perform a two-phase commit for it
(run one phase commit only).
sql/handler.h:
Implement optimisation of read-only transactions.
If a transaction consists only of DML statements that do not change
data, we do not perform a two-phase commit for it
(run one phase commit only).
sql/log.cc:
Mark the binlog transaction read-write whenever it's started.
We never read from binlog, so it's safe and least intrusive to add
this mark up here.
sql/log_event.cc:
Update to the new layout of thd->transaction.
sql/rpl_injector.cc:
Always commit statement transaction before committing the global one.
sql/sp.cc:
Ad comments.
sql/sp_head.cc:
Add comments.
sql/sql_base.cc:
Commit transaction at the end of the statement. Always.
sql/sql_class.cc:
Update thd_ha_data to return the right pointer in the new layout.
Fix select_dumpvar::send_data to properly return operation status.
A test case from commit.inc would lead to an assertion failure in the
diagnostics area (double assignment). Not test otherwise by the test suite.
sql/sql_class.h:
Implement a new layout of storage engine transaction info in which
it is easy to access all members related to the handlerton only
based on ht->slot.
sql/sql_cursor.cc:
Update to the new layout of thd->transaction.
sql/sql_delete.cc:
Remove wrong and now redundant calls to ha_autocommit_or_rollback.
The transaction is committed in one place, at the end of the statement.
Remove calls to mysql_unlock_tables, since some engines count locks
and commit statement transaction in unlock_tables(), which essentially
equates mysql_unlock_tables to ha_autocommit_or_rollback.
Previously it was necessary to unlock tables soon because we wanted
to avoid sending of 'ok' packet to the client under locked tables.
This is no longer necessary, since OK packet is also sent from one place
at the end of transaction.
sql/sql_do.cc:
Add DO always clears the error, we must rollback the current
statement before this happens. Otherwise the statement will be committed,
and not rolled back in the end.
sql/sql_insert.cc:
Remove wrong and now redundant calls to ha_autocommit_or_rollback.
The transaction is committed in one place, at the end of the statement.
Remove calls to mysql_unlock_tables, since some engines count locks
and commit statement transaction in unlock_tables(), which essentially
equates mysql_unlock_tables to ha_autocommit_or_rollback.
Previously it was necessary to unlock tables soon because we wanted
to avoid sending of 'ok' packet to the client under locked tables.
This is no longer necessary, since OK packet is also sent from one place
at the end of transaction.
sql/sql_load.cc:
Remove wrong and now redundant calls to ha_autocommit_or_rollback.
The transaction is committed in one place, at the end of the statement.
Remove calls to mysql_unlock_tables, since some engines count locks
and commit statement transaction in unlock_tables(), which essentially
equates mysql_unlock_tables to ha_autocommit_or_rollback.
Previously it was necessary to unlock tables soon because we wanted
to avoid sending of 'ok' packet to the client under locked tables.
This is no longer necessary, since OK packet is also sent from one place
at the end of transaction.
sql/sql_parse.cc:
Implement optimisation of read-only transactions: bypass 2-phase
commit for them.
Always commit statement transaction before commiting the global one.
Fix an unrelated crash in check_table_access, when called from
information_schema.
sql/sql_partition.cc:
Partitions commit at the end of a DDL operation.
Make sure that send_ok() is done only if the commit has succeeded.
sql/sql_table.cc:
Use ha_autocommit_or_rollback and end_active_trans everywhere.
Add end_trans to mysql_admin_table, so that it leaves no pending
transaction.
sql/sql_udf.cc:
Remvove a redundant call to close_thread_tables()
sql/sql_update.cc:
Remove wrong and now redundant calls to ha_autocommit_or_rollback.
The transaction is committed in one place, at the end of the statement.
Remove calls to mysql_unlock_tables, since some engines count locks
and commit statement transaction in unlock_tables(), which essentially
equates mysql_unlock_tables to ha_autocommit_or_rollback.
Previously it was necessary to unlock tables soon because we wanted
to avoid sending of 'ok' packet to the client under locked tables.
This is no longer necessary, since OK packet is also sent from one place
at the end of transaction.
mysql-test/include/commit.inc:
New BitKeeper file ``mysql-test/include/commit.inc''
mysql-test/r/commit_1innodb.result:
New BitKeeper file ``mysql-test/r/commit_1innodb.result''
mysql-test/t/commit_1innodb.test:
New BitKeeper file ``mysql-test/t/commit_1innodb.test''
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
client/mysqlbinlog.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.cc:
Auto merged
into stella.local:/home2/mydev/mysql-5.1-axmrg
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_events.result:
Result change.
mysql-test/suite/rpl/t/rpl_events.test:
Replacing table with varying contents with a fresh table to avoid
test problems. The contents of the event is unimportant for this
part of the test.
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
extra/resolveip.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/disabled.def:
Take both new entries into "disabled.def".
irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.
This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.
BitKeeper/deleted/.del-rpl_ndb_charset.test:
Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test
BitKeeper/deleted/.del-rpl_ndb_charset.result:
Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
BitKeeper/deleted/.del-rpl_row_charset.test:
Delete: mysql-test/extra/rpl_tests/rpl_row_charset.test
BitKeeper/deleted/.del-rpl_row_charset.test~739be9df1baaee3e:
Delete: mysql-test/suite/rpl/t/rpl_row_charset.test
BitKeeper/deleted/.del-rpl_row_charset_innodb.test:
Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb.test
BitKeeper/deleted/.del-rpl_row_charset_innodb-master.opt:
Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt
BitKeeper/deleted/.del-rpl_row_charset_innodb-slave.opt:
Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt
BitKeeper/deleted/.del-rpl_row_charset_innodb.result:
Delete: mysql-test/suite/rpl/r/rpl_row_charset_innodb.result
BitKeeper/deleted/.del-rpl_row_charset.result:
Delete: mysql-test/suite/rpl/r/rpl_row_charset.result
mysql-test/extra/rpl_tests/rpl_charset.test:
Test is not dependent on binlog format any more.
Using --echo instead of "select" to print text.
Removing lines causing the test to be dependent on binlog contents.
mysql-test/suite/rpl/r/rpl_charset.result:
Result change.
mysql-test/suite/rpl/t/rpl_charset.test:
Using renamed version of test file.
but not collation.
The problem here was that text literals in a view were always
dumped with character set introducer. That lead to loosing
collation information.
The fix is to dump character set introducer only if it was
in the original query. That is now possible because there
is no problem any more of loss of character set of string
literals in views -- after WL#4052 the view is dumped
in the original character set.
mysql-test/r/case.result:
Update result file.
mysql-test/r/compress.result:
Update result file.
mysql-test/r/ctype_collate.result:
Update result file.
mysql-test/r/date_formats.result:
Update result file.
mysql-test/r/ddl_i18n_koi8r.result:
Update result file.
mysql-test/r/ddl_i18n_utf8.result:
Update result file.
mysql-test/r/fulltext.result:
Update result file.
mysql-test/r/func_crypt.result:
Update result file.
mysql-test/r/func_encrypt.result:
Update result file.
mysql-test/r/func_if.result:
Update result file.
mysql-test/r/func_in.result:
Update result file.
mysql-test/r/func_like.result:
Update result file.
mysql-test/r/func_regexp.result:
Update result file.
mysql-test/r/func_set.result:
Update result file.
mysql-test/r/func_str.result:
Update result file.
mysql-test/r/func_time.result:
Update result file.
mysql-test/r/gis.result:
Update result file.
mysql-test/r/group_min_max.result:
Update result file.
mysql-test/r/mysqldump.result:
Update result file.
mysql-test/r/negation_elimination.result:
Update result file.
mysql-test/r/null.result:
Update result file.
mysql-test/r/select.result:
Update result file.
mysql-test/r/show_check.result:
Update result file.
mysql-test/r/sp-code.result:
Update result file.
mysql-test/r/ssl.result:
Update result file.
mysql-test/r/ssl_compress.result:
Update result file.
mysql-test/r/subselect.result:
Update result file.
mysql-test/r/temp_table.result:
Update result file.
mysql-test/r/type_blob.result:
Update result file.
mysql-test/r/view.result:
Update result file.
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
Update result file.
mysql-test/suite/rpl/r/rpl_get_lock.result:
Update result file.
mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
Update result file.
mysql-test/t/view.test:
Add a test case for Bug#32538.
sql/item.cc:
Do not dump character set introducer if it was not specified
explicitly in the original query.
sql/item.h:
Add 'cs_specified' property to Item_string.
sql/sql_yacc.yy:
Set Item_string::cs_specified property to TRUE
when character set introducer is explicitly specified.
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/mysql-test-run.pl:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
manual merge
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1
mysql-test/mysql-test-run.pl:
Auto merged
sql/rpl_rli.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_binlog.cc:
Auto merged
Problem was that it did not work with corrupted/crashed tables.
Solution is to disable these commands until WL#4176 is completed
mysql-test/r/partition.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/inc/partition_alter4.inc:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
copy-paste error, changed from REBUILT to REPAIR, as the heading says
mysql-test/suite/parts/r/partition_alter1_innodb.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_alter1_myisam.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_alter2_innodb.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_alter2_myisam.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_basic_innodb.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_basic_myisam.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_engine_innodb.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/r/partition_engine_myisam.result:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Test result
mysql-test/suite/parts/t/disabled.def:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Disabled test since the tested feature is not longer supported
mysql-test/t/partition.test:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
OPTIMIZE PARTITION is not longer supported, waiting for WL#4176
sql/ha_partition.cc:
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
Problem was that it did not work with corrupted/crashed tables.
Solution is to disable these commands until WL#4176 is completed
(returning HA_ADMIN_NOT_IMPLEMENTED and
#ifdef'ed the non-reachable code)
because it uses BINLOG statement, which is not supported in embedded mode.
Fix: disable the test in embedded mode.
mysql-test/suite/binlog/t/binlog_base64_flag.test:
Must disable this test when running embedded, since BINLOG statements
don't work. This fixes the pushbuild problem on the debx86-b machine on
https://intranet.mysql.com/secure/pushbuild/showpush.pl?dir=mysql-5.1-new-rpl&order=469
Problem: mysqlbinlog does not free memory if an error happens.
Fix: binlog-processing functions do not call exit() anymore. Instead, they
print an error and return an error code. Error codes are propagated all
the way back to main, and all allocated memory is freed on the way.
client/mysqlbinlog.cc:
- New error handling policy: functions processing binlogs don't just
exit() anymore. Instead, they print a message and return an error
status.
- New policy for the global `mysql' and `glob_description_event': these
are not passed as parameters anymore. The global pointer is used
instead.
- More error situations are detected and reported.
- Better error messages: the program never terminates with exit status 1
without explanation any more. Fixed spelling errors. Use consistent
format of messages (a single line beginning with "ERROR: " or
"WARNING: " and ending with "." is printed to stderr.)
- New memory handling: memory is always freed on program termination.
- Better comments: more functions are explained, doxygen is used, and
more precise formulations in some existing comments.
mysql-test/suite/binlog/r/binlog_base64_flag.result:
Result file updated since output format of mysqlbinlog changed while the
test was disabled.
mysql-test/suite/binlog/t/binlog_killed.test:
Mysqlbinlog now works as described when the binlog is open. Hence, the
--force-if-open flag must be passed
mysql-test/suite/binlog/t/binlog_killed_simulate.test:
Mysqlbinlog now works as described when the binlog is open. Hence, the
--force-if-open flag must be passed
mysql-test/suite/binlog/t/disabled.def:
Now that mysqlbinlog cleans up after itself on abnormal termination, we
can enable this test again.
into dipika.(none):/opt/local/work/mysql-5.1-runtime
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/suite/binlog/r/binlog_row_binlog.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/extra/binlog_tests/binlog.test:
Manual merge of binlog test case for Bug#33798
mysql-test/suite/binlog/r/binlog_row_binlog.result:
Add test case result for Bug#33798
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
Add test case result for Bug#33798
sql/item.cc:
Use new method which accepts a unsigned flag.
Pre push fix:
added --sorted_result for consistent results
mysql-test/suite/parts/inc/partition_bit.inc:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
mysql-test/suite/parts/r/partition_bit_innodb.result:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
mysql-test/suite/parts/r/partition_bit_myisam.result:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Auto merged
sql/log_event.cc:
Auto merged
Since it used /tmp-dir, it continues to fail on the same server
until the /tmp-dir is cleaned. (Another problem was that it
uses DATA/INDEX DIR without checking for symlink, which is needed)
Solution:
Moved all DATA/INDEX DIR test to a new partition_basic_symlink.inc file
and use this for myisam and innodb, also requiring symlinks and
not_windows.
(i.e. removed DATA/INDEX DIR use from several tests)
mysql-test/suite/parts/inc/partition_basic.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_bigint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_binary.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_bit.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_blob.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_char.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_date.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_datetime.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_decimal.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_double.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_enum.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_float.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_int.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_16col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_32col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_4col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_8col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_mediumint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_set.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_smallint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_text.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_time.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_timestamp.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_tinyint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_varbinary.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_varchar.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_year.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_basic_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_basic_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_bit_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_bit_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_char_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_char_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_datetime_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_datetime_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_decimal_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_decimal_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_float_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_float_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_int_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_int_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_special_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_special_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/t/partition_sessions.test:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_basic_symlink.inc:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/r/partition_basic_symlink_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/t/partition_basic_symlink_innodb.test:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/t/partition_basic_symlink_myisam.test:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
