WL# 3031

Backport of functionality in private 5.2 tree. 

Added new language to parser, new mysql.servers table and associated code
to be used by the federated storage engine to allow central connection information
per WL entry.

libmysqld/Makefile.am

@@ -72,7 +72,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
         event_queue.cc event_db_repository.cc \
 	rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \
 	sql_tablespace.cc \
-	rpl_injector.cc my_user.c partition_info.cc
+	rpl_injector.cc my_user.c partition_info.cc \
+	sql_servers.cc
 
 libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
 libmysqld_a_SOURCES=

mysql-test/lib/init_db.sql

@@ -114,6 +114,20 @@ REPLACE INTO user VALUES ('127.0.0.1'  ,'root','','Y','Y','Y','Y','Y','Y','Y','Y
 INSERT  INTO user (host,user) VALUES ('localhost','');
 INSERT  INTO user (host,user) VALUES ('@HOSTNAME@%','');
 
+CREATE TABLE servers (
+  Server_name char(64) NOT NULL DEFAULT '',
+  Host char(64) NOT NULL DEFAULT '',
+  Db char(64) NOT NULL DEFAULT '',
+  Username char(64) NOT NULL DEFAULT '',
+  Password char(64) NOT NULL DEFAULT '',
+  Port INT(4) NOT NULL DEFAULT '0',
+  Socket char(64) NOT NULL DEFAULT '',
+  Wrapper char(64) NOT NULL DEFAULT '',
+  Owner char(64) NOT NULL DEFAULT '',
+  PRIMARY KEY (Server_name))
+  comment='MySQL Foreign Servers table';
+
+INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','root');
 
 CREATE TABLE func (
   name char(64) binary DEFAULT '' NOT NULL,

mysql-test/r/federated_server.result

+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+stop slave;
+DROP DATABASE IF EXISTS federated;
+CREATE DATABASE federated;
+DROP DATABASE IF EXISTS federated;
+CREATE DATABASE federated;
+create database first_db;
+create database second_db;
+use first_db;
+DROP TABLE IF EXISTS first_db.t1;
+Warnings:
+Note	1051	Unknown table 't1'
+CREATE TABLE first_db.t1 (
+`id` int(20) NOT NULL,
+`name` varchar(64) NOT NULL default ''
+    )
+DEFAULT CHARSET=latin1;
+use second_db;
+DROP TABLE IF EXISTS second_db.t1;
+Warnings:
+Note	1051	Unknown table 't1'
+CREATE TABLE second_db.t1 (
+`id` int(20) NOT NULL,
+`name` varchar(64) NOT NULL default ''
+    )
+DEFAULT CHARSET=latin1;
+drop server if exists 'server_one';
+create server 'server_one' foreign data wrapper 'mysql' options
+(HOST '127.0.0.1',
+DATABASE 'first_db',
+USER 'root',
+PASSWORD '',
+PORT 9308,
+SOCKET '',
+OWNER 'root');
+drop server if exists 'server_two';
+create server 'server_two' foreign data wrapper 'mysql' options
+(HOST '127.0.0.1',
+DATABASE 'second_db',
+USER 'root',
+PASSWORD '',
+PORT 9308,
+SOCKET '',
+OWNER 'root');
+select * from mysql.servers;
+Server_name	Host	Db	Username	Password	Port	Socket	Wrapper	Owner
+test	localhost	test	root		0		mysql	root
+server_one	127.0.0.1	first_db	root		9308		mysql	root
+server_two	127.0.0.1	second_db	root		9308		mysql	root
+DROP TABLE IF EXISTS federated.old;
+Warnings:
+Note	1051	Unknown table 'old'
+CREATE TABLE federated.old (
+`id` int(20) NOT NULL,
+`name` varchar(64) NOT NULL default ''
+    )
+ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+CONNECTION='mysql://root@127.0.0.1:9308/first_db/t1';
+INSERT INTO federated.old (id, name) values (1, 'federated.old url');
+SELECT * FROM federated.old;
+id	name
+1	federated.old url
+DROP TABLE IF EXISTS federated.old2;
+Warnings:
+Note	1051	Unknown table 'old2'
+CREATE TABLE federated.old2 (
+`id` int(20) NOT NULL,
+`name` varchar(64) NOT NULL default ''
+    )
+ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+CONNECTION='mysql://root@127.0.0.1:9308/second_db/t1';
+INSERT INTO federated.old2 (id, name) values (1, 'federated.old2 url');
+DROP TABLE IF EXISTS federated.t1;
+Warnings:
+Note	1051	Unknown table 't1'
+CREATE TABLE federated.t1 (
+`id` int(20) NOT NULL,
+`name` varchar(64) NOT NULL default ''
+    )
+ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+CONNECTION='server_one';
+INSERT INTO federated.t1 (id, name) values (1, 'server_one, new scheme');
+SELECT * FROM federated.t1;
+id	name
+1	federated.old url
+1	server_one, new scheme
+ALTER SERVER 'server_one' options(DATABASE 'second_db');
+flush tables;
+INSERT INTO federated.t1 (id, name) values (1, 'server_two, new scheme');
+SELECT * FROM federated.t1;
+id	name
+1	federated.old2 url
+1	server_two, new scheme
+drop table federated.t1;
+drop server 'server_one';
+drop server 'server_two';
+select * from mysql.servers;
+Server_name	Host	Db	Username	Password	Port	Socket	Wrapper	Owner
+test	localhost	test	root		0		mysql	root
+drop table first_db.t1;
+drop table second_db.t1;
+drop database first_db;
+drop database second_db;
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE IF EXISTS federated;
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE IF EXISTS federated;

mysql-test/t/federated_server.test

+# should work with embedded server after mysqltest is fixed
+-- source include/not_embedded.inc
+source include/federated.inc;
+
+connection slave;
+create database first_db;
+create database second_db;
+
+use first_db;
+
+DROP TABLE IF EXISTS first_db.t1;
+CREATE TABLE first_db.t1 (
+    `id` int(20) NOT NULL,
+    `name` varchar(64) NOT NULL default ''
+    )
+  DEFAULT CHARSET=latin1;
+
+use second_db;
+DROP TABLE IF EXISTS second_db.t1;
+CREATE TABLE second_db.t1 (
+    `id` int(20) NOT NULL,
+    `name` varchar(64) NOT NULL default ''
+    )
+  DEFAULT CHARSET=latin1;
+
+connection master;
+
+drop server if exists 'server_one';
+eval create server 'server_one' foreign data wrapper 'mysql' options
+  (HOST '127.0.0.1',
+  DATABASE 'first_db',
+  USER 'root',
+  PASSWORD '',
+  PORT $SLAVE_MYPORT,
+  SOCKET '',
+  OWNER 'root');
+
+drop server if exists 'server_two';
+eval create server 'server_two' foreign data wrapper 'mysql' options
+  (HOST '127.0.0.1',
+  DATABASE 'second_db',
+  USER 'root',
+  PASSWORD '',
+  PORT $SLAVE_MYPORT,
+  SOCKET '',
+  OWNER 'root');
+
+select * from mysql.servers;
+
+DROP TABLE IF EXISTS federated.old;
+eval CREATE TABLE federated.old (
+    `id` int(20) NOT NULL,
+    `name` varchar(64) NOT NULL default ''
+    )
+  ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/first_db/t1';
+
+INSERT INTO federated.old (id, name) values (1, 'federated.old url');
+
+SELECT * FROM federated.old;
+
+DROP TABLE IF EXISTS federated.old2;
+eval CREATE TABLE federated.old2 (
+    `id` int(20) NOT NULL,
+    `name` varchar(64) NOT NULL default ''
+    )
+  ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/second_db/t1';
+
+INSERT INTO federated.old2 (id, name) values (1, 'federated.old2 url');
+
+DROP TABLE IF EXISTS federated.t1;
+CREATE TABLE federated.t1 (
+    `id` int(20) NOT NULL,
+    `name` varchar(64) NOT NULL default ''
+    )
+  ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+  CONNECTION='server_one';
+
+INSERT INTO federated.t1 (id, name) values (1, 'server_one, new scheme');
+
+SELECT * FROM federated.t1;
+
+ALTER SERVER 'server_one' options(DATABASE 'second_db');
+
+flush tables;
+
+INSERT INTO federated.t1 (id, name) values (1, 'server_two, new scheme');
+SELECT * FROM federated.t1;
+
+drop table federated.t1;
+
+drop server 'server_one';
+drop server 'server_two';
+select * from mysql.servers;
+
+connection slave;
+drop table first_db.t1;
+drop table second_db.t1;
+drop database first_db;
+drop database second_db;
+
+source include/federated_cleanup.inc;

scripts/mysql_create_system_tables.sh

@@ -192,6 +192,33 @@ then
   fi 
 fi
 
+# Check for old tables
+if test ! -f $mdata/servers.frm
+then
+  if test "$1" = "verbose" ; then
+  echo "Preparing servers table" 1>&2;
+  fi
+
+  c_d="$c_d
+
+CREATE TABLE  servers ("
+  c_d="$c_d   Server_name char(64) NOT NULL,"
+  c_d="$c_d   Hostname char(64) NOT NULL,"
+  c_d="$c_d   Db char(64) NOT NULL,"
+  c_d="$c_d   Username char(64) NOT NULL,"
+  c_d="$c_d   Passwd char(64) NOT NULL,"
+  c_d="$c_d   Portnum INT(4),"
+  c_d="$c_d   Sock char(64),"
+  c_d="$c_d   Scheme char(64) NOT NULL,"
+  c_d="$c_d   Owner char(64) NOT NULL,"
+  c_d="$c_d   PRIMARY KEY  (Server_name));"
+
+  i_d="INSERT INTO servers VALUES
+    ('test','localhost','test','root','', 0,
+     '','mysql','root');
+    "
+fi
+
 if test ! -f $mdata/func.frm
 then
   if test "$1" = "verbose" ; then

sql/Makefile.am

@@ -68,7 +68,7 @@ noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
                         event_db_repository.h event_queue.h \
 			sql_plugin.h authors.h sql_partition.h event_data_objects.h \
 			partition_info.h partition_element.h event_scheduler.h \
-			contributors.h
+			contributors.h sql_servers.h
 mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
 			item.cc item_sum.cc item_buff.cc item_func.cc \
 			item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \
@@ -106,7 +106,8 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
                         event_scheduler.cc event_data_objects.cc \
                         event_queue.cc event_db_repository.cc events.cc \
 			sql_plugin.cc sql_binlog.cc \
-			sql_builtin.cc sql_tablespace.cc partition_info.cc
+			sql_builtin.cc sql_tablespace.cc partition_info.cc \
+			sql_servers.cc
 
 
 gen_lex_hash_SOURCES =	gen_lex_hash.cc

sql/lex.h

@@ -229,6 +229,7 @@ static SYMBOL symbols[] = {
   { "HAVING",		SYM(HAVING)},
   { "HELP",		SYM(HELP_SYM)},
   { "HIGH_PRIORITY",	SYM(HIGH_PRIORITY)},
+  { "HOST",		SYM(HOST_SYM)},
   { "HOSTS",		SYM(HOSTS_SYM)},
   { "HOUR",		SYM(HOUR_SYM)},
   { "HOUR_MICROSECOND",	SYM(HOUR_MICROSECOND_SYM)},
@@ -368,6 +369,7 @@ static SYMBOL symbols[] = {
   { "ONE_SHOT",		SYM(ONE_SHOT_SYM)},
   { "OPEN",		SYM(OPEN_SYM)},
   { "OPTIMIZE",		SYM(OPTIMIZE)},
+  { "OPTIONS",		SYM(OPTIONS_SYM)},
   { "OPTION",		SYM(OPTION)},
   { "OPTIONALLY",	SYM(OPTIONALLY)},
   { "OR",		SYM(OR_SYM)},
@@ -375,6 +377,7 @@ static SYMBOL symbols[] = {
   { "OUT",              SYM(OUT_SYM)},
   { "OUTER",		SYM(OUTER)},
   { "OUTFILE",		SYM(OUTFILE)},
+  { "OWNER",		SYM(OWNER_SYM)},
   { "PACK_KEYS",	SYM(PACK_KEYS_SYM)},
   { "PARSER",           SYM(PARSER_SYM)},
   { "PARTIAL",		SYM(PARTIAL)},
@@ -387,6 +390,7 @@ static SYMBOL symbols[] = {
   { "PLUGINS",          SYM(PLUGINS_SYM)},
   { "POINT",		SYM(POINT_SYM)},
   { "POLYGON",		SYM(POLYGON)},
+  { "PORT",		SYM(PORT_SYM)},
   { "PRECISION",	SYM(PRECISION)},
   { "PREPARE",          SYM(PREPARE_SYM)},
   { "PRESERVE",		SYM(PRESERVE_SYM)},
@@ -456,6 +460,7 @@ static SYMBOL symbols[] = {
   { "SERIAL",		SYM(SERIAL_SYM)},
   { "SERIALIZABLE",	SYM(SERIALIZABLE_SYM)},
   { "SESSION",		SYM(SESSION_SYM)},
+  { "SERVER",           SYM(SERVER_SYM)},
   { "SET",		SYM(SET)},
   { "SHARE",		SYM(SHARE_SYM)},
   { "SHOW",		SYM(SHOW)},
@@ -465,6 +470,7 @@ static SYMBOL symbols[] = {
   { "SLAVE",            SYM(SLAVE)},
   { "SNAPSHOT",         SYM(SNAPSHOT_SYM)},
   { "SMALLINT",		SYM(SMALLINT)},
+  { "SOCKET",		SYM(SOCKET_SYM)},
   { "SOME",             SYM(ANY_SYM)},
   { "SONAME",		SYM(SONAME_SYM)},
   { "SOUNDS",		SYM(SOUNDS_SYM)},
@@ -569,6 +575,7 @@ static SYMBOL symbols[] = {
   { "VIEW",		SYM(VIEW_SYM)},
   { "WITH",		SYM(WITH)},
   { "WORK",		SYM(WORK_SYM)},
+  { "WRAPPER",		SYM(WRAPPER_SYM)},
   { "WRITE",		SYM(WRITE_SYM)},
   { "X509",		SYM(X509_SYM)},
   { "XOR",		SYM(XOR)},

sql/mysql_priv.h

@@ -624,6 +624,7 @@ Item *negate_expression(THD *thd, Item *expr);
 #include "sql_acl.h"
 #include "tztime.h"
 #ifdef MYSQL_SERVER
+#include "sql_servers.h"
 #include "opt_range.h"
 
 #ifdef HAVE_QUERY_CACHE

sql/mysqld.cc

@@ -1174,6 +1174,7 @@ void clean_up(bool print_message)
   my_tz_free();
   my_database_names_free();
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
+  servers_free(1);
   acl_free(1);
   grant_free();
 #endif
@@ -3638,6 +3639,9 @@ we force server id to 2, but this MySQL server will not act as a slave.");
   if (!opt_noacl)
     (void) grant_init();
 
+  if (!opt_bootstrap)
+    servers_init(0);
+
   if (!opt_noacl)
   {
 #ifdef HAVE_DLOPEN

sql/share/errmsg.txt

@@ -5607,6 +5607,8 @@ ER_SP_RECURSION_LIMIT
 ER_SP_PROC_TABLE_CORRUPT
         eng "Failed to load routine %-.64s. The table mysql.proc is missing, corrupt, or contains bad data (internal code %d)"
         ger "Routine %-64s konnte nicht geladen werden. Die Tabelle mysql.proc fehlt, ist beschdigt, oder enthlt fehlerhaften Daten (interner Code: %d)"
+ER_FOREIGN_SERVER_EXISTS
+        eng "The foreign server, %s, you are trying to create already exists."
 ER_SP_WRONG_NAME 42000
         eng "Incorrect routine name '%-.64s'"
         ger "Ungltiger Routinenname '%-.64s'"
@@ -5847,6 +5849,9 @@ ER_BINLOG_ROW_WRONG_TABLE_DEF
 ER_BINLOG_ROW_RBR_TO_SBR
         eng "Slave running with --log-slave-updates must use row-based binary logging to be able to replicate row-based binary log events"
         ger "Slave, die mit --log-slave-updates laufen, mssen zeilenbasiertes Loggen verwenden, um zeilenbasierte Binrlog-Ereignisse loggen zu knnen"
+ER_FOREIGN_SERVER_DOESNT_EXIST
+        eng "The foreign server name you are trying to reference does not exist. Data source error:  %-.64s"
+	ger "Die externe Verbindung, auf die Sie zugreifen wollen, existiert nicht. Datenquellenfehlermeldung:  %-.64s"
 ER_EVENT_ALREADY_EXISTS
         eng "Event '%-.64s' already exists"
         ger "Event '%-.64s' existiert bereits"

sql/sql_lex.cc

@@ -184,6 +184,21 @@ void lex_start(THD *thd, const uchar *buf, uint length)
   lex->nest_level=0 ;
   lex->allow_sum_func= 0;
   lex->in_sum_func= NULL;
+  /*
+    ok, there must be a better solution for this, long-term
+    I tried "bzero" in the sql_yacc.yy code, but that for
+    some reason made the values zero, even if they were set
+  */
+  lex->server_options.server_name= 0;
+  lex->server_options.server_name_length= 0;
+  lex->server_options.host= 0;
+  lex->server_options.db= 0;
+  lex->server_options.username= 0;
+  lex->server_options.password= 0;
+  lex->server_options.scheme= 0;
+  lex->server_options.socket= 0;
+  lex->server_options.owner= 0;
+  lex->server_options.port= -1;
   DBUG_VOID_RETURN;
 }
 

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;
@@ -979,6 +988,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;
   /*

sql/sql_parse.cc

@@ -5183,6 +5183,58 @@ end_with_restore_list:
 #endif /* EMBEDDED_LIBRARY */
     break;
   }
+  case SQLCOM_CREATE_SERVER:
+  {
+    int error;
+    LEX *lex= thd->lex;
+    DBUG_PRINT("info", ("case SQLCOM_CREATE_SERVER"));
+    if ((error= create_server(thd, &lex->server_options)))
+    {
+      DBUG_PRINT("info", ("problem creating server",
+                          lex->server_options.server_name));
+      my_error(error, MYF(0), lex->server_options.server_name);
+      break;
+    }
+    send_ok(thd, 1);
+    break;
+  }
+  case SQLCOM_ALTER_SERVER:
+  {
+    int error;
+    LEX *lex= thd->lex;
+    DBUG_PRINT("info", ("case SQLCOM_ALTER_SERVER"));
+    if ((error= alter_server(thd, &lex->server_options)))
+    {
+      DBUG_PRINT("info", ("problem altering server",
+                          lex->server_options.server_name));
+      my_error(error, MYF(0), lex->server_options.server_name);
+      break;
+    }
+    send_ok(thd, 1);
+    break;
+  }
+  case SQLCOM_DROP_SERVER:
+  {
+    int err_code;
+    LEX *lex= thd->lex;
+    DBUG_PRINT("info", ("case SQLCOM_DROP_SERVER"));
+    if ((err_code= drop_server(thd, &lex->server_options)))
+    {
+      if (! lex->drop_if_exists && err_code == ER_FOREIGN_SERVER_EXISTS)
+      {
+        DBUG_PRINT("info", ("problem dropping server %s",
+                            lex->server_options.server_name));
+        my_error(err_code, MYF(0), lex->server_options.server_name);
+      }
+      else
+      {
+        send_ok(thd, 0);
+      }
+      break;
+    }
+    send_ok(thd, 1);
+    break;
+  }
   default:
 #ifndef EMBEDDED_LIBRARY
     DBUG_ASSERT(0);                             /* Impossible */

sql/sql_servers.h

+/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include "slave.h" // for tables_ok(), rpl_filter
+
+/* structs */
+typedef struct st_federated_server
+{
+  char *server_name;
+  long port;
+  uint server_name_length;
+  char *db, *scheme, *username, *password, *socket, *owner, *host, *sport;
+} FOREIGN_SERVER;
+
+/* cache handlers */
+my_bool servers_init(bool dont_read_server_table);
+static my_bool servers_load(THD *thd, TABLE_LIST *tables);
+my_bool servers_reload(THD *thd);
+my_bool get_server_from_table_to_cache(TABLE *table);
+void servers_free(bool end=0);
+
+/* insert functions */
+int create_server(THD *thd, LEX_SERVER_OPTIONS *server_options);
+int insert_server(THD *thd, FOREIGN_SERVER *server_options);
+int insert_server_record(TABLE *table, FOREIGN_SERVER *server);
+int insert_server_record_into_cache(FOREIGN_SERVER *server);
+void store_server_fields_for_insert(TABLE *table, FOREIGN_SERVER *server);
+void store_server_fields_for_insert(TABLE *table,
+                                    FOREIGN_SERVER *existing,
+                                    FOREIGN_SERVER *altered);
+int prepare_server_struct_for_insert(LEX_SERVER_OPTIONS *server_options,
+                                     FOREIGN_SERVER *server);
+
+/* drop functions */ 
+int drop_server(THD *thd, LEX_SERVER_OPTIONS *server_options);
+int delete_server_record(TABLE *table,
+                         char *server_name,
+                         int server_name_length);
+int delete_server_record_in_cache(LEX_SERVER_OPTIONS *server_options);
+
+/* update functions */
+int alter_server(THD *thd, LEX_SERVER_OPTIONS *server_options);
+int prepare_server_struct_for_update(LEX_SERVER_OPTIONS *server_options,
+                                     FOREIGN_SERVER *existing,
+                                     FOREIGN_SERVER *altered);
+int update_server(THD *thd, FOREIGN_SERVER *existing, FOREIGN_SERVER *altered);
+int update_server_record(TABLE *table, FOREIGN_SERVER *server);
+int update_server_record_in_cache(FOREIGN_SERVER *existing,
+                                  FOREIGN_SERVER *altered);
+/* utility functions */
+void merge_server_struct(FOREIGN_SERVER *from, FOREIGN_SERVER *to);
+FOREIGN_SERVER *get_server_by_name(const char *server_name);
+my_bool server_exists_in_table(THD *thd, char *server_name);

sql/sql_yacc.yy

@@ -364,6 +364,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  HELP_SYM
 %token  HEX_NUM
 %token  HIGH_PRIORITY
+%token  HOST_SYM
 %token  HOSTS_SYM
 %token  HOUR_MICROSECOND_SYM
 %token  HOUR_MINUTE_SYM
@@ -506,6 +507,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  ONE_SYM
 %token  OPEN_SYM                      /* SQL-2003-R */
 %token  OPTIMIZE
+%token  OPTIONS_SYM
 %token  OPTION                        /* SQL-2003-N */
 %token  OPTIONALLY
 %token  OR2_SYM
@@ -515,6 +517,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  OUTER
 %token  OUTFILE
 %token  OUT_SYM                       /* SQL-2003-R */
+%token  OWNER_SYM
 %token  PACK_KEYS_SYM
 %token  PARAM_MARKER
 %token  PARSER_SYM
@@ -528,6 +531,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  PLUGIN_SYM
 %token  POINT_SYM
 %token  POLYGON
+%token  PORT_SYM
 %token  POSITION_SYM                  /* SQL-2003-N */
 %token  PRECISION                     /* SQL-2003-R */
 %token  PREPARE_SYM                   /* SQL-2003-R */
@@ -596,6 +600,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  SERIALIZABLE_SYM              /* SQL-2003-N */
 %token  SERIAL_SYM
 %token  SESSION_SYM                   /* SQL-2003-N */
+%token  SERVER_SYM
+%token  SERVER_OPTIONS
 %token  SET                           /* SQL-2003-R */
 %token  SET_VAR
 %token  SHARE_SYM
@@ -608,6 +614,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  SLAVE
 %token  SMALLINT                      /* SQL-2003-R */
 %token  SNAPSHOT_SYM
+%token  SOCKET_SYM
 %token  SONAME_SYM
 %token  SOUNDS_SYM
 %token  SPATIAL_SYM
@@ -715,6 +722,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  WHILE_SYM
 %token  WITH                          /* SQL-2003-R */
 %token  WORK_SYM                      /* SQL-2003-N */
+%token  WRAPPER_SYM
 %token  WRITE_SYM                     /* SQL-2003-N */
 %token  X509_SYM
 %token  XA_SYM
@@ -910,6 +918,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
         view_check_option trigger_tail sp_tail
         install uninstall partition_entry binlog_base64_event
 	init_key_options key_options key_opts key_opt key_using_alg
+        server_def server_options_list server_option
 END_OF_INPUT
 
 %type <NONE> call sp_proc_stmts sp_proc_stmts1 sp_proc_stmt
@@ -1303,8 +1312,61 @@ create:
           {
             Lex->alter_tablespace_info->ts_cmd_type= CREATE_TABLESPACE;
           }
+	| CREATE server_def
+	  {
+	    Lex->sql_command= SQLCOM_CREATE_SERVER;
+          }
 	;
+server_def:
+        SERVER_SYM ident_or_text FOREIGN DATA_SYM WRAPPER_SYM ident_or_text OPTIONS_SYM '(' server_options_list ')'
+        {
+          Lex->server_options.server_name= $2.str;
+          Lex->server_options.server_name_length= $2.length;
+          Lex->server_options.scheme= $6.str;
+        }
+        ;
 
+server_options_list:
+        server_option
+        | server_options_list ',' server_option
+        ;
+
+server_option:
+        USER TEXT_STRING_sys
+        {
+          Lex->server_options.username= $2.str;
+        }
+        |
+        HOST_SYM TEXT_STRING_sys
+        {
+          Lex->server_options.host= $2.str;
+        }
+        |
+        DATABASE TEXT_STRING_sys
+        {
+          Lex->server_options.db= $2.str;
+        }
+        |
+        OWNER_SYM TEXT_STRING_sys
+        {
+          Lex->server_options.owner= $2.str;
+        }
+        |
+        PASSWORD TEXT_STRING_sys
+        {
+          Lex->server_options.password= $2.str;
+        }
+        |
+        SOCKET_SYM TEXT_STRING_sys
+        {
+          Lex->server_options.socket= $2.str;
+        }
+        |
+        PORT_SYM ulong_num
+        {
+          Lex->server_options.port= $2;
+        }
+        ;
 
 event_tail:
           EVENT_SYM opt_if_not_exists sp_name
@@ -4832,6 +4894,13 @@ alter:
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= ALTER_ACCESS_MODE_TABLESPACE;
           }
+        | ALTER SERVER_SYM ident_or_text OPTIONS_SYM '(' server_options_list ')'
+          {
+            LEX *lex= Lex;
+            Lex->sql_command= SQLCOM_ALTER_SERVER;
+            Lex->server_options.server_name= $3.str;
+            Lex->server_options.server_name_length= $3.length;
+          }
 	;
 
 ev_alter_on_schedule_completion: /* empty */ { $$= 0;}
@@ -7758,6 +7827,13 @@ drop:
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= DROP_LOGFILE_GROUP;
          }
+        | DROP SERVER_SYM if_exists ident_or_text
+        {
+          Lex->sql_command = SQLCOM_DROP_SERVER;
+          Lex->drop_if_exists= $3;
+          Lex->server_options.server_name= $4.str;
+          Lex->server_options.server_name_length= $4.length;
+        }
 	;
 
 table_list:
@@ -9324,12 +9400,15 @@ keyword:
 	| FLUSH_SYM		{}
 	| HANDLER_SYM		{}
 	| HELP_SYM		{}
+	| HOST_SYM              {}
         | INSTALL_SYM           {}
 	| LANGUAGE_SYM          {}
 	| NO_SYM		{}
 	| OPEN_SYM		{}
+	| OWNER_SYM		{}
         | PARSER_SYM            {}
 	| PARTITION_SYM		{}
+        | PORT_SYM              {}
         | PREPARE_SYM           {}
 	| REMOVE_SYM		{}
 	| REPAIR		{}
@@ -9338,7 +9417,9 @@ keyword:
 	| ROLLBACK_SYM		{}
 	| SAVEPOINT_SYM		{}
 	| SECURITY_SYM		{}
+        | SERVER_SYM            {}
 	| SIGNED_SYM		{}
+	| SOCKET_SYM		{}
 	| SLAVE			{}
         | SONAME_SYM            {}
 	| START_SYM		{}
@@ -9346,6 +9427,8 @@ keyword:
 	| TRUNCATE_SYM		{}
 	| UNICODE_SYM		{}
         | UNINSTALL_SYM         {}
+        | USER                  {}
+	| WRAPPER_SYM		{}
         | XA_SYM                {}
         | UPGRADE_SYM           {}
 	;

storage/federated/ha_federated.h

@@ -43,6 +43,9 @@
   The example implements the minimum of what you will probably need.
 */
 typedef struct st_federated_share {
+  bool parsed;
+  /* this key is unique db/tablename */
+  const char *share_key;
   /*
     the primary select query to be used in rnd_init
   */
@@ -50,6 +53,8 @@ typedef struct st_federated_share {
   /*
     remote host info, parse_url supplies
   */
+  char *server_name;
+  char *connection_string;
   char *scheme;
   char *connect_string;
   char *hostname;
@@ -60,8 +65,9 @@ typedef struct st_federated_share {
   char *table;
   char *socket;
   char *sport;
+  int share_key_length;
   ushort port;
-  uint table_name_length, connect_string_length, use_count;
+  uint table_name_length, server_name_length, connect_string_length, use_count;
   pthread_mutex_t mutex;
   THR_LOCK lock;
 } FEDERATED_SHARE;