into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
BUILD/compile-dist:
Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/create_not_windows.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
mysys/my_lib.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/unireg.cc:
Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
manuakl merge
mysql-test/lib/mtr_process.pl:
manuakl merge
mysql-test/mysql-test-run.pl:
manuakl merge
mysql-test/r/type_newdecimal.result:
manuakl merge
mysql-test/t/create.test:
manuakl merge
mysql-test/t/func_group.test:
manuakl merge
mysql-test/t/type_newdecimal.test:
manuakl merge
into dator5.(none):/home/pappa/bug20583
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/ha_partition.cc:
Auto merged
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/ha_partition.cc:
Ensure index_last always uses ordered index scan
into dator5.(none):/home/pappa/bug17138
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Review comments
mysql-test/t/partition.test:
Changed procedure names ensured procedures were dropped
sql/ha_ndbcluster.h:
Improved name of method
sql/ha_partition.h:
Improved name of method
sql/handler.h:
Improved name of method
Removed deprecated constants
sql/item_sum.cc:
Improved name of method
sql/sql_acl.cc:
Improved name of method
sql/sql_insert.cc:
Removed use of HA_WRITE_SKIP and introduced is_fatal_error instead
sql/sql_select.cc:
Improved name of method
sql/sql_table.cc:
Improved name of method
Reintroduced dead code for future possible use
sql/sql_union.cc:
Improved name of method
sql/sql_update.cc:
Improved name of method
into dator5.(none):/home/pappa/bug17138
mysql-test/t/partition.test:
Auto merged
sql/handler.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
a fatal error. New handling of ignore error in place.
mysql-test/t/partition.test:
New test case
sql/ha_ndbcluster.h:
New handler method to check if error can be ignored
sql/ha_partition.h:
New handler method to check if error can be ignored
sql/handler.h:
New handler method to check if error can be ignored
sql/sql_acl.cc:
Use new handler method
sql/sql_insert.cc:
Use new handler method
sql/sql_table.cc:
Use new handler method
sql/sql_union.cc:
Use new handler method
sql/sql_update.cc:
Use new handler method
into zim.(none):/home/brian/mysql/cleanup-5.1
BitKeeper/deleted/.del-partition_innodb.result:
Delete: mysql-test/r/partition_innodb.result
BitKeeper/deleted/.del-partition_innodb.test:
Delete: mysql-test/t/partition_innodb.test
include/config-win.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/sql_table.cc:
Added new routine to make copy of create_info struct. This struct is
manipulated during alter table and create table but needs to remain
the same for repeated execution in stored procedures or prepared
statements.
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/partition_info.cc:
manual merge
sql/sql_partition.cc:
manual merge
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/partition_info.cc:
manual merge
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/partition_info.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_partition.cc:
Auto merged
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/partition_info.cc:
Disable CSV engine for partitioned tables
sql/share/errmsg.txt:
Update error message for more flexibility
sql/sql_partition.cc:
Editing fixes
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
After review fix
mysql-test/r/partition.result:
Fixes for test
mysql-test/t/partition.test:
Fixes for test
sql/lock.cc:
After review fix
sql/mysql_priv.h:
After review fix
sql/sql_partition.cc:
After review fix
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
BUILD/compile-dist:
Auto merged
client/mysqltest.c:
Auto merged
config/ac-macros/ssl.m4:
Auto merged
include/config-win.h:
Auto merged
include/my_base.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/group_min_max.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/rpl_insert_id_pk.result:
Auto merged
mysql-test/r/rpl_ndb_multi_update3.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/r/rpl_ndb_sp006.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysys/my_clock.c:
Auto merged
mysys/my_copy.c:
Auto merged
mysys/my_create.c:
Auto merged
mysys/my_dup.c:
Auto merged
mysys/my_lib.c:
Auto merged
mysys/my_open.c:
Auto merged
mysys/my_redel.c:
Auto merged
mysql-test/r/create.result:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/r/join_outer.result:
Manual merge
mysql-test/t/func_group.test:
Manual merge
mysql-test/t/group_min_max.test:
Manual merge
mysql-test/t/innodb_mysql.test:
Manual merge
mysql-test/r/partition.result:
Added new test cases
mysql-test/r/partition_error.result:
Fixed test case
mysql-test/t/partition.test:
Added new test cases
mysql-test/t/partition_error.test:
Fixed test case
sql/ha_partition.cc:
Review fixes
sql/partition_element.h:
Review fixes
sql/partition_info.cc:
Review fixes
sql/share/errmsg.txt:
Review fixes
sql/sql_partition.cc:
Review fixes
sql/sql_yacc.yy:
Enabled possibility to use (MAXVALUE) as well as MAXVALUE.
into c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19067
mysql-test/t/partition.test:
Auto merged
sql/partition_info.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/partition.result:
SCCS merged
- Add missing drop(s)
- Reset changed variables
NOTE! These kind of problems are easily found with --check-testcases options to mysql-test-run.pl
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
Add missing drop table
mysql-test/extra/rpl_tests/rpl_loaddata.test:
Add missing drop table
mysql-test/extra/rpl_tests/rpl_log.test:
Tables where only dropped on slave, switch to master connection before dropping them
mysql-test/extra/rpl_tests/rpl_multi_update3.test:
Add missing drop table
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
Add missing drop database
mysql-test/include/check-testcase.test:
Add option "--skip-lock-tables" when dumping tables, as noone else is using the tables anyway
mysql-test/r/ndb_cache_multi.result:
Reset query_cache_size after test on both master and "second" master mysqld
mysql-test/r/partition.result:
Add missing drop procedure
mysql-test/r/rpl_drop_db.result:
Add missing drop table
mysql-test/r/rpl_multi_update3.result:
Add missing drop table
mysql-test/r/rpl_ndb_multi_update3.result:
Add missing drop table
mysql-test/r/rpl_ndb_sp006.result:
Add missing drop database
mysql-test/r/rpl_stm_no_op.result:
Add missing drop table
mysql-test/r/rpl_variables.result:
Reset slave_net_timeout to it's default value after test
mysql-test/t/ndb_cache_multi.test:
Reset query_cahche_size after test
mysql-test/t/partition.test:
Add missing drop procedure
mysql-test/t/rpl_drop_db.test:
Add missing drop table
mysql-test/t/rpl_stm_no_op.test:
Add missing drop table
mysql-test/t/rpl_variables.test:
Reset slave_net_timeout to it's default value after test
Needed some special handling of the case when no_list_values == 0
mysql-test/r/partition.result:
Added a couple of new test cases
mysql-test/t/partition.test:
Added a couple of new test cases
sql/partition_info.cc:
Rearranged some code to handle case where no_list_values == 0 which
happens when one partition with only one value == NULL.
sql/sql_partition.cc:
Rearranged code to remove compiler warning and also since we
now have handled the case where no_list_values == 0 in a special
case before coming here
Added code for handling the special case where no_list_values == 0
mysql-test/r/partition.result:
Added new test case
mysql-test/t/partition.test:
Added new test case
storage/archive/ha_archive.cc:
Moved some code to avoid that ha_archive::create leaves files after error in create
There are still cases where this occurs but now only on file creation errors.
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
mysql-test/r/partition.result:
manual merge
mysql-test/t/partition.test:
manual merge
mysql-test/r/ndb_partition_key.result:
Manicural changes removed a space from a double-space
mysql-test/r/partition.result:
Manicural changes removed a space from a double-space
Added new test case
mysql-test/r/partition_02myisam.result:
Manicural changes removed a space from a double-space
mysql-test/r/partition_range.result:
Manicural changes removed a space from a double-space
mysql-test/t/partition.test:
New test case
sql/sql_partition.cc:
Removed unnecessary extra spaces
Added show_partition_options set in the same way as when to show table options in SHOW CREATE TABLE
sql/sql_partition.h:
Removed unnecessary extra spaces
Added show_partition_options set in the same way as when to show table options in SHOW CREATE TABLE
sql/sql_show.cc:
Removed unnecessary extra spaces
Added show_partition_options set in the same way as when to show table options in SHOW CREATE TABLE
sql/sql_table.cc:
Removed unnecessary extra spaces
Added show_partition_options set in the same way as when to show table options in SHOW CREATE TABLE
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/partition_info.cc:
Check for not merge handler in partitioned table
sql/share/errmsg.txt:
New error message
mysql-test/r/partition_innodb.result:
New BitKeeper file ``mysql-test/r/partition_innodb.result''
mysql-test/t/partition_innodb.test:
New BitKeeper file ``mysql-test/t/partition_innodb.test''
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
mysql-test/t/partition.test:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/ndb_partition_key.result:
manual merge
mysql-test/r/partition.result:
manual merge
mysql-test/t/ndb_partition_key.test:
manual merge
mysql-test/r/ndb_partition_key.result:
New test case to ensure path in code is tested
mysql-test/r/partition.result:
New test case for bug
mysql-test/t/ndb_partition_key.test:
New test case to ensure path in code is tested
mysql-test/t/partition.test:
New test case for bug
sql/sql_partition.cc:
Use stack variable, not variable on lex object, caused havoc when doing a create index.
sql/sql_table.cc:
Editorial changes + added a comment to a path in code I didn't remember myself what it was good for.
Implemented enable/disable index routines for partition handler
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/ha_partition.cc:
Implemented enable/disable index routines for partition handler
sql/ha_partition.h:
Implemented enable/disable index routines for partition handler
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/ha_partition.cc:
Handle delete_length in info call (was forgotten)
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/sql_parse.cc:
Moved code to clone the partition info object such that also
CREATE TABLE ... AS SELECT benefits from it
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
sql/ha_partition.cc:
Auto merged
sql/partition_info.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/partition.result:
manual merge
mysql-test/t/partition.test:
manual merge
sql/share/errmsg.txt:
manual merge
mysql-test/r/partition.result:
New test cases
mysql-test/r/partition_02myisam.result:
ENGINE always specified per partition in show table
mysql-test/t/partition.test:
New test cases
sql/partition_element.h:
New copy constructor for partition_element
sql/partition_info.cc:
Use new copy constructor to ensure default subpartitions inherit partition options from parent
Ensure engine is always set on both partitions and subpartitions
sql/sql_partition.cc:
Removed unneeded bool to generate_partition_syntax
Write partition options also for subpartitioned tables when subpartitioning is by default
Set up defaults for new partitions also in REORGANIZE PARTITION
sql/sql_partition.h:
Removed unneeded parameter to generate_partition_syntax call
sql/sql_show.cc:
Removed unneeded parameter to generate_partition_syntax call
sql/sql_table.cc:
Removed unneeded parameter to generate_partition_syntax call
Changed variable name for improved clarity and debugging possibilities
Fixed bug in not assigning subpart_type
mysql-test/t/partition.test:
Added new test case
sql/partition_info.cc:
Changed variable name for improved clarity and debugging possibilities
Fixed bug in not assigning subpart_type
sql/sql_partition.cc:
Changed variable name for improved clarity and debugging possibilities
Fixed bug in not assigning subpart_type
mysql-test/r/partition.result:
A number of new test cases for unsigned partition functions
mysql-test/r/partition_error.result:
A number of new test cases for unsigned partition functions
mysql-test/r/partition_range.result:
A number of new test cases for unsigned partition functions
mysql-test/t/partition.test:
A number of new test cases for unsigned partition functions
mysql-test/t/partition_error.test:
A number of new test cases for unsigned partition functions
mysql-test/t/partition_range.test:
A number of new test cases for unsigned partition functions
sql/ha_partition.cc:
Error message for no partition found needs to take signed/unsigned into account when printing erroneus value
sql/partition_element.h:
Introduced signed_flag and max_value flag on partition elements
Also list is now a list of a struct rather than simply longlong values
Small rearranges of order
sql/partition_info.cc:
Introduced signed_flag and max_value flag on partition elements
Also list is now a list of a struct rather than simply longlong values
Small rearranges of order
Lots of new code to handle checks of proper definition of table when
partition function is unsigned
sql/partition_info.h:
Mostly rearrangement of code and some addition of a THD object in check_partition_info call
plus a new method for comparing unsigned values
sql/share/errmsg.txt:
Negative values not ok for unsigned partition functions
sql/sql_partition.cc:
Fixed a multi-thread bug (when defining several partitioned tables in parallel)
New code to generate partition syntax that takes into account sign of constants.
Made function fix_fields_part_func more reusable.
Fixed a number of get_partition_id functions for range and list and similar functions
for partition pruning code.
Unfortunately fairly much duplication of code with just small changes.
sql/sql_partition.h:
New function headers
sql/sql_show.cc:
Changed list of values for LIST partitioned tables
Also fixed printing of unsigned values in INFORMATION SCHEMA for partitioned table
sql/sql_table.cc:
Fixed for new interface
sql/sql_yacc.yy:
Moved definition of struct to partition_element.h
Added code to keep track of sign of constants in
RANGE and LIST partitions
sql/table.cc:
Fixed for new interface
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
mysql-test/t/partition.test:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/partition.result:
manual merge
sql/share/errmsg.txt:
manual merge
