summaryrefslogtreecommitdiff
path: root/sql/partition_element.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-02-10 23:02:16 +0200
committerMichael Widenius <monty@askmonty.org>2011-02-10 23:02:16 +0200
commit7e497abcfb3e761ba5a368316192ae930fb58f6b (patch)
tree26eb2c2834c600dd240a93205a8a7d06fd0f9449 /sql/partition_element.h
parent4c4c0226a0bb43393b612c2a9a95dcbcae9e84d5 (diff)
parent75fad9dc95646de03b45fc74dca5673809d679a9 (diff)
downloadmariadb-git-7e497abcfb3e761ba5a368316192ae930fb58f6b.tar.gz
Automatic merge with trunk
Diffstat (limited to 'sql/partition_element.h')
-rw-r--r--sql/partition_element.h1
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;