This is the first commit. Cleanups are
likely to follow after the merge.
mysql-test/r/csv.result:
update result
mysql-test/t/csv.test:
add tests for CSV REPAIR/RESTORE.
storage/csv/ha_tina.cc:
add repair/check and a meta-file processing for it
storage/csv/ha_tina.h:
add new functions required for tina repair/check
- detect the need for row-based binlogging not at execution stage but earlier at parsing stage; needed for example for CREATE TABLE SELECT UUID().
- more tests of this mixed mode.
mysql-test/r/rpl_switch_stm_row_mixed.result:
result update
mysql-test/t/rpl_switch_stm_row_mixed.test:
testing more scenarios for the mixed replication mode.
Added support for manual testing of UDFs vs the mixed mode (behind a variable in the test).
Changing old file names to better ones.
sql/item_create.cc:
at parse time, when we see a UUID(), put up a flag in LEX to say this binlogs properly only with row-based binlogging.
sql/item_func.cc:
it's not perfect to put up the flag at this execution stage, better do it at parse stage.
sql/item_strfunc.cc:
it's not perfect to put up the flag at this execution stage, better do it at parse stage
sql/set_var.cc:
this assertion is wrong, this piece of code can happen in RBR mode too.
sql/sql_lex.cc:
when we reinitialize the LEX members before every query, we have to reinitialize the new flag
sql/sql_lex.h:
A new flag, set at parsing stage, which tells if some items seen during parsing stage require row-based replication to binlog/replicate correctly
when this statement is later executed.
It has to be in LEX and not directly in THD, for this to work in prepared statements.
sql/sql_parse.cc:
Parsing stage happened at some time in the past and set up the flag in LEX, now that we execute the statement we actually turn on row-based binlogging
if the thread's binlog format is "mixed". We then turn it off when leaving mysql_execute_command().
Some cleanup code was not executed if leaving mysql_execute_command() at the "error" label, fixing this. A better fix than the "goto end" would be
to modify each "goto error" to "res=1; goto end" but it required changing many lines which I don't want to do now ("make smallest possible patch").
sql/sql_yacc.yy:
When at parsing stage we see a UDF we put up a flag to say that row-based binlogging is preferred.
into mysql.com:/home/jimw/my/mysql-5.1-clean
sql/sql_partition.cc:
Auto merged
mysql-test/r/partition.result:
e
Resolve conflict
mysql-test/t/partition.test:
Resolve conflict
Bug # 17894 - Comparison with "less than" operator fails with range partition
The problem here was that on queries such as < 3, the range given is NULL < n < 3.
The null part works correctly where the null value is stored in rec[0] and the
field is marked as being null. However, when the 3 is processed, the 3 is places
on rec[0] but the null flag is left uncleared.
partition_range.result:
Results block for bug #17894
partition_range.test:
Test block for bug #17894
partition_list.result:
Results block for bug #17173
partition_list.test:
Test block for bug #17173
opt_range.cc:
call set_notnull to clear any null flag that may have been set
sql/opt_range.cc:
call set_notnull to clear any null flag that may have been set
mysql-test/t/partition_list.test:
Test block for bug #17173
mysql-test/r/partition_list.result:
Results block for bug #17173
mysql-test/t/partition_range.test:
Test block for bug #17894
mysql-test/r/partition_range.result:
Results block for bug #17894
When doing an ALTER TABLE on a table using partitioning, force the table
definition to get reloaded, since it may become invalid whenever the ALTER
TABLE fails (even for an ALTER TABLE without specific partitioning changes).
mysql-test/r/partition.result:
New results
mysql-test/t/partition.test:
New regression test
sql/sql_partition.cc:
Always force table to get reloaded when we ALTER a
partitioned table
mysql-test/mysql-test-run.pl:
Take a snapshot of the data dirs just after all db's have been installed and usedthat snasphot to restore the db(s) to a known state after a test case has failed.
Thus avoiding subsequent test cases to fail because of previous test failures.
Made sure that no subpartition stuff in non-subpartitioned table
mysql-test/r/partition.result:
New test case
mysql-test/r/partition_mgm_err.result:
Fixed bug in test case
mysql-test/t/partition.test:
New test case
mysql-test/t/partition_mgm_err.test:
Fixed bug in test case
sql/sql_partition.cc:
Made sure that no subpartition stuff in non-subpartitioned table
with ALTER TABLE ADD/REORGANIZE PARTITION
Ensure that default subpartitioning is removed when subpartitions
are defined in ADD/REORGANIZE PARTITION
mysql-test/r/partition.result:
New test cases
mysql-test/t/partition.test:
New test cases
sql/sql_partition.cc:
Ensure that default subpartitioning is removed when subpartitions
are defined in ADD/REORGANIZE PARTITION
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
Auto merged
sql/rpl_injector.cc:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
manual merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
+ removed extra binlog events generated by drop table schema ops to produce predictable test cases
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
ndb: dict use define for number of pages in table definition
Remove test dependancy of table order in backup
mysql-test/r/ndb_restore.result:
Remove dependancy of table order in backup
mysql-test/t/ndb_restore.test:
Remove dependancy of table order in backup
into mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree
client/mysqldump.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
tests/mysql_client_test.c:
Auto merged
Now DEFINER-clause in stored routines is expected to appear
in 5.0.20 release, not in 5.0.19. as it was supposed before.
client/mysqldump.c:
Fixing version.
mysql-test/r/mysqldump.result:
Updated the result file.
into mysql.com:/home/mydev/mysql-5.1-bug14980
include/my_base.h:
Auto merged
mysql-test/r/myisam.result:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_rnext_same.c:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
