diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-10 22:40:59 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-10 22:40:59 +0200 |
| commit | f2ca9c87845655083f186fb0d102699d78c6b22a (patch) | |
| tree | 9abb7085be76863902f80b4697fc59865628bbe7 /sql/partition_element.h | |
| parent | 6db663d6141a6e0d3425f0e7e184c8b7922ba7c3 (diff) | |
| download | mariadb-git-f2ca9c87845655083f186fb0d102699d78c6b22a.tar.gz | |
Applied patch for lp:585688 "maridb crashes in federatedx code" from lp:~atcurtis/maria/federatedx:
- Fixed Partition engine to store CONNECTION string for partitions.
Removed HA_NO_PARTITION flag from FederatedX.
Added test 'federated_partition' to suite.
- lp:#585688 - maridb crashes in federatedx code
FederatedX handler instances, created on one thread and used on
another thread (via table cache) when "show table status" is executed
crashed because txn member was not initialized for current thread.
Added test 'federated_bug_585688' to suite.
Author for the patch is Antony Curtis
mysql-test/suite/federated/federated_bug_585688.result:
Test for lp:585688
mysql-test/suite/federated/federated_bug_585688.test:
Test for lp:585688
mysql-test/suite/federated/federated_partition-slave.opt:
Test for partition support in federatedx
mysql-test/suite/federated/federated_partition.result:
Test for partition support in federatedx
mysql-test/suite/federated/federated_partition.test:
Test for partition support in federatedx
mysql-test/t/partition_federated.test:
Updated error message
sql/ha_partition.cc:
Added support for connection strings to partitions for federatedx
sql/ha_partition.h:
Added support for connection strings to partitions for federatedx
sql/partition_element.h:
Added support for connection strings to partitions for federatedx
sql/sql_yacc.yy:
Added support for connection strings to partitions for federatedx
storage/federatedx/ha_federatedx.cc:
Added support for partitions.
FederatedX handler instances, created on one thread and used on another thread (via table cache) when "show table status"
is executed crashed because txn member was not initialized for current thread.
Diffstat (limited to 'sql/partition_element.h')
| -rw-r--r-- | sql/partition_element.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/partition_element.h b/sql/partition_element.h index 905bc38165b..2fe2bba74cd 100644 --- a/sql/partition_element.h +++ b/sql/partition_element.h @@ -65,6 +65,7 @@ public: char* data_file_name; char* index_file_name; handlerton *engine_type; + LEX_STRING connect_string; enum partition_state part_state; uint16 nodegroup_id; bool has_null_value; |