into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/unireg.cc:
Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
Auto merged
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
Also some error in handling options for subpartitions.
mysql-test/r/partition.result:
New test cases
mysql-test/t/partition.test:
New test cases
sql/ha_partition.cc:
Added partition_element to prepare_new_partition so that we can properly set-up table
before creating partitions.
sql/ha_partition.h:
Added partition_element to prepare_new_partition so that we can properly set-up table
before creating partitions.
sql/sql_yacc.yy:
Ensure that subpartitions always inherit options from the partition they belong to.
They can change it afterwards but will use the options as set on partition level
if set at that level.
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
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
mysql-test/r/partition_error.result:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/r/partition.result:
Auto merged
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.
Small corrections after a bad merge
mysql-test/r/partition.result:
Small corrections after a bad merge
mysql-test/r/partition_02myisam.result:
Small corrections after a bad merge
mysql-test/r/partition_mgm.result:
Small corrections after a bad merge
mysql-test/r/partition_range.result:
Small corrections after a bad merge
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
sql/lock.cc:
Added new flag to lock_table_name to ensure we get proper name lock even when we already have lock on table.
sql/mysql_priv.h:
Added new flag to lock_table_name to ensure we get proper name lock even when we already have lock on table.
Added table_list to ALTER_PARTITION_PARAM_TYPE and changed some const char * to char*
sql/sql_base.cc:
Added new flag to lock_table_name to ensure we get proper name lock even when we already have lock on table.
Added table_list to ALTER_PARTITION_PARAM_TYPE and changed some const char * to char*
sql/sql_partition.cc:
New methods to
1) Get a name lock even when we already have one
2) New method that unlocks table and closes the handlers.
3) Release name lock
Integrated those new methods to ensure that handlers are unlocked and closed when drop or
rename is called on them. There is still some work to update the comments to reflect the
last changes.
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
sql/ha_partition.cc:
Auto merged
mysql-test/r/partition.result:
manual merge
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
