Commits · 79ec84f98abcc94ec267c232207f36a1669b7125 · nexedi / MariaDB

01 Apr, 2006 1 commit

WL 2826: Error handling of ALTER TABLE for partitioning · 79ec84f9

unknown authored Apr 01, 2006

More review fixes


sql/mysql_priv.h:
  More review fixes
sql/sql_partition.cc:
  More review fixes
sql/sql_table.cc:
  More review fixes

79ec84f9

24 Mar, 2006 1 commit

WL 2826: Error handling of ALTER TABLE for partitioning · 3928d962

unknown authored Mar 24, 2006

Loads of review comments fixed
inactivate => deactivate
table log => ddl log
Commented on Error Inject Module added
Put various #defines into enums
Fixed abort_and_upgrade_lock, removed unnecessary parameter
Fixed mysqlish method intro's
Fixed warning statements
5.1.7 was released still with partition states in clear text

Fixed io_size bug
Fixed bug in open that TRUNCATED before reading :)
file_entry => file_entry_buf
Don't open DDL log until first write call to DDL log
handler_type => handler_name
no => num



sql/ha_partition.cc:
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
sql/mysql_priv.h:
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
  Commented on Error Inject Module added
  Put various #defines into enums
  Fixed abort_and_upgrade_lock, removed unnecessary parameter
sql/mysqld.cc:
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
  Commented on Error Inject Module added
  Put various #defines into enums
  Fixed abort_and_upgrade_lock, removed unnecessary parameter
sql/partition_element.h:
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
  Commented on Error Inject Module added
  Put various #defines into enums
  Fixed abort_and_upgrade_lock, removed unnecessary parameter
sql/partition_info.h:
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
  Commented on Error Inject Module added
  Put various #defines into enums
  Fixed abort_and_upgrade_lock, removed unnecessary parameter
sql/share/errmsg.txt:
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
  Commented on Error Inject Module added
  Put various #defines into enums
  Fixed abort_and_upgrade_lock, removed unnecessary parameter
sql/sql_base.cc:
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
  Commented on Error Inject Module added
  Put various #defines into enums
  Fixed abort_and_upgrade_lock, removed unnecessary parameter
sql/sql_partition.cc:
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
  Commented on Error Inject Module added
  Put various #defines into enums
  Fixed abort_and_upgrade_lock, removed unnecessary parameter
  Fixed mysqlish method intro's
  Fixed warning statements
sql/sql_table.cc:
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
  Commented on Error Inject Module added
  Put various #defines into enums
  Fixed abort_and_upgrade_lock, removed unnecessary parameter
  Fixed mysqlish method intro's
  Fixed warning statements
  Fixed io_size bug
  Fixed bug in open that TRUNCATED before reading :)
  file_entry => file_entry_buf
  Don't open DDL log until first write call to DDL log
  handler_type => handler_name
  no => num
sql/table.cc:
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
  Commented on Error Inject Module added
  Put various #defines into enums
  Fixed abort_and_upgrade_lock, removed unnecessary parameter
  Fixed mysqlish method intro's
  Fixed warning statements
  5.1.7 was released still with partition states in clear text
  
  Fixed io_size bug
  Fixed bug in open that TRUNCATED before reading :)
  file_entry => file_entry_buf
  Don't open DDL log until first write call to DDL log
  handler_type => handler_name
  no => num

3928d962

22 Mar, 2006 2 commits

OPTIMIZE, ANALYZE, CHECK, REPAIR and REBUILD only supported if fast_alter_partition flag set · 81a463ad

unknown authored Mar 22, 2006


mysql-test/r/ndb_partition_key.result:
  New test cases for BUG #16819, 16821, and 16822
mysql-test/t/ndb_partition_key.test:
  New test cases for BUG #16819, 16821, and 16822
sql/handler.h:
  ensure we don't get hanging after calling change_partition

81a463ad

manual merge · 1c6f84f8
unknown authored Mar 22, 2006

1c6f84f8

21 Mar, 2006 5 commits

Merge c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new · 88a1cff6

unknown authored Mar 21, 2006

into  c-8808e253.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_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/mysql_priv.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/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/ha_heap.cc:
  manual merge
sql/ha_myisammrg.cc:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/handler.h:
  manual merge
sql/log.cc:
  manual merge
sql/mysqld.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge

88a1cff6

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b3bdc112
unknown authored Mar 21, 2006
```
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
```
b3bdc112
Manual merge · df7d2348
unknown authored Mar 20, 2006

df7d2348

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f7cf71e0

unknown authored Mar 20, 2006

