1
0
mirror of https://github.com/MariaDB/server.git synced 2025-04-24 18:27:21 +03:00

1164 Commits

Author SHA1 Message Date
unknown
a29e59e00c BUG#19122: MySQL Server crashes when ALTER TABLE t1 REBUILD PARTITION on InnoDB 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.
2006-05-26 18:44:52 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
90c415ffcd BUG#19122: MySQL Server crashes when ALTER TABLE t1 REBUILD PARTITION on InnoDB table 2006-05-26 18:44:52 -04:00
unknown
f7190a3e81 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140
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
2006-05-12 15:44:15 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
640a4de065 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 15:44:15 -04:00
unknown
0e336304d0 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  Auto merged
mysql-test/t/ndb_partition_key.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
2006-05-12 12:22:31 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c85be97f50 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
2006-05-12 12:22:31 -04:00
unknown
5479f8ded6 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19067


sql/partition_element.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Manual merge
2006-05-11 16:03:12 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
5de2150b85 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19067
2006-05-11 16:03:12 -04:00
unknown
4e3f4e970f BUG#19010: Fix issues with that ALTER TABLE from auto-partitioned NDB table doesn't work unless primary key exists on table.
mysql-test/r/ndb_bitfield.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/r/ndb_dd_basic.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/r/ndb_dd_disk2memory.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/r/ndb_gis.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/r/ndb_partition_key.result:
  New test cases for auto-partitioning change that was made to fix bug
mysql-test/r/rpl_ndb_UUID.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/r/rpl_ndb_dd_advance.result:
  Test cases changes now that auto-partitioning is remembered in frm file
mysql-test/t/ndb_partition_key.test:
  New test cases for auto-partitioning change that was made to fix bug
sql/partition_info.h:
  New boolean to keep track of auto partitioned or not
sql/sql_partition.cc:
  Ensure that auto-partitiong flag is reset when partitions are dropped, added, reorganised or coalesced.
  Ensure that auto-partitioned tables are altered into non-partitioned table when ALTER TABLE t1 engine=X
  is performed.
sql/sql_show.cc:
  Only print partition info for non-auto-partitioned tables
sql/sql_table.cc:
  Set auto partition flag when auto partitions are generated in create table
sql/table.cc:
  Fix reading of frm file where new auto-partition flag is introduced.
sql/table.h:
  New flag for auto partition on share object
sql/unireg.cc:
  Fix code for writing frm to also write autopartition flag at end of partition info, fix some length issues
  at the same time that was in this part that caused no problems since partition info always was the last info
  in the file.
2006-05-10 12:53:40 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
56b97747de BUG#19010: Fix issues with that ALTER TABLE from auto-partitioned NDB table doesn't work unless primary key exists on table. 2006-05-10 12:53:40 -04:00
unknown
0edd2ec4a7 BUG#19140: Create index caused crash
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.
2006-05-08 21:41:10 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
b8227de1bf BUG#19140: Create index caused crash 2006-05-08 21:41:10 -04:00
unknown
791a5d9444 Fixed compiler warnings
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
Fixed some memory leaks


configure.in:
  Move plugin declarations after system functions have been checked
  (Fixes problem with ndb_config failing becasue SHM is not declared)
mysql-test/t/disabled.def:
  Disabled ndb_load, as it is in 5.0
  (Fails randomly in binlog_close_connection())
mysql-test/t/log_tables.test:
  Update error numbers
mysql-test/t/ndb_config.test:
  Moved test depending on SHM to ndb_config2.test
mysql-test/t/ndb_partition_error.test:
  Update error numbers
sql/event_timed.cc:
  Removed not needed line
sql/ha_berkeley.cc:
  Fixed compiler warning
sql/ha_heap.cc:
  Fixed compiler warning
sql/ha_innodb.cc:
  Fixed compiler warning
sql/ha_myisam.cc:
  Fixed compiler warning
sql/ha_myisammrg.cc:
  Fixed compiler warning
sql/ha_ndbcluster.cc:
  Fixed compiler warning
sql/ha_partition.cc:
  Fixed compiler warning
sql/mysql_priv.h:
  After merge fix
sql/mysqld.cc:
  Fixed memory leak in skip_grant.test
sql/share/errmsg.txt:
  Removed wrong error messages
sql/sql_lex.cc:
  More debugging
  Faster lex_end()
sql/sql_partition.cc:
  Fixed memory leak
sql/sql_view.cc:
  Fixed memory leak
mysql-test/r/ndb_config2.result:
  New BitKeeper file ``mysql-test/r/ndb_config2.result''
