Added new test case for bug 18752 (bug already fixed by previous patch)
mysql-test/r/partition.result:
Added new test case for bug 18752 (bug already fixed by previous patch)
mysql-test/t/partition.test:
Added new test case for bug 18752 (bug already fixed by previous patch)
env variable name is fixed.
mysql-test/include/get_binlog_dump_thread_id.inc:
Fixing to right env $var name.
mysql-test/r/rpl_temporary.result:
results
The function agg_cmp_type in item_cmpfunc.cc neglected the fact that
the first argument in a BETWEEN/IN predicate could be a field of a view.
As a result in the case when the retrieved table was hidden by a view
over it and the arguments in the BETWEEN/IN predicates are of
the date/time type the function did not perform conversion of
the constant arguments to the same format as the first field argument.
If formats of the arguments differed it caused wrong a evaluation of
the predicates.
mysql-test/r/view.result:
Added a test case for bug #16069.
mysql-test/t/view.test:
Added a test case for bug #16069.
Removing the problematic line from include test file.
mysql-test/include/get_binlog_dump_thread_id.inc:
replacing replace_result by disable_query_log
mysql-test/r/rpl_temporary.result:
results
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
sql/sql_repl.cc:
Auto merged
mysql-test/t/rpl_temporary.test:
manual merge
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
Idea of the fix is for master to send FD event with `created' as 0
to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
In a case of a connect by slave to the master after its crash temp tables have been already
cleaned up so that slave can not keep `orphan' temp tables.
mysql-test/r/rpl_temporary.result:
results
mysql-test/t/rpl_temporary.test:
wait-free addon to check temp tables are ok after slave reconnect.
sql/sql_repl.cc:
Storing zero for assigning to `created' of FD event on the reconnecting slave.
mysql-test/include/get_binlog_dump_thread_id.inc:
mysqltest's preudo-macro to calculate $id master dump thread id
into mysql.com:/home/mydev/mysql-5.1-aid
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/lib/mtr_process.pl:
Change from "mtr_error()" to "mtr_warning()" on some problems,
because "error" makes the whole suite abort which then makes "Do-compile" terminate,
so none of the following steps (including other etst suites) will be done.
mysql-test/mysql-test-run.sh:
Manual merge from 4.0 (which was a 5.1 backport):
"--with-ndbcluster" is already present,
"--with-ndbcluster-only" is really usable here.
mysql-test/r/events.result:
update result
mysql-test/t/events.test:
update test (bk mangles cp1251 during merge)
mysql-test/t/events_scheduling.test:
fix test
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
- Error 1296 is no longer returned on first select after DROP/CREATE.
mysql-test/r/ndb_alter_table2.result:
Error 1296 is no longer returned on first select after DROP/CREATE, handled proactive in ndb_handle_schema_change.
mysql-test/t/ndb_alter_table2.test:
Error 1296 is no longer returned on first select after DROP/CREATE, handled proactive in ndb_handle_schema_change.
sql/ha_ndbcluster.cc:
Add sourrounding {'s
mysql-test/r/func_time.result:
expected test results for bug #18100 added
mysql-test/t/func_time.test:
test case for bug #18100 added
sql/item_timefunc.cc:
wrong formula for EXTRACT QUARTER, now uses the same calculus as the QUARTER()
function