into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_partition.cc:
  manual merge

f7cf71e0

BUG#17754 · 153f0947

unknown authored Mar 20, 2006

Fixed result files


mysql-test/r/ndb_partition_key.result:
  Fixed result files
mysql-test/r/partition.result:
  Fixed result files

153f0947

20 Mar, 2006 11 commits

Fix compilation failure when compiling without partitioning, introduced · d8c04a6f
unknown authored Mar 20, 2006
```
by previous push.
```
d8c04a6f

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a5b8b775

unknown authored Mar 20, 2006

into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
mysql-test/t/ndb_partition_key.test:
  manual merge

a5b8b775

BUG#17754 · 51f70d9f

unknown authored Mar 20, 2006

Added new syntax ALTER TABLE t1 REMOVE PARTITIONING,
changed semantics of ALTER TABLE t1 ENGINE=X; to not remove partitioning
Fix a number of mix engine bugs in partitioning


mysql-test/r/ndb_partition_key.result:
  Added a number of new test cases
mysql-test/r/partition.result:
  Added a number of new test cases
mysql-test/t/ndb_partition_key.test:
  Added a number of new test cases
mysql-test/t/partition.test:
  Added a number of new test cases
sql/lex.h:
  REMOVE and PARTITIONING added as keywords in parser
sql/sql_lex.h:
  Added flag to alter_info flag
sql/sql_partition.cc:
  Fixes for the new syntax, changes of the current semantics of the syntax.
  Fixes for errors in handling mixes of table handlers in partitioning syntax
  for ALTER TABLE
sql/sql_table.cc:
  Bug fix
sql/sql_yacc.yy:
  New syntax for REMOVE PARTITIONING

51f70d9f

merging · 60bc9ad7
unknown authored Mar 20, 2006

60bc9ad7
merging · 6315e46a
unknown authored Mar 20, 2006
```
sql/sql_partition.cc:
  Auto merged
```
6315e46a

Fix for bug#15336 Partitions: crash if create table as select · 91eac0bd

unknown authored Mar 20, 2006

  added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()


mysql-test/r/partition.result:
  Fix for bug#15336 Partitions: crash if create table as select
    test case
mysql-test/t/partition.test:
  Fix for bug#15336 Partitions: crash if create table as select
    test case

91eac0bd

Code #ifdef-ed · 851f4fb9
unknown authored Mar 20, 2006
```
sql/sql_class.h:
  line #ifdef-ed
```
851f4fb9

Bug#14367 Partitions: crash if utf8 column · de264164

unknown authored Mar 20, 2006

  use part_info->item_free_list instead of thd->free_list during partition function parsing


mysql-test/r/partition.result:
  Bug#14367 Partitions: crash if utf8 column
    test case
mysql-test/t/partition.test:
  Bug#14367 Partitions: crash if utf8 column
    test case
sql/item.cc:
  Bug#14367 Partitions: crash if utf8 column
    create copy of string in current mem_root to avoid memory leak

de264164

bug #17290 (sp with delete, create and rollback causes MySQLD core) · afe397ff

unknown authored Mar 20, 2006

additional fixes


mysql-test/r/partition.result:
  result fixed
mysql-test/t/partition.test:
  testcase
sql/sql_parse.cc:
  part_info cloning moved here
sql/sql_partition.cc:
  fixes
sql/sql_table.cc:
  part_info cloning removed

afe397ff

Merge bk@192.168.21.1:mysql-5.1-new · 723c3a50
unknown authored Mar 20, 2006
```
into mysql.com:/home/hf/work/mysql-5.1.clean
```
723c3a50

Fix HPUX compilation. · f9dd31ca

unknown authored Mar 20, 2006


sql/ha_ndbcluster.h:
  Fix HPUX compilation (copy-paste error I think).

f9dd31ca

18 Mar, 2006 8 commits

