into mysql.com:/usr/home/bar/mysql-5.1-new.b16319
mysql-test/r/xml.result:
Auto merged
mysql-test/t/xml.test:
Auto merged
sql/item_xmlfunc.cc:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
client/mysqltest.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysql-test/t/disabled.def:
manual merge
better replicaiton test cleanup to ensure better test predictability
+ some ndb test cleanup
client/mysqltest.c:
increase save_master_pos timeout to 30 seconds for higher test predictability
mysql-test/extra/rpl_tests/rpl_ddl.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/r/rpl_ndb_dd_advance.result:
better replicaiton test cleanup to ensure better test predictability
mysql-test/r/rpl_ndb_sync.result:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/disabled.def:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_bank.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_basic.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_dd_advance.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_dd_basic.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_sync.test:
better replicaiton test cleanup to ensure better test predictability
"upgrade" failed on windows, because of lower_case_table_name.
This fix changes letters to lower case, not to depend on OS.
Note, this change does not affect coverage of
Bug N 17142 "Crash if create with encoded name",
which the test war originally written for.
mysql-test/r/upgrade.result:
Changing "P" to "p" not to depend on lower_case_table_name
mysql-test/t/upgrade.test:
Changing "P" to "p" not to depend on lower_case_table_name
- Terminate loop not only when the limit is met, but alse when there is no more stmts
client/mysqlslap.c:
Terminate loop not only when the limit is met, but alse when there is no more stmts
mysql-test/r/mysqlslap.result:
Remove the extra statmemnt
Open and seek to end of data_file after rename
Fix comment for when file does not need repair.
Set share->mapped_file to NULL always when it's been unmapped
Add test to see that file can be used after repair
mysql-test/r/csv.result:
Add more test to see that the table can be used after repair
mysql-test/t/csv.test:
Add more test to see that the table can be used after repair
storage/csv/ha_tina.cc:
Close share->data_file in before renaming in ha_tina::repair
Open and seek to end after rename
Fix comment for when file does not need repair.
Set share->mapped_file to NULL always when it's been unmapped
ExtractValue didn't understand tag and attribute names
consisting of "tricky" national letters (e.g. latin accenter letters).
It happened because XPath lex parser recognized only basic
latin letter a..z ad a part of an identifier.
Fixed to recognize all letters by means of new "full ctype" which
was added recently.
mysql-test/r/xml.result:
Adding test case
mysql-test/t/xml.test:
Adding test case
sql/item_xmlfunc.cc:
Using recently implemented "true" ctype functionality
to treat all national letters as valid tag names,
Only basic latin letters worked so far.
strings/ctype-simple.c:
A bug fix: ctype is array of 257 elements,
adding offset to address correct element.
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysys/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql-common/client.c:
Auto merged
into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/type_bit_innodb.result:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/key.cc:
Auto merged
sql/field.cc:
Resolve merge conflict
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/partition.result:
Added new test cases
mysql-test/t/partition.test:
Added new test cases
sql/partition_info.cc:
Check partition names that they don't have trailing spaces
sql/share/errmsg.txt:
Added error code for wrong partition names
sql/sql_partition.cc:
New method to add partition name strings, ignore OPTION_SHOW_QUOTE_CREATE
sql/sql_show.cc:
require_quotes had a bug with identifiers that consisted of only digits,
these are allowed identifiers but must be quoted and require_quote didn't
tell this.
sql/sql_yacc.yy:
Partition names should identifers and not ident_or_text
Added new test case for bug 17946
mysql-test/r/partition_pruning.result:
Added new test case for bug 17946
mysql-test/t/partition_pruning.test:
Added new test case for bug 17946
Current auto increment value is placed in partition in which latest
record was saved. So to get auto_increment they have to scan
all partitions and return max value.
mysql-test/r/partition.result:
Fix for bug#18753 Partitions: auto_increment fails
test case
mysql-test/t/partition.test:
Fix for bug#18753 Partitions: auto_increment fails
test case
Added test case for bug 18423
mysql-test/r/partition_hash.result:
Added test case for bug 18423
mysql-test/t/partition_hash.test:
Added test case for bug 18423
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
