mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Made changes to add federated CONNECTION information to the .frm file
(per Monty's patch). Remove references to the "COMMENT" field. WL#2414 mysql-test/r/federated.result: alter from "COMMENT=" to "CONNECTION=" mysql-test/r/federated_archive.result: change "COMMENT=" to "CONNECTION=" mysql-test/t/federated.test: change from "COMMENT=" to "CONNECTION=" mysql-test/t/federated_archive.test: change from "COMMENT=" to "CONNECTION=" sql/ha_federated.cc: Change parsing of char* table->s->comment to LEX_STRING table->s->connect_string (per Monty's patch) sql/handler.h: added LEX_STRING "connection_string" (per Monty's patch) sql/sql_yacc.yy: added setting of "connect_string" string and length sql/table.cc: Modifying frm file to store connecting information (code change came from Monty). sql/table.h: added connect_string sql/unireg.cc: Storing information on connection_string (code came from Monty).
This commit is contained in:
@ -209,6 +209,7 @@ enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED,
|
||||
#define HA_CREATE_USED_ROW_FORMAT (1L << 15)
|
||||
#define HA_CREATE_USED_COMMENT (1L << 16)
|
||||
#define HA_CREATE_USED_PASSWORD (1L << 17)
|
||||
#define HA_CREATE_USED_CONNECTION (1L << 18)
|
||||
|
||||
typedef ulonglong my_xid; // this line is the same as in log_event.h
|
||||
#define MYSQL_XID_PREFIX "MySQLXid"
|
||||
@ -382,6 +383,7 @@ enum enum_tx_isolation { ISO_READ_UNCOMMITTED, ISO_READ_COMMITTED,
|
||||
typedef struct st_ha_create_information
|
||||
{
|
||||
CHARSET_INFO *table_charset, *default_table_charset;
|
||||
LEX_STRING connect_string;
|
||||
const char *comment,*password;
|
||||
const char *data_file_name, *index_file_name;
|
||||
const char *alias;
|
||||
|
Reference in New Issue
Block a user