Merge mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1 · 0d446106
unknown authored Mar 18, 2006
```
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1/gcc41
```
0d446106
gcc 4.1.0 compile fix (Bug #18332) · 2fac3346
unknown authored Mar 18, 2006

2fac3346
Merge mysql.com:/home/bkroot/mysql-5.1-new · d985e765
unknown authored Mar 18, 2006
```
into  mysql.com:/home/bk/b17400-mysql-5.1-new
```
d985e765

Bug#18326 (Do not lock tables for writing during prepare of statement): · 99d34d28

unknown authored Mar 18, 2006

Fixing tests to get the test suite passing. This does not hide the bug
since it's a matter of performance, not correctness.


mysql-test/t/binlog_row_blackhole.test:
  Disabling ps-protocol for the test.
mysql-test/t/binlog_row_insert_select.test:
  Disabling ps-protocol for the test.
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Disabling ps-protocol for the test.
mysql-test/t/rpl_row_create_table.test:
  Disabling ps-protocol for the test.
mysql-test/t/rpl_row_flsh_tbls.test:
  Disabling ps-protocol for the test.

99d34d28

Merge bk@192.168.21.1:mysql-5.1-new · 1c45dcc1

unknown authored Mar 18, 2006

into mysql.com:/home/hf/work/mysql-5.1.clean


sql/sql_partition.cc:
  Auto merged

1c45dcc1

bug 17290 and bug 14350 · 6a421c56

unknown authored Mar 18, 2006

added THD::work_part_info member where we now store modified
partition_info structure.
It allows no solve problem when different parts of the part_info get
into different mem_roots


sql/partition_info.cc:
  get_clone implementation
sql/partition_info.h:
  get_clone() declared
sql/sql_class.h:
  THD::work_part_info added
sql/sql_partition.cc:
  thd->work_part_info instead of lex->part_info
sql/sql_table.cc:
  thd->work_part_info instad of lex->part_info
sql/unireg.cc:
  thd->work_part_info instad of lex->part_info

6a421c56

Post-review fixes for bug#17899 Partitions: crash, NDB, Select .. ORDER BY · 58443d61
unknown authored Mar 18, 2006

58443d61
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 69aa271d
unknown authored Mar 18, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
69aa271d

17 Mar, 2006 8 commits

Merge mysql.com:/home/bkroot/mysql-5.1-new · 5e042add
unknown authored Mar 18, 2006
```
into  mysql.com:/home/bk/b17400-mysql-5.1-new
```
5e042add
Merge mysql.com:/home/bkroot/mysql-5.1-new · 03a96c06
unknown authored Mar 17, 2006
```
into  mysql.com:/home/bk/b17400-mysql-5.1-new


sql/sql_parse.cc:
  Auto merged
```
03a96c06

Bug#18280 (RBR: Extreneous maps when writing to general_log and slow_log): · 604e0535

unknown authored Mar 17, 2006

Filter out replication general_log and slow_log entirely from binary
log. Caching result of table share-specific tests.


mysql-test/r/binlog_row_drop_tmp_tbl.result:
  Result change
mysql-test/r/rpl_row_log.result:
  Result change
mysql-test/r/rpl_row_log_innodb.result:
  Result change
mysql-test/r/rpl_row_max_relay_size.result:
  Result change
sql/handler.cc:
  Refactoring code to support filtering many tables.
  Filtering out mysql.general_log and mysql.slow_log from binary log.
  Caching result from table share-specific tests.
sql/sql_class.cc:
  Correcting comment
sql/sql_parse.cc:
  Using binlog_query() instead of constructing Query_log_events
sql/table.cc:
  Adding variable to cache table check parts for row-based logging.
sql/table.h:
  Adding variable to cache table check parts for row-based logging.

604e0535

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 07fc9729
unknown authored Mar 17, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
07fc9729
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a4cf3861
unknown authored Mar 17, 2006
```
into  ibmlab.site:/home/my/bk/mysql-5.1-new
```
a4cf3861
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · bf3501a5
unknown authored Mar 17, 2006
```
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1
```
bf3501a5

fix after manual merge of fix for bug #16396: Events: Distant-future dates become past dates. · 647eefca

unknown authored Mar 17, 2006


mysql-test/r/events.result:
  update result
mysql-test/r/events_bugs.result:
  update result after manual merge
mysql-test/t/events.test:
  move from error number to a constant
mysql-test/t/events_bugs.test:
  update error codes

647eefca

manual merge · a9e6af8d
unknown authored Mar 17, 2006
```
sql/event_timed.cc:
  Auto merged
```
a9e6af8d

16 Mar, 2006 4 commits
- Merge bk-internal:/home/bk/mysql-5.1-new · be423af4
  unknown authored Mar 16, 2006
```
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
```
  be423af4
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6dbb6cf1
  unknown authored Mar 16, 2006
```
into  ibmlab.site:/home/my/bk/mysql-5.1-new
```
  6dbb6cf1
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8caf2f0c
  unknown authored Mar 16, 2006
```
into  mysql.com:/opt/local/work/mysql-5.1-root


sql/sql_lex.h:
  Auto merged
```
  8caf2f0c
- Merge bk-internal:/home/bk/mysql-5.1-new · b49283c6
  unknown authored Mar 16, 2006
```
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
```
  b49283c6