mysql-test/t/ndb_config2.test:
  New BitKeeper file ``mysql-test/t/ndb_config2.test''
2006-05-04 19:39:47 +03:00
monty@mysql.com
c10f37673c Fixed compiler warnings
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
Fixed some memory leaks
2006-05-04 19:39:47 +03:00
unknown
fd40f0dd1d WL 2826: Error handling of ALTER TABLE for partitioning
Fixed merge issue


sql/sql_partition.cc:
  Added some debug printouts
sql/sql_table.cc:
  Fixed merge issue
2006-04-22 04:38:19 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
33eccd0c1e WL 2826: Error handling of ALTER TABLE for partitioning
Fixed merge issue
2006-04-22 04:38:19 -04:00
unknown
9d37127766 Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug16002
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
2006-04-21 09:52:51 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c949342101 Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug16002
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
2006-04-21 09:52:51 -04:00
unknown
661537c744 BUG#19067: Crash when ALTER TABLE for default subpartitioned table
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
2006-04-21 08:43:07 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
82dfff9d08 BUG#19067: Crash when ALTER TABLE for default subpartitioned table 2006-04-21 08:43:07 -04:00
unknown
1727aec630 BUG#19067: Alter table add partition for subpartitioned table crashes
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
2006-04-20 14:11:54 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
570c74e456 BUG#19067: Alter table add partition for subpartitioned table crashes
Changed variable name for improved clarity and debugging possibilities
Fixed bug in not assigning subpart_type
2006-04-20 14:11:54 -04:00
unknown
73a66e27e6 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/my_sys.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
BUILD/SETUP.sh:
  manual merge
BUILD/compile-pentium-debug-max:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/ha_ndbcluster.h:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/ha_partition.h:
  manual merge
sql/handler.h:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
sql/unireg.cc:
  manual merge
2006-04-19 21:22:35 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
09e95da616 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-19 21:22:35 -04:00
unknown
319c5da152 WL 2826: Error handling of ALTER TABLE for partitioning
Various bug fixes (mostly mixed to and from in replace methods)


sql/sql_partition.cc:
  Various bug fixes (mostly mixed to and from in replace methods)
sql/sql_table.cc:
  Various bug fixes (mostly mixed to and from in replace methods)
2006-04-19 20:04:00 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
dd257b22dc WL 2826: Error handling of ALTER TABLE for partitioning
Various bug fixes (mostly mixed to and from in replace methods)
2006-04-19 20:04:00 -04:00
unknown
4624982ecb WL 2826: Error handling of ALTER TABLE for partitioning
Use \0 to indicate frm-file
Add more comments
Add more #ifdef code missing previously


sql/sql_partition.cc:
  Use \0 to indicate frm-file
sql/sql_table.cc:
  Use \0 to indicate frm-file
  Add more comments
  Add more #ifdef code missing previously
2006-04-18 16:58:12 +02:00
mikron@c-ae09e253.1238-1-64736c10.cust.bredbandsbolaget.se
eb60344d78 WL 2826: Error handling of ALTER TABLE for partitioning
Use \0 to indicate frm-file
Add more comments
Add more #ifdef code missing previously
2006-04-18 16:58:12 +02:00
unknown
faa5f3e007 BUG#16002: Make partition functions that are unsigned work properly
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
2006-04-17 22:51:34 -04:00
mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se
cef06fdb61 BUG#16002: Make partition functions that are unsigned work properly 2006-04-17 22:51:34 -04:00
unknown
9a40c5bf33 WL 2826: Error handling of ALTER TABLE for partitioning
After review changes


mysql-test/r/ndb_partition_key.result:
  Fixed result file
sql/ha_ndbcluster.cc:
  Fixed interface to create_handler_files
sql/ha_ndbcluster.h:
  Fixed interface to create_handler_files
sql/ha_partition.cc:
  Fixed interface to create_handler_files and made it two-stage for rename
  Removed print_error and now it's used by MySQL Server parts instead
sql/ha_partition.h:
  Fixed interface to create_handler_files
sql/mysql_priv.h:
  Fixed error injects
  Externalised Global DDL log mutex
  Some interface changes
sql/mysqld.cc:
  Moved close of DDL log until all user threads been closed
sql/sql_base.cc:
  Interface changes
sql/sql_partition.cc:
  Moved print_error to mysql server part
sql/sql_table.cc:
  Lots of after review changes
sql/table.cc:
  Fixed upgrade code
