summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorgluh@myoffice.izhnet.ru <>2006-07-18 18:43:55 +0500
committergluh@myoffice.izhnet.ru <>2006-07-18 18:43:55 +0500
commitf76aec6d908d4edbce11dbefa65c3cfbba24ce83 (patch)
tree2f07b62fba7918de94c82bc324ea9cb7a421af14 /sql/handler.h
parentbae61f209dc2460b53dcdb2b5a66aa53ff41a236 (diff)
parentd2b378d57fc774c90a7211107d5bfefa9cb917d1 (diff)
downloadmariadb-git-f76aec6d908d4edbce11dbefa65c3cfbba24ce83.tar.gz
Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge
into myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h
index 3c090b887a3..0b55eebd21a 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -725,7 +725,9 @@ typedef struct st_ha_create_information
{
CHARSET_INFO *table_charset, *default_table_charset;
LEX_STRING connect_string;
- const char *comment,*password, *tablespace;
+ const char *password, *tablespace;
+ LEX_STRING comment;
+ const char *password;
const char *data_file_name, *index_file_name;
const char *alias;
ulonglong max_rows,min_rows;