diff options
author | unknown <svoj@poseidon.ndb.mysql.com> | 2005-11-06 16:16:18 +0100 |
---|---|---|
committer | unknown <svoj@poseidon.ndb.mysql.com> | 2005-11-06 16:16:18 +0100 |
commit | df33aacd87ff08c27fd371a0bb348fe3986e6f95 (patch) | |
tree | 0c9f1805d1951780ff34fb797c8fec0193020aab /sql/sql_class.h | |
parent | 2bddb0766473270f43e70bed16f3223255fee4a9 (diff) | |
parent | 3e5508909f7b7bebabfca5711e5778927279be19 (diff) | |
download | mariadb-git-df33aacd87ff08c27fd371a0bb348fe3986e6f95.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 0a34de11528..2efcc620914 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -413,11 +413,13 @@ public: List<key_part_spec> columns; const char *name; bool generated; + LEX_STRING *parser_name; Key(enum Keytype type_par, const char *name_arg, enum ha_key_alg alg_par, - bool generated_arg, List<key_part_spec> &cols) + bool generated_arg, List<key_part_spec> &cols, + LEX_STRING *parser_arg= 0) :type(type_par), algorithm(alg_par), columns(cols), name(name_arg), - generated(generated_arg) + generated(generated_arg), parser_name(parser_arg) {} ~Key() {} /* Equality comparison of keys (ignoring name) */ |