2006-04-15 21:49:13 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
8ae26a2868 WL 2826: Error handling of ALTER TABLE for partitioning
After review changes
2006-04-15 21:49:13 -04:00
unknown
42d7e8c087 BUG#18750: Various problems with partition names, quotation marks
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
2006-04-10 13:48:58 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
84575fe0ba BUG#18750: Various problems with partition names, quotation marks 2006-04-10 13:48:58 -04:00
unknown
4d1666f6b8 BUG#18558 "Partition pruning results are incorrect for certain class of WHERE clauses" :
* Produce right results for conditions that were transformed to "(partitioning_range) AND
  (list_of_subpartitioning_ranges)": make each partition id set iterator auto-reset itself
  after it has returned all partition ids in the sequence 
* Fix "Range mapping" and "Range mapping" partitioning interval analysis functions to 
  correctly deal with NULL values. 


mysql-test/r/partition_pruning.result:
  Testcase for BUG#18558
mysql-test/t/partition_pruning.test:
  Testcase for BUG#18558
sql/opt_range.cc:
  BUG#18558: Move partition set iterator initialization to sql_partition.cc, comment fixes
sql/partition_info.h:
  BUG#18558: Make each partition set iterator auto-reset itself after it has returned all 
  partition ids in the set it enumerates.
sql/sql_partition.cc:
  BUG#18558: 
  - Make each partition set iterator auto-reset itself after it has returned all 
    partition ids in the set it enumerates. 
  - Fix partition interval analysis to correctly handle intervals with one or both
    NULL bounds.
sql/sql_partition.h:
  BUG#18558: 
   - Make each partition set iterator auto-reset itself after it has returned all 
     partition ids in the set it enumerates. 
   - Rename PARTITION_ITERATOR::has_null_value to ret_null_part
2006-04-06 21:23:33 +04:00
sergefp@mysql.com
68bd945ca3 BUG#18558 "Partition pruning results are incorrect for certain class of WHERE clauses" :
* Produce right results for conditions that were transformed to "(partitioning_range) AND
  (list_of_subpartitioning_ranges)": make each partition id set iterator auto-reset itself
  after it has returned all partition ids in the sequence 
* Fix "Range mapping" and "Range mapping" partitioning interval analysis functions to 
  correctly deal with NULL values.
2006-04-06 21:23:33 +04:00
unknown
a26509aead BUG#18659: In get_part_iter_for_interval_via_walking(), when we need to
obtain partition number, call partition_info->get_part_partition_id() when
the table has subpartitions, and get_partition_id() otherwise. (The bug
was that we were always doing the latter)


mysql-test/r/partition_pruning.result:
  Testcase for BUG#18659
mysql-test/t/partition_pruning.test:
  Testcase for BUG#18659
2006-04-04 00:52:14 +04:00
sergefp@mysql.com
2130fd06bd BUG#18659: In get_part_iter_for_interval_via_walking(), when we need to
obtain partition number, call partition_info->get_part_partition_id() when
the table has subpartitions, and get_partition_id() otherwise. (The bug
was that we were always doing the latter)
2006-04-04 00:52:14 +04:00
unknown
b7b95ecf2d Fixes 2006-04-03 12:26:35 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
e94274f0cd Fixes 2006-04-03 12:26:35 -04:00
unknown
150d8d3564 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


configure.in:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
include/my_dbug.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
mysql-test/t/ndb_partition_key.test:
  manual merge
sql/ha_partition.cc:
  manual merge
2006-04-01 16:31:53 -05:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
0a02cbb5f6 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-01 16:31:53 -05:00
unknown
79ec84f98a WL 2826: Error handling of ALTER TABLE for partitioning
More review fixes


sql/mysql_priv.h:
  More review fixes
sql/sql_partition.cc:
  More review fixes
sql/sql_table.cc:
  More review fixes
2006-04-01 16:37:36 +02:00
mikron@c-2509e253.1238-1-64736c10.cust.bredbandsbolaget.se
635b0a9dc0 WL 2826: Error handling of ALTER TABLE for partitioning
More review fixes
2006-04-01 16:37:36 +02:00
unknown
9eccbdaa88 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-520ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug13520


sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged
2006-04-01 00:59:25 -05:00
mikael@c-520ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ec1445aac8 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-520ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug13520
2006-04-01 00:59:25 -05:00
unknown
561c21c3f9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18025-r2


sql/sql_partition.cc:
  Auto merged
2006-03-31 22:26:04 +04:00
sergefp@mysql.com
dfb37cb3b1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18025-r2
2006-03-31 22:26:04 +04:00
unknown
c1a3261e60 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug17631


sql/ha_partition.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-03-31 11:42:12 -06:00
reggie@linux.site
b05f270c1f Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug17631
2006-03-31 11:42:12 -06:00