diff options
| author | unknown <gluh@mysql.com> | 2006-07-03 13:19:18 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com> | 2006-07-03 13:19:18 +0500 |
| commit | 3e085bd882a7283d43423c82d412ce276ff4ddcb (patch) | |
| tree | 92f15fb2e6a466fe825bb95eacd1187eeef200bb /sql/handler.h | |
| parent | 4c2db1bef100a1159f65d3fad0ec764727198e58 (diff) | |
| parent | 8703b22e167c706d5a8c77a1e24948b4db3fafb3 (diff) | |
| download | mariadb-git-3e085bd882a7283d43423c82d412ce276ff4ddcb.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 31aac075a5e..6efb6e9e470 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -428,7 +428,8 @@ typedef struct st_ha_create_information { CHARSET_INFO *table_charset, *default_table_charset; LEX_STRING connect_string; - const char *comment,*password; + LEX_STRING comment; + const char *password; const char *data_file_name, *index_file_name; const char *alias; ulonglong max_rows,min_rows; |