diff options
author | patg@govinda.patg.net <> | 2006-12-08 22:30:18 -0500 |
---|---|---|
committer | patg@govinda.patg.net <> | 2006-12-08 22:30:18 -0500 |
commit | f9097b86af657717280061400cbdec97f4a5fa65 (patch) | |
tree | d4e2024ed0a048aebabc053293f04f67c25d5a55 /sql/sql_lex.h | |
parent | 23f0c6d7658de7a5c465d7afb66ae2f87d8ea96a (diff) | |
parent | 98062f567d31516f61d720661f46ee447d66821d (diff) | |
download | mariadb-git-f9097b86af657717280061400cbdec97f4a5fa65.tar.gz |
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 7fd60cbfa58..86dbacd5d77 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -111,6 +111,7 @@ enum enum_sql_command { SQLCOM_SHOW_AUTHORS, SQLCOM_BINLOG_BASE64_EVENT, SQLCOM_SHOW_PLUGINS, SQLCOM_SHOW_CONTRIBUTORS, + SQLCOM_CREATE_SERVER, SQLCOM_DROP_SERVER, SQLCOM_ALTER_SERVER, SQLCOM_CREATE_EVENT, SQLCOM_ALTER_EVENT, SQLCOM_DROP_EVENT, SQLCOM_SHOW_CREATE_EVENT, SQLCOM_SHOW_EVENTS, @@ -174,6 +175,14 @@ enum enum_drop_mode typedef List<Item> List_item; +/* SERVERS CACHE CHANGES */ +typedef struct st_lex_server_options +{ + long port; + uint server_name_length; + char *server_name, *host, *db, *username, *password, *scheme, *socket, *owner; +} LEX_SERVER_OPTIONS; + typedef struct st_lex_master_info { char *host, *user, *password, *log_file_name; @@ -977,6 +986,7 @@ typedef struct st_lex : public Query_tables_list HA_CREATE_INFO create_info; KEY_CREATE_INFO key_create_info; LEX_MASTER_INFO mi; // used by CHANGE MASTER + LEX_SERVER_OPTIONS server_options; USER_RESOURCES mqh; ulong type; /* |