MDEV-28861 Deprecate spider table options by comment/connection

Also deprecating table params not implemented in MDEV-28856.

storage/spider/mysql-test/spider/bg/r/basic_sql_part.result

@@ -48,6 +48,15 @@ CREATE TABLE ta_l2 (
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_COMMENT_P_2_1
 SELECT a, b, c FROM tb_l
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l2 ORDER BY a;
 a	b	date_format(c, '%Y-%m-%d %H:%i:%s')
@@ -97,6 +106,11 @@ a	b	date_format(c, '%Y-%m-%d %H:%i:%s')
 
 delete partition pushdown
 TRUNCATE TABLE ta_l2;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO ta_l2 SELECT a, b, c FROM tb_l;
 connection master_1;
 DELETE FROM ta_l2 WHERE b = 'g';
@@ -110,6 +124,11 @@ a	b	date_format(c, '%Y-%m-%d %H:%i:%s')
 
 delete partition index pushdown
 TRUNCATE TABLE ta_l2;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO ta_l2 SELECT a, b, c FROM tb_l;
 connection master_1;
 DELETE FROM ta_l2 WHERE a > 0 AND b = 'g';

storage/spider/mysql-test/spider/bg/r/direct_aggregate.result

@@ -37,12 +37,18 @@ b CHAR(1),
 c DATETIME,
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO ta_l (a, b, c) VALUES
 (1, 'a', '2008-08-01 10:21:39'),
 (2, 'b', '2000-01-01 00:00:00'),
 (3, 'e', '2007-06-04 20:03:11'),
 (4, 'd', '2003-11-30 05:01:03'),
 (5, 'c', '2001-12-31 23:59:59');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 direct_aggregating test
 connection master_1;

storage/spider/mysql-test/spider/bg/r/direct_aggregate_part.result

@@ -36,6 +36,16 @@ b CHAR(1),
 c DATETIME,
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_COMMENT2_P_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 set @old_spider_direct_aggregate=@@session.spider_direct_aggregate;
 set spider_direct_aggregate=1;
 SHOW STATUS LIKE 'Spider_direct_aggregate';

storage/spider/mysql-test/spider/bg/r/direct_update.result

@@ -37,12 +37,18 @@ b CHAR(1),
 c DATETIME,
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO ta_l (a, b, c) VALUES
 (1, 'a', '2008-08-01 10:21:39'),
 (2, 'b', '2000-01-01 00:00:00'),
 (3, 'e', '2007-06-04 20:03:11'),
 (4, 'd', '2003-11-30 05:01:03'),
 (5, 'c', '2001-12-31 23:59:59');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 direct_updating test
 connection master_1;

storage/spider/mysql-test/spider/bg/r/direct_update_part.result

@@ -36,6 +36,16 @@ b CHAR(1),
 c DATETIME,
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_COMMENT2_P_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SHOW STATUS LIKE 'Spider_direct_update';
 Variable_name	Value
 Spider_direct_update	0

storage/spider/mysql-test/spider/bg/r/function.result

@@ -34,7 +34,11 @@ CREATE TABLE t1 (
 a VARCHAR(255),
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_CHARSET3 MASTER_1_COMMENT_TEXT_PK1_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 insert into t1 values ('1');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 insert into t1 select a + 1 from t1;
 insert into t1 select a + 2 from t1;
 insert into t1 select a + 4 from t1;
@@ -51,6 +55,8 @@ select a from t1 where a in ('15', '120');
 a
 120
 15
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 date_sub()
 connection master_1;
@@ -61,12 +67,18 @@ b CHAR(1),
 c DATETIME,
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO ta_l (a, b, c) VALUES
 (1, 'a', '2008-08-01 10:21:39'),
 (2, 'b', '2000-01-01 00:00:00'),
 (3, 'e', '2007-06-04 20:03:11'),
 (4, 'd', '2003-11-30 05:01:03'),
 (5, 'c', '2001-12-31 23:59:59');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a;
 a	b	date_format(c, '%Y-%m-%d %H:%i:%s')
 1	a	2008-08-01 10:21:39

storage/spider/mysql-test/spider/bg/r/ha.result

@@ -63,8 +63,12 @@ c DATETIME,
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_HA_2_1
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'msi' is deprecated and will be removed in a future release
+Warning	1287	'mkd' is deprecated and will be removed in a future release
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
 INSERT INTO ta_l (a, b, c) VALUES
 (1, 'a', '2008-08-01 10:21:39'),
@@ -72,6 +76,9 @@ INSERT INTO ta_l (a, b, c) VALUES
 (3, 'e', '2007-06-04 20:03:11'),
 (4, 'd', '2003-11-30 05:01:03'),
 (5, 'c', '2001-12-31 23:59:59');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 select test
 connection master_1;
@@ -122,9 +129,16 @@ CONNECTION='host "localhost", user "root", password "",
   msi "5", mkd "2",
   database "auto_test_remote auto_test_remote2", lst "0 2"';
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'msi' is deprecated and will be removed in a future release
+Warning	1287	'mkd' is deprecated and will be removed in a future release
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
+Warning	1287	'lst' is deprecated and will be removed in a future release
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT db_name, table_name, link_id, link_status FROM mysql.spider_tables
 ORDER BY db_name, table_name, link_id;
 db_name	table_name	link_id	link_status
@@ -133,15 +147,25 @@ auto_test_local	ta_l	1	2
 SELECT spider_copy_tables('ta_l', '0', '1');
 spider_copy_tables('ta_l', '0', '1')
 1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 ALTER TABLE ta_l
 CONNECTION='host "localhost", user "root", password "",
   msi "5", mkd "2",
   database "auto_test_remote auto_test_remote2", lst "0 1"';
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'msi' is deprecated and will be removed in a future release
+Warning	1287	'mkd' is deprecated and will be removed in a future release
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
+Warning	1287	'lst' is deprecated and will be removed in a future release
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT db_name, table_name, link_id, link_status FROM mysql.spider_tables
 ORDER BY db_name, table_name, link_id;
 db_name	table_name	link_id	link_status
@@ -149,6 +173,9 @@ auto_test_local	ta_l	0	1
 auto_test_local	ta_l	1	1
 INSERT INTO ta_l (a, b, c) VALUES
 (8, 'g', '2011-05-05 21:33:30');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a;
 a	b	date_format(c, '%Y-%m-%d %H:%i:%s')
 1	a	2008-08-01 10:21:39
@@ -175,8 +202,13 @@ c DATETIME,
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_HA_AS_2_1
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'msi' is deprecated and will be removed in a future release
+Warning	1287	'mkd' is deprecated and will be removed in a future release
+Warning	1287	'alc' is deprecated and will be removed in a future release
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
 INSERT INTO ta_l (a, b, c) VALUES
 (1, 'a', '2008-08-01 10:21:39'),
@@ -184,6 +216,9 @@ INSERT INTO ta_l (a, b, c) VALUES
 (3, 'e', '2007-06-04 20:03:11'),
 (4, 'd', '2003-11-30 05:01:03'),
 (5, 'c', '2001-12-31 23:59:59');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 select test
 connection master_1;
@@ -230,9 +265,17 @@ CONNECTION='host "localhost", user "root", password "",
   msi "5", mkd "2", alc "1",
   database "auto_test_remote auto_test_remote2", lst "1 0"';
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'msi' is deprecated and will be removed in a future release
+Warning	1287	'mkd' is deprecated and will be removed in a future release
+Warning	1287	'alc' is deprecated and will be removed in a future release
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
+Warning	1287	'lst' is deprecated and will be removed in a future release
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT db_name, table_name, link_id, link_status FROM mysql.spider_tables
 ORDER BY db_name, table_name, link_id;
 db_name	table_name	link_id	link_status
@@ -240,6 +283,9 @@ auto_test_local	ta_l	0	1
 auto_test_local	ta_l	1	1
 INSERT INTO ta_l (a, b, c) VALUES
 (8, 'g', '2011-05-05 21:33:30');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a;
 a	b	date_format(c, '%Y-%m-%d %H:%i:%s')
 8	g	2011-05-05 21:33:30

storage/spider/mysql-test/spider/bg/r/spider3_fixes.result

@@ -49,6 +49,10 @@ PRIMARY KEY (id)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_INCREMENT1_1
 MASTER_1_AUTO_INCREMENT_INCREMENT2
 MASTER_1_AUTO_INCREMENT_OFFSET2
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '',
 'srv "s_2_1"')
 1
@@ -70,6 +74,8 @@ id int(11) NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (id)
 ) SLAVE1_1_ENGINE SLAVE1_1_CHARSET SLAVE1_1_COMMENT_INCREMENT1_1
 INSERT INTO t1 () VALUES ();
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 777
@@ -77,6 +83,8 @@ SELECT MAX(id) FROM t1;
 MAX(id)
 777
 INSERT INTO t2 () VALUES ();
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 1554
@@ -134,7 +142,11 @@ id
 4662
 5439
 TRUNCATE TABLE t1;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 TRUNCATE TABLE t2;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO t1 () VALUES (),(),(),();
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()

storage/spider/mysql-test/spider/bg/r/spider3_fixes_part.result

@@ -47,6 +47,16 @@ PRIMARY KEY (id)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_INCREMENT1_P_1
 MASTER_1_AUTO_INCREMENT_INCREMENT2
 MASTER_1_AUTO_INCREMENT_OFFSET2
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '',
 'srv "s_2_1"')
 1
@@ -68,6 +78,11 @@ id int(11) NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (id)
 ) SLAVE1_1_ENGINE SLAVE1_1_CHARSET SLAVE1_1_COMMENT_INCREMENT1_P_1
 INSERT INTO t1 () VALUES ();
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 777
@@ -75,6 +90,11 @@ SELECT MAX(id) FROM t1;
 MAX(id)
 777
 INSERT INTO t2 () VALUES ();
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 1554
@@ -132,7 +152,17 @@ id
 4662
 5439
 TRUNCATE TABLE t1;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 TRUNCATE TABLE t2;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO t1 () VALUES (),(),(),();
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()

storage/spider/mysql-test/spider/bg/r/spider_fixes_part.result

@@ -56,7 +56,17 @@ b CHAR(1),
 c DATETIME,
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_COMMENT2_P_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO ta_l2 SELECT a, b, c FROM tb_l;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l2 WHERE a > 1
 ORDER BY a;
 a	b	date_format(c, '%Y-%m-%d %H:%i:%s')
@@ -76,7 +86,17 @@ b CHAR(1),
 c DATETIME,
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_COMMENT2_P_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO ta_l2 (a, b, c) VALUES (3, 'B', '2010-09-26 00:00:00');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 UPDATE ta_l2 SET a = 4 WHERE a = 3;
 SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l2;
 a	b	date_format(c, '%Y-%m-%d %H:%i:%s')
@@ -93,7 +113,17 @@ PRIMARY KEY(a),
 KEY idx1(b),
 KEY idx2(c)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT3_P_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO ta_l_int (a, b, c) VALUES (1, 2, 3);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO ta_l_int (a, b, c) SELECT a + 1, b + 1, c + 1 FROM ta_l_int;
 INSERT INTO ta_l_int (a, b, c) SELECT a + 2, b + 2, c + 2 FROM ta_l_int;
 INSERT INTO ta_l_int (a, b, c) SELECT a + 4, b + 4, c + 4 FROM ta_l_int;
@@ -118,6 +148,11 @@ PRIMARY KEY (id)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_INCREMENT1_P_1
 MASTER_1_AUTO_INCREMENT_INCREMENT2
 MASTER_1_AUTO_INCREMENT_OFFSET2
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 spider_direct_sql('SET SESSION AUTO_INCREMENT_INCREMENT = 4', '',
 'srv "s_2_1"')
 1
@@ -135,6 +170,11 @@ id int(11) NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (id)
 ) SLAVE1_1_ENGINE SLAVE1_1_CHARSET SLAVE1_1_COMMENT_INCREMENT1_P_1
 INSERT INTO t1 () VALUES ();
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 777

storage/spider/mysql-test/spider/bg/r/vp_fixes.result

@@ -47,7 +47,13 @@ DROP TABLE IF EXISTS ta_l;
 CREATE TABLE ta_l (
 PRIMARY KEY(a)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO ta_l SELECT a, b, c FROM tb_l;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 0.9
 create different primary key table
@@ -58,8 +64,14 @@ b INT AUTO_INCREMENT,
 c INT DEFAULT 11,
 PRIMARY KEY(b)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT4_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 INSERT INTO ta_l_int (a, b, c) VALUES (2, NULL, 3);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 create un-correspond primary key table
 connection master_1;
 DROP TABLE IF EXISTS ta_l_int;
@@ -70,8 +82,14 @@ b INT DEFAULT 12,
 c INT DEFAULT 11,
 PRIMARY KEY(c)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT4_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 INSERT INTO ta_l_int (a, b, c) VALUES (2, NULL, 3);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 deinit
 connection master_1;

storage/spider/mysql-test/spider/bg/t/direct_aggregate.test

@@ -98,12 +98,14 @@ eval CREATE TABLE ta_l (
   PRIMARY KEY(a)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_2_1;
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO ta_l (a, b, c) VALUES
   (1, 'a', '2008-08-01 10:21:39'),
   (2, 'b', '2000-01-01 00:00:00'),
   (3, 'e', '2007-06-04 20:03:11'),
   (4, 'd', '2003-11-30 05:01:03'),
   (5, 'c', '2001-12-31 23:59:59');
+--enable_ps_protocol
 
 --echo
 --echo direct_aggregating test

storage/spider/mysql-test/spider/bg/t/direct_aggregate_part.test

@@ -125,12 +125,14 @@ if ($HAVE_PARTITION)
     c DATETIME,
     PRIMARY KEY(a)
   ) $MASTER_1_ENGINE $MASTER_1_COMMENT2_P_2_1;
+  --disable_ps_protocol
   INSERT INTO ta_l2 (a, b, c) VALUES
     (1, 'a', '2008-08-01 10:21:39'),
     (2, 'b', '2000-01-01 00:00:00'),
     (3, 'e', '2007-06-04 20:03:11'),
     (4, 'd', '2003-11-30 05:01:03'),
     (5, 'c', '2001-12-31 23:59:59');
+  --enable_ps_protocol
   --enable_query_log
   --disable_ps2_protocol
   set @old_spider_direct_aggregate=@@session.spider_direct_aggregate;

storage/spider/mysql-test/spider/bg/t/direct_update.test

@@ -98,12 +98,14 @@ eval CREATE TABLE ta_l (
   PRIMARY KEY(a)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_2_1;
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO ta_l (a, b, c) VALUES
   (1, 'a', '2008-08-01 10:21:39'),
   (2, 'b', '2000-01-01 00:00:00'),
   (3, 'e', '2007-06-04 20:03:11'),
   (4, 'd', '2003-11-30 05:01:03'),
   (5, 'c', '2001-12-31 23:59:59');
+--enable_ps_protocol
 
 --echo
 --echo direct_updating test

storage/spider/mysql-test/spider/bg/t/direct_update_part.test

@@ -125,12 +125,14 @@ if ($HAVE_PARTITION)
     c DATETIME,
     PRIMARY KEY(a)
   ) $MASTER_1_ENGINE $MASTER_1_COMMENT2_P_2_1;
+  --disable_ps_protocol
   INSERT INTO ta_l2 (a, b, c) VALUES
     (1, 'a', '2008-08-01 10:21:39'),
     (2, 'b', '2000-01-01 00:00:00'),
     (3, 'e', '2007-06-04 20:03:11'),
     (4, 'd', '2003-11-30 05:01:03'),
     (5, 'c', '2001-12-31 23:59:59');
+  --enable_ps_protocol
   --enable_query_log
   eval $MASTER_1_CHECK_DIRECT_UPDATE_STATUS;
   SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l2 ORDER BY a;

storage/spider/mysql-test/spider/bg/t/function.test

@@ -83,7 +83,9 @@ eval CREATE TABLE t1 (
   PRIMARY KEY(a)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET3 $MASTER_1_COMMENT_TEXT_PK1_1;
 --enable_query_log
+--disable_ps_protocol
 insert into t1 values ('1');
+--enable_ps_protocol
 insert into t1 select a + 1 from t1;
 insert into t1 select a + 2 from t1;
 insert into t1 select a + 4 from t1;
@@ -114,7 +116,9 @@ if ($USE_CHILD_GROUP2)
   }
 }
 --connection master_1
+--disable_ps_protocol
 select a from t1 where a in ('15', '120');
+--enable_ps_protocol
 if ($USE_CHILD_GROUP2)
 {
   if (!$OUTPUT_CHILD_GROUP2)
@@ -187,12 +191,14 @@ eval CREATE TABLE ta_l (
   PRIMARY KEY(a)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_2_1;
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO ta_l (a, b, c) VALUES
   (1, 'a', '2008-08-01 10:21:39'),
   (2, 'b', '2000-01-01 00:00:00'),
   (3, 'e', '2007-06-04 20:03:11'),
   (4, 'd', '2003-11-30 05:01:03'),
   (5, 'c', '2001-12-31 23:59:59');
+--enable_ps_protocol
 SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a;
 UPDATE ta_l SET c = DATE_SUB(c, INTERVAL 1 YEAR);
 SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a;

storage/spider/mysql-test/spider/bg/t/ha.test

@@ -189,12 +189,14 @@ eval CREATE TABLE ta_l (
   PRIMARY KEY(a)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_HA_2_1;
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO ta_l (a, b, c) VALUES
   (1, 'a', '2008-08-01 10:21:39'),
   (2, 'b', '2000-01-01 00:00:00'),
   (3, 'e', '2007-06-04 20:03:11'),
   (4, 'd', '2003-11-30 05:01:03'),
   (5, 'c', '2001-12-31 23:59:59');
+--enable_ps_protocol
 
 --echo
 --echo select test
@@ -395,7 +397,9 @@ if ($USE_CHILD_GROUP3)
 --connection master_1
 eval $MASTER_1_SET_RECOVERY_STATUS_2_1;
 eval $MASTER_1_CHECK_LINK_STATUS;
+--disable_ps_protocol
 eval $MASTER_1_COPY_TABLES_2_1;
+--enable_ps_protocol
 if ($USE_CHILD_GROUP3)
 {
   if (!$OUTPUT_CHILD_GROUP3)
@@ -421,8 +425,10 @@ if ($USE_CHILD_GROUP3)
 --connection master_1
 eval $MASTER_1_SET_OK_STATUS_2_1;
 eval $MASTER_1_CHECK_LINK_STATUS;
+--disable_ps_protocol
 INSERT INTO ta_l (a, b, c) VALUES
   (8, 'g', '2011-05-05 21:33:30');
+--enable_ps_protocol
 SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a;
 DROP TABLE ta_l;
 if ($USE_CHILD_GROUP2)
@@ -581,12 +587,14 @@ eval CREATE TABLE ta_l (
   PRIMARY KEY(a)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_HA_AS_2_1;
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO ta_l (a, b, c) VALUES
   (1, 'a', '2008-08-01 10:21:39'),
   (2, 'b', '2000-01-01 00:00:00'),
   (3, 'e', '2007-06-04 20:03:11'),
   (4, 'd', '2003-11-30 05:01:03'),
   (5, 'c', '2001-12-31 23:59:59');
+--enable_ps_protocol
 
 --echo
 --echo select test
@@ -787,8 +795,10 @@ if ($USE_CHILD_GROUP3)
 --connection master_1
 eval $MASTER_1_SET_OK_STATUS_AS_2_1;
 eval $MASTER_1_CHECK_LINK_STATUS;
+--disable_ps_protocol
 INSERT INTO ta_l (a, b, c) VALUES
   (8, 'g', '2011-05-05 21:33:30');
+--enable_ps_protocol
 SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a;
 DROP TABLE ta_l;
 if ($USE_CHILD_GROUP2)

storage/spider/mysql-test/spider/bg/t/ha_part.test

@@ -225,12 +225,14 @@ if ($HAVE_PARTITION)
     PRIMARY KEY(a)
   ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_HA_P_2_1;
   --enable_query_log
+  --disable_ps_protocol
   INSERT INTO ta_l2 (a, b, c) VALUES
     (1, 'a', '2008-08-01 10:21:39'),
     (2, 'b', '2000-01-01 00:00:00'),
     (3, 'e', '2007-06-04 20:03:11'),
     (4, 'd', '2003-11-30 05:01:03'),
     (5, 'c', '2001-12-31 23:59:59');
+  --enable_ps_protocol
 
   --echo
   --echo select test
@@ -460,7 +462,9 @@ if ($HAVE_PARTITION)
   --connection master_1
   eval $MASTER_1_SET_RECOVERY_STATUS_P_2_1;
   eval $MASTER_1_CHECK_LINK_STATUS;
+  --disable_ps_protocol
   eval $MASTER_1_COPY_TABLES_P_2_1;
+  --enable_ps_protocol
   if ($USE_CHILD_GROUP3)
   {
     if (!$OUTPUT_CHILD_GROUP3)
@@ -486,9 +490,11 @@ if ($HAVE_PARTITION)
   --connection master_1
   eval $MASTER_1_SET_OK_STATUS_P_2_1;
   eval $MASTER_1_CHECK_LINK_STATUS;
+  --disable_ps_protocol
   INSERT INTO ta_l2 (a, b, c) VALUES
     (8, 'g', '2011-05-05 21:33:30'),
     (9, 'h', '2011-05-05 22:32:10');
+  --enable_ps_protocol
   SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l2 ORDER BY a;
   DROP TABLE ta_l2;
   if ($USE_CHILD_GROUP2)
@@ -674,12 +680,14 @@ if ($HAVE_PARTITION)
     PRIMARY KEY(a)
   ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_HA_AS_P_2_1;
   --enable_query_log
+  --disable_ps_protocol
   INSERT INTO ta_l2 (a, b, c) VALUES
     (1, 'a', '2008-08-01 10:21:39'),
     (2, 'b', '2000-01-01 00:00:00'),
     (3, 'e', '2007-06-04 20:03:11'),
     (4, 'd', '2003-11-30 05:01:03'),
     (5, 'c', '2001-12-31 23:59:59');
+  --enable_ps_protocol
 
   --echo
   --echo select test
@@ -918,9 +926,11 @@ if ($HAVE_PARTITION)
   --connection master_1
   eval $MASTER_1_SET_OK_STATUS_AS_P_2_1;
   eval $MASTER_1_CHECK_LINK_STATUS;
+  --disable_ps_protocol
   INSERT INTO ta_l2 (a, b, c) VALUES
     (8, 'g', '2011-05-05 21:33:30'),
     (9, 'h', '2011-05-05 22:32:10');
+  --enable_ps_protocol
   SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l2 ORDER BY a;
   DROP TABLE ta_l2;
   if ($USE_CHILD_GROUP2)

storage/spider/mysql-test/spider/bg/t/spider3_fixes.test

@@ -159,10 +159,14 @@ if ($USE_REPLICATION)
   --connection master_1
 }
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO t1 () VALUES ();
+--enable_ps_protocol
 SELECT LAST_INSERT_ID();
 SELECT MAX(id) FROM t1;
+--disable_ps_protocol
 INSERT INTO t2 () VALUES ();
+--enable_ps_protocol
 SELECT LAST_INSERT_ID();
 SELECT MAX(id) FROM t2;
 --disable_query_log

storage/spider/mysql-test/spider/bg/t/spider3_fixes_part.test

@@ -193,10 +193,14 @@ if ($HAVE_PARTITION)
     --connection master_1
   }
   --enable_query_log
+  --disable_ps_protocol
   INSERT INTO t1 () VALUES ();
+  --enable_ps_protocol
   SELECT LAST_INSERT_ID();
   SELECT MAX(id) FROM t1;
+  --disable_ps_protocol
   INSERT INTO t2 () VALUES ();
+  --enable_ps_protocol
   SELECT LAST_INSERT_ID();
   SELECT MAX(id) FROM t2;
   --disable_query_log

storage/spider/mysql-test/spider/bg/t/spider_fixes.test

@@ -128,7 +128,9 @@ eval CREATE TABLE ta_l (
   PRIMARY KEY(a)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_2_1;
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO ta_l SELECT a, b, c FROM tb_l;
+--enable_ps_protocol
 
 --echo
 --echo 2.13
@@ -309,7 +311,9 @@ eval CREATE TABLE ta_l (
   PRIMARY KEY (a, b, c)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT5_2_1;
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO ta_l SELECT a, b, c FROM tb_l;
+--enable_ps_protocol
 if ($USE_CHILD_GROUP2)
 {
   if (!$OUTPUT_CHILD_GROUP2)
@@ -668,8 +672,10 @@ if ($HAVE_TRIGGER)
     }
   }
   --connection master_1
+  --disable_ps_protocol
   INSERT INTO ta_l_auto_inc (a, b, c) VALUES
   (NULL, 's', '2008-12-31 20:59:59');
+  --enable_ps_protocol
   if ($USE_CHILD_GROUP2)
   {
     if (!$OUTPUT_CHILD_GROUP2)
@@ -780,7 +786,9 @@ eval CREATE TABLE ta_l_int (
   KEY idx2(c)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT4_2_1;
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO ta_l_int (a, b, c) VALUES (1, 2, 3);
+--enable_ps_protocol
 INSERT INTO ta_l_int (a, b, c) SELECT a + 1, b + 1, c + 1 FROM ta_l_int;
 INSERT INTO ta_l_int (a, b, c) SELECT a + 2, b + 2, c + 2 FROM ta_l_int;
 INSERT INTO ta_l_int (a, b, c) SELECT a + 4, b + 4, c + 4 FROM ta_l_int;
@@ -870,7 +878,9 @@ if (!$MASTER_1_NEEDPK)
   ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT4_2_1;
 }
 --enable_query_log
+--disable_ps_protocol
 SELECT a, b, c FROM ta_l_int ORDER BY a;
+--enable_ps_protocol
 INSERT INTO ta_l_int (a, b, c) VALUES (0, 2, 3);
 INSERT INTO ta_l_int (a, b, c) VALUES (18, 2, 3);
 if ($USE_CHILD_GROUP2)
@@ -1101,7 +1111,9 @@ if ($USE_REPLICATION)
   --connection master_1
 }
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO t1 () VALUES ();
+--enable_ps_protocol
 SELECT LAST_INSERT_ID();
 SELECT MAX(id) FROM t1;
 INSERT INTO t1 () VALUES ();
@@ -1115,7 +1127,9 @@ SELECT LAST_INSERT_ID();
 SELECT MAX(id) FROM t1;
 INSERT INTO t1 () VALUES (),(),(),();
 SELECT LAST_INSERT_ID();
+--disable_ps_protocol
 SELECT id FROM t1 ORDER BY id;
+--enable_ps_protocol
 SET INSERT_ID=5000;
 INSERT INTO t1 () VALUES ();
 SELECT LAST_INSERT_ID();
@@ -1192,7 +1206,9 @@ if ($MASTER_1_ENGINE_IS_SPIDER)
   ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_READONLY1_1;
   --let $MIN_VAL= `SELECT MIN(id) FROM t1`
   --enable_query_log
+  --disable_ps_protocol
   SELECT id FROM t1 ORDER BY id;
+  --enable_ps_protocol
   --error 12518
   INSERT INTO t1 (id) VALUES (1);
   --error 12518
@@ -1229,7 +1245,9 @@ if ($MASTER_1_ENGINE_IS_SPIDER)
     PRIMARY KEY (id)
   ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_ERROR_MODE1_1;
   --enable_query_log
+  --disable_ps_protocol
   SELECT id FROM t1 ORDER BY id;
+  --enable_ps_protocol
   INSERT INTO t1 (id) VALUES (1);
   DELETE FROM t1;
   TRUNCATE t1;
@@ -1288,7 +1306,9 @@ eval CREATE TABLE t1 (
   PRIMARY KEY(c)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_TEXT_KEY1_1;
 --enable_query_log
+--disable_ps_protocol
 insert into t1 values (null, null, '2048');
+--enable_ps_protocol
 insert into t1 values ('1', '1', '1');
 insert into t1 select a + 1,   b + 1,   c + 1   from t1;
 insert into t1 select a + 2,   b + 2,   c + 2   from t1;
@@ -1320,7 +1340,9 @@ if ($USE_CHILD_GROUP2)
   }
 }
 --connection master_1
+--disable_ps_protocol
 select a from t1 where a is null order by a limit 30;
+--enable_ps_protocol
 select b from t1 where b is null order by b limit 30;
 if ($USE_CHILD_GROUP2)
 {
@@ -1376,7 +1398,9 @@ if ($USE_CHILD_GROUP2)
   }
 }
 --connection master_1
+--disable_ps_protocol
 select a, b, c from t1 where a = '10' and b <> '100' order by c desc limit 5;
+--enable_ps_protocol
 select a, c from t1 where a = '10' order by b desc limit 5;
 if ($USE_CHILD_GROUP2)
 {

storage/spider/mysql-test/spider/bg/t/spider_fixes_part.test

@@ -163,7 +163,9 @@ if ($HAVE_PARTITION)
     PRIMARY KEY(a)
   ) $MASTER_1_ENGINE $MASTER_1_COMMENT2_P_2_1;
   --enable_query_log
+  --disable_ps_protocol
   INSERT INTO ta_l2 SELECT a, b, c FROM tb_l;
+  --enable_ps_protocol
   SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l2 WHERE a > 1
   ORDER BY a;
   if ($USE_CHILD_GROUP2)
@@ -268,7 +270,9 @@ if ($HAVE_PARTITION)
     PRIMARY KEY(a)
   ) $MASTER_1_ENGINE $MASTER_1_COMMENT2_P_2_1;
   --enable_query_log
+  --disable_ps_protocol
   INSERT INTO ta_l2 (a, b, c) VALUES (3, 'B', '2010-09-26 00:00:00');
+  --enable_ps_protocol
   UPDATE ta_l2 SET a = 4 WHERE a = 3;
   SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l2;
   if ($USE_CHILD_GROUP2)
@@ -363,7 +367,9 @@ if ($HAVE_PARTITION)
     KEY idx2(c)
   ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT3_P_2_1;
   --enable_query_log
+  --disable_ps_protocol
   INSERT INTO ta_l_int (a, b, c) VALUES (1, 2, 3);
+  --enable_ps_protocol
   INSERT INTO ta_l_int (a, b, c) SELECT a + 1, b + 1, c + 1 FROM ta_l_int;
   INSERT INTO ta_l_int (a, b, c) SELECT a + 2, b + 2, c + 2 FROM ta_l_int;
   INSERT INTO ta_l_int (a, b, c) SELECT a + 4, b + 4, c + 4 FROM ta_l_int;
@@ -531,7 +537,9 @@ if ($HAVE_PARTITION)
     --connection master_1
   }
   --enable_query_log
+  --disable_ps_protocol
   INSERT INTO t1 () VALUES ();
+  --enable_ps_protocol
   SELECT LAST_INSERT_ID();
   SELECT MAX(id) FROM t1;
   INSERT INTO t1 () VALUES ();

storage/spider/mysql-test/spider/bg/t/vp_fixes.test

@@ -119,7 +119,9 @@ eval CREATE TABLE ta_l (
   PRIMARY KEY(a)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_2_1;
 --enable_query_log
+--disable_ps_protocol
 INSERT INTO ta_l SELECT a, b, c FROM tb_l;
+--enable_ps_protocol
 
 --echo
 --echo 0.9
@@ -182,6 +184,7 @@ if ($USE_CHILD_GROUP2)
 }
 --connection master_1
 --let $MASTER_1_IS_VP= `SELECT IF('$MASTER_1_ENGINE_TYPE' = 'VP', 1, 0)`
+--disable_ps_protocol
 if ($MASTER_1_IS_VP)
 {
   --error 14514
@@ -215,6 +218,7 @@ if ($USE_CHILD_GROUP2)
     --enable_result_log
   }
 }
+--enable_ps_protocol
 
 --echo create un-correspond primary key table
 --connection master_1
@@ -279,6 +283,7 @@ if ($USE_CHILD_GROUP2)
   }
 }
 --connection master_1
+--disable_ps_protocol
 if ($MASTER_1_IS_VP)
 {
   --error 14514
@@ -312,6 +317,7 @@ if ($USE_CHILD_GROUP2)
     --enable_result_log
   }
 }
+--enable_ps_protocol
 
 --echo
 --echo deinit

storage/spider/mysql-test/spider/bugfix/r/checksum_table_with_quick_mode_3.result

@@ -31,7 +31,11 @@ CREATE TABLE tbl_a (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (10),(11),(12),(13),(14),(15),(16),(17),(18),(19);
 INSERT INTO tbl_a (pkey) VALUES (20),(21),(22),(23),(24),(25),(26),(27),(28),(29);
 FLUSH TABLES;
@@ -43,6 +47,8 @@ connection master_1;
 CHECKSUM TABLE tbl_a EXTENDED;
 Table	Checksum
 auto_test_local.tbl_a	1061386331
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection child2_1;
 SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 argument

storage/spider/mysql-test/spider/bugfix/r/cp932_column.result

@@ -31,7 +31,11 @@ txt_utf8 char(8) NOT NULL,
 txt_cp932 char(8) NOT NULL COLLATE cp932_japanese_ci,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE DEFAULT CHARACTER SET utf8 MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey,txt_utf8,txt_cp932) VALUES (0,'',''),(1,'',''),(2,'',''),(3,'',''),(4,'',''),(5,'',''),(6,'',''),(7,'',''),(8,'',''),(9,'','');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 FLUSH TABLES;
 
 test 1
@@ -40,6 +44,8 @@ TRUNCATE TABLE mysql.general_log;
 connection master_1;
 SET NAMES cp932;
 INSERT INTO tbl_a (pkey,txt_utf8,txt_cp932) VALUES (10,'','’†‘');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey,txt_utf8,txt_cp932) VALUES (0,'','') ON DUPLICATE KEY UPDATE txt_cp932 = '’†‘';
 UPDATE tbl_a SET txt_cp932 = '’†‘' WHERE pkey = 2;
 SET NAMES utf8;

storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_default.result

@@ -43,6 +43,8 @@ pkey int NOT NULL,
 f float DEFAULT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 INSERT INTO tbl_a (pkey, f) VALUES (0,NULL);
 INSERT INTO tbl_a (pkey, f) VALUES (1,0.671437);

storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_mariadb.result

@@ -43,6 +43,8 @@ pkey int NOT NULL,
 f float DEFAULT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 INSERT INTO tbl_a (pkey, f) VALUES (0,NULL);
 INSERT INTO tbl_a (pkey, f) VALUES (1,0.671437);

storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_mysql.result

@@ -43,6 +43,8 @@ pkey int NOT NULL,
 f float DEFAULT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 INSERT INTO tbl_a (pkey, f) VALUES (0,NULL);
 INSERT INTO tbl_a (pkey, f) VALUES (1,0.671437);

storage/spider/mysql-test/spider/bugfix/r/gbh_outer_fields_in_join.result

@@ -20,13 +20,23 @@ connection master_1;
 CREATE DATABASE auto_test_local;
 USE auto_test_local;
 CREATE TABLE t1 (a int) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='srv "s_2_1", table "t1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t2 (a int) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='srv "s_2_1", table "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t3 (a int) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='srv "s_2_1", table "t3"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select * from t3 left join t1 on t3.a = t1.a left join t2 on t3.a = t2.a;
 a	a	a
 1	1	1
 2	NULL	2
 3	NULL	NULL
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select * from t1 left join t2 on t1.a = t2.a right join t3 on t3.a = t1.a;
 a	a	a
 1	1	1

storage/spider/mysql-test/spider/bugfix/r/group_by_order_by_limit.result

@@ -36,7 +36,17 @@ skey int NOT NULL,
 PRIMARY KEY (pkey),
 KEY idx1 (skey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey,skey) VALUES (0,0),(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey,skey) VALUES (10,10),(11,11),(12,12),(13,13),(14,14),(15,15),(16,16),(17,17),(18,18),(19,19);
 INSERT INTO tbl_a (pkey,skey) VALUES (20,5),(21,6),(22,7),(23,8),(24,9),(25,10),(26,11),(27,12),(28,13),(29,14);
 

storage/spider/mysql-test/spider/bugfix/r/index.result

@@ -12,7 +12,11 @@ select @@spider_auto_increment_mode;
 create or replace table auto_test_local.t (id int primary key) engine=InnoDB;
 create or replace table t_sp1 (id int auto_increment, primary key(id desc))
 engine=Spider COMMENT='wrapper "mysql", srv "s_1", table "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 insert into t_sp1 () values (),(),();
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 insert into t_sp1 () values (),(),();
 select * from t_sp1;
 id
@@ -33,7 +37,17 @@ engine=spider comment='wrapper "mysql", srv "s_1"'
 partition by range (a)
 (partition p1 values less than (4) comment "table 't1'",
 partition p2 values less than (maxvalue) comment "table 't2'");
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 insert into t values (1),(2),(10),(11);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select * from t where a > 1 order by a;
 a
 2
@@ -47,9 +61,13 @@ create table auto_test_local.t (a int, b char(1), primary key(a desc));
 insert into auto_test_local.t VALUES (1,'f'),(2,'g'),(3,'j'), (4,'i'),(5,'h');
 create table ts (a int, b char(1), primary key(a desc))
 engine=spider comment='wrapper "mysql", srv "s_1", table "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select a, b from ts where a > 0 and b = 'g' order by a;
 a	b
 2	g
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 drop table ts, auto_test_local.t;
 drop database auto_test_local;
 for master_1

storage/spider/mysql-test/spider/bugfix/r/insert_select.result

@@ -32,13 +32,19 @@ dt date NOT NULL,
 tm time NOT NULL,
 KEY idx1 (skey,dt,tm)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE tbl_b (
 pkey int NOT NULL,
 dt datetime NOT NULL,
 PRIMARY KEY (pkey),
 KEY idx1 (dt)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1_2
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (skey, dt, tm) VALUES (0, '2012-01-01', '12:00:00'),(1, '2012-02-01', '12:00:00'),(2, '2012-03-01', '12:00:00'),(3, '2012-04-01', '12:00:00'),(4, '2012-05-01', '12:00:00'),(5, '2012-06-01', '12:00:00'),(6, '2012-07-01', '12:00:00'),(7, '2012-08-01', '12:00:00'),(8, '2012-09-01', '12:00:00'),(9, '2012-10-01', '12:00:00');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (skey, dt, tm) VALUES (0, '2013-01-01', '13:00:00'),(1, '2013-02-01', '13:00:00'),(2, '2013-03-01', '13:00:00'),(3, '2013-04-01', '13:00:00'),(4, '2013-05-01', '13:00:00'),(5, '2013-06-01', '13:00:00'),(6, '2013-07-01', '13:00:00'),(7, '2013-08-01', '13:00:00'),(8, '2013-09-01', '13:00:00'),(9, '2013-10-01', '13:00:00');
 INSERT INTO tbl_a (skey, dt, tm) VALUES (0, '2012-11-01', '11:00:00'),(1, '2012-12-01', '11:00:00'),(2, '2012-11-30', '11:00:00'),(3, '2012-11-29', '11:00:00'),(4, '2012-11-28', '11:00:00'),(5, '2012-11-27', '11:00:00'),(6, '2012-11-26', '11:00:00'),(7, '2012-11-25', '11:00:00'),(8, '2012-11-24', '11:00:00'),(9, '2012-11-23', '11:00:00');
 FLUSH TABLES;
@@ -48,6 +54,9 @@ connection child2_1;
 TRUNCATE TABLE mysql.general_log;
 connection master_1;
 INSERT IGNORE INTO tbl_b (SELECT skey, CAST(CONCAT(dt, ' ', tm) AS datetime) FROM tbl_a WHERE skey = 4 AND dt > DATE_ADD('2012-12-01', INTERVAL -10 DAY));
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT IGNORE INTO tbl_b (SELECT skey, CAST(CONCAT(dt, ' ', tm) AS datetime) FROM tbl_a WHERE skey = 3 AND dt > DATE_ADD('2012-12-01', INTERVAL -10 DAY));
 INSERT IGNORE INTO tbl_b (SELECT skey, CAST(CONCAT(dt, ' ', tm) AS datetime) FROM tbl_a WHERE skey = 2 AND dt > DATE_ADD('2012-12-01', INTERVAL -10 DAY));
 INSERT IGNORE INTO tbl_b (SELECT skey, CAST(CONCAT(dt, ' ', tm) AS datetime) FROM tbl_a WHERE skey = 1 AND dt > DATE_ADD('2012-12-01', INTERVAL -10 DAY));

storage/spider/mysql-test/spider/bugfix/r/mdev_19866.result

@@ -35,7 +35,17 @@ pkey int NOT NULL,
 val char(1) NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey,val) VALUES (1,'1'),(2,'2'),(3,'3'),(4,'4');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 select test 1
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_20100.result

@@ -32,12 +32,20 @@ PARTITION pt1 VALUES LESS THAN (5) COMMENT='srv "s_2_1", table "ta_r2"',
 PARTITION pt2 VALUES LESS THAN (10) COMMENT='srv "s_2_1", table "ta_r3"',
 PARTITION pt3 VALUES LESS THAN MAXVALUE COMMENT='srv "s_2_1", table "ta_r4"'
   )
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (a, b, c) VALUES
 (1, 'a', '2008-08-01 10:21:39'),
 (2, 'b', '2000-01-01 00:00:00'),
 (3, 'e', '2007-06-04 20:03:11'),
 (4, 'd', '2003-11-30 05:01:03'),
 (5, 'c', '2001-12-31 23:59:59');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 test 1
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_20502.result

@@ -27,7 +27,11 @@ id int(10) unsigned NOT NULL AUTO_INCREMENT,
 val int(10) unsigned DEFAULT NULL,
 PRIMARY KEY(id)
 ) ENGINE=Spider COMMENT='table "tbl_a", srv "s_2_1"'
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (val) VALUES (1);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 test 1
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_21884.result

@@ -38,6 +38,11 @@ PARTITION pt1 VALUES LESS THAN (10) COMMENT='srv "s_2_1", table "ta_r2",
     priority "1000"',
 PARTITION pt2 VALUES LESS THAN MAXVALUE COMMENT='srv "s_2_1", priority "1000001"'
   )
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE tb_l (
 a INT,
 b CHAR(1),
@@ -50,6 +55,11 @@ INSERT INTO tbl_a (a, b, c) VALUES
 (12, 'e', '2007-06-04 20:03:11'),
 (12, 'd', '2003-11-30 05:01:03'),
 (13, 'c', '2001-12-31 23:59:59');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tb_l (a, b, c) VALUES
 (11, 'a', '2008-08-01 10:21:39'),
 (12, 'b', '2000-01-01 00:00:00'),

storage/spider/mysql-test/spider/bugfix/r/mdev_22246.result

@@ -35,7 +35,17 @@ id bigint NOT NULL,
 node text,
 PRIMARY KEY (id)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (id,node) VALUES (1,'DB-G0'),(2,'DB-G1');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 select test 1
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_22265.result

@@ -12,6 +12,8 @@ USE auto_test_local;
 create table
 connection master_1;
 create table t2345678911234567892123456789312345678941234567895123(id int) ENGINE=SPIDER DEFAULT CHARSET=latin1 COMMENT='host "h114", user "spider", password "spider", port "3306", database "test32738"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 deinit
 connection master_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_24020.result

@@ -28,7 +28,15 @@ PARTITION pt1 VALUES IN (0) COMMENT='srv "s_2_1", table "ta_r2"',
 PARTITION pt2 VALUES IN (1) COMMENT='srv "s_2_1", table "ta_r3"',
 PARTITION pt3 VALUES IN (2) COMMENT='srv "s_2_1", table "ta_r4"'
   )
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a VALUES(10000, "  abcd   ");
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a VALUES(10001, "  abcd   ");
 INSERT INTO tbl_a VALUES(10002, "  abcd   ");
 INSERT INTO tbl_a VALUES(10003, "[[[abcd][[");

storage/spider/mysql-test/spider/bugfix/r/mdev_24343.result

@@ -43,6 +43,9 @@ PRIMARY KEY (`id`)
 PARTITION BY LIST COLUMNS(`id`) (
 PARTITION `pt1` DEFAULT COMMENT = 'srv "s_2_1"'
 );
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE `tbl_b` (
 `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
 `last_name` varchar(255) DEFAULT NULL,
@@ -51,6 +54,9 @@ PRIMARY KEY (`id`)
 PARTITION BY LIST COLUMNS(`id`) (
 PARTITION `pt1` DEFAULT COMMENT = 'srv "s_2_1"'
 );
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE `tbl_c` (
 `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
 `surname` varchar(255) DEFAULT NULL,
@@ -59,10 +65,20 @@ PRIMARY KEY (`id`)
 PARTITION BY LIST COLUMNS(`id`) (
 PARTITION `pt1` DEFAULT COMMENT = 'srv "s_2_1"'
 );
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT * from tbl_b JOIN tbl_c ON tbl_b.id = tbl_c.id LEFT OUTER JOIN tbl_a ON tbl_a.id = tbl_b.id;
 id	last_name	id	surname	id	first_name
 1	DEMONGEOT	1	CON	1	RICHARD
 2	VAROQUI	2	MOYEN	2	STEPHANE
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 DROP DATABASE auto_test_local;
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_24517.result

@@ -31,11 +31,19 @@ PARTITION pt1 VALUES LESS THAN (5) COMMENT='srv "s_2_1", table "ta_r2"',
 PARTITION pt2 VALUES LESS THAN (10) COMMENT='srv "s_2_1", table "ta_r3"',
 PARTITION pt3 VALUES LESS THAN MAXVALUE COMMENT='srv "s_2_1", table "ta_r4"'
   )
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (i, j) VALUES
 (1, '{"ID": "3", "Name": "Barney", "Age": 18}'),
 (2, '{"ID": "4", "Name": "Betty", "Age": 19}'),
 (3, '{"ID": "2", "Name": "Wilma", "Age": 20}'),
 (4, '[10, 20, [30, 40]]');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 test 1
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_24523.result

@@ -28,7 +28,15 @@ PARTITION pt1 VALUES LESS THAN (5) COMMENT='srv "s_2_1", table "ta_r2"',
 PARTITION pt2 VALUES LESS THAN (10) COMMENT='srv "s_2_1", table "ta_r3"',
 PARTITION pt3 VALUES LESS THAN MAXVALUE COMMENT='srv "s_2_1", table "ta_r4"'
   )
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a VALUES (1, '{ "a": 1, "b": [2, 3]}');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 test 1
 connection master_1;
@@ -37,6 +45,10 @@ SELECT * FROM tbl_a;
 i	j
 1	{"a": 10, "b": [2, 3]}
 TRUNCATE TABLE tbl_a;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a VALUES (1, '{ "a": 1, "b": [2, 3]}');
 UPDATE tbl_a SET j = JSON_REPLACE(j, '$.a', 10, '$.b', '[1, 2]');
 SELECT * FROM tbl_a;

storage/spider/mysql-test/spider/bugfix/r/mdev_24760.result

@@ -30,10 +30,16 @@ PRIMARY KEY (id)
 PARTITION BY HASH(id) (
 PARTITION pt1 COMMENT='srv "s_2_1"'
 );
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT id, CASE WHEN name='Alice' THEN "A" WHEN name='Bob' THEN "B" END FROM tbl_a;
 id	CASE WHEN name='Alice' THEN "A" WHEN name='Bob' THEN "B" END
 1	A
 2	B
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT id, CASE name WHEN 'Alice' THEN "A" WHEN 'Bob' THEN "B" END FROM tbl_a;
 id	CASE name WHEN 'Alice' THEN "A" WHEN 'Bob' THEN "B" END
 1	A

storage/spider/mysql-test/spider/bugfix/r/mdev_25116.result

@@ -17,6 +17,8 @@ USE auto_test_local;
 CREATE TABLE tbl_a (
 id INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 set @old_spider_direct_aggregate=@@session.spider_direct_aggregate;
 set spider_direct_aggregate=1;
@@ -26,6 +28,8 @@ Spider_direct_aggregate	0
 SELECT IF(COUNT(id > 0),'Y','N') FROM tbl_a;
 IF(COUNT(id > 0),'Y','N')
 N
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SHOW STATUS LIKE 'Spider_direct_aggregate';
 Variable_name	Value
 Spider_direct_aggregate	1

storage/spider/mysql-test/spider/bugfix/r/mdev_26013.result

@@ -26,10 +26,16 @@ PRIMARY KEY (`a`)
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a"' PARTITION BY LIST COLUMNS(`a`) (
 PARTITION `pt1` DEFAULT COMMENT = 'srv "s_2_1"'
 );
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 SELECT distinct b FROM tbl_a WHERE b=999;
 b
 999
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 DROP DATABASE IF EXISTS auto_test_remote;
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_26151.result

@@ -9,17 +9,27 @@ set session spider_bgs_mode=1;
 CREATE SERVER $srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
 create table td (a int, PRIMARY KEY (a));
 create table ts (a int, PRIMARY KEY (a)) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv_mdev_26151",TABLE "td", casual_read "3"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'casual_read' is deprecated and will be removed in a future release
 insert into td values (11), (42);
 select max(a) from ts;
 max(a)
 42
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 drop table td, ts;
 create table td (a int, PRIMARY KEY (a));
 create table ts (a int, PRIMARY KEY (a)) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv_mdev_26151",TABLE "td", casual_read "1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'casual_read' is deprecated and will be removed in a future release
 insert into td values (11), (42);
 select max(a) from ts;
 max(a)
 42
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select min(a) from ts;
 min(a)
 11

storage/spider/mysql-test/spider/bugfix/r/mdev_26158.result

@@ -16,6 +16,9 @@ c INT
 PARTITION BY LIST COLUMNS(`c`) (
 PARTITION `pt1` DEFAULT COMMENT = 'srv "s_2_1"'
 );
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO t SELECT * FROM t;
 ERROR 42000: Unknown database 'auto_test_remote'
 DROP DATABASE auto_test_local;

storage/spider/mysql-test/spider/bugfix/r/mdev_26247.result

@@ -34,19 +34,28 @@ CREATE TABLE t1 (
 a11 int,
 primary key (a11)
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='srv "s_2_1", table "t1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t2 (
 a21 int,
 a22 int,
 primary key (a21, a22)
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='srv "s_2_1", table "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t3 (
 a31 int,
 a32 int,
 primary key (a31, a32)
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='srv "s_2_1", table "t3"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT a22 FROM t1 LEFT JOIN t2 ON a11 = a21 WHERE a11 IN (1);
 a22
 11
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT a22 FROM t1 LEFT JOIN t2 ON a11 = a21 - a21 WHERE a11 IN (1);
 a22
 NULL
@@ -60,6 +69,8 @@ a22
 SELECT a22, a32 FROM t1 LEFT JOIN t2 ON a11 = a21 RIGHT JOIN t3 on a21 = a31 WHERE a11 IN (1);
 a22	a32
 11	111
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT a22, a32 FROM t1 LEFT JOIN t2 ON a11 = a21 - a21 RIGHT JOIN t3 on a21 = a31 - a31 WHERE a11 IN (1);
 a22	a32
 SELECT a22, a32 FROM t1 LEFT JOIN t2 ON a11 = a21 RIGHT JOIN t3 on a21 = a31 WHERE a11 IN (1,2);

storage/spider/mysql-test/spider/bugfix/r/mdev_26539.result

@@ -21,7 +21,13 @@ c INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a"' PARTITION BY LIST COLUMNS (c) (
 PARTITION pt1 DEFAULT COMMENT = 'srv "s_2_1"'
 );
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a VALUES (1);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 ALTER TABLE tbl_a CHECK PARTITION ALL;
 Table	Op	Msg_type	Msg_text
 auto_test_local.tbl_a	check	status	OK

storage/spider/mysql-test/spider/bugfix/r/mdev_27172.result

@@ -38,7 +38,11 @@ id int NOT NULL,
 greeting VARCHAR(255),
 KEY k (greeting)
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a VALUES (1, "Hi!"),(2, "Aloha!"),(3, "Aloha!!!");
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT * FROM tbl_a WHERE greeting = "Aloha!"
   AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one";
 id	greeting
@@ -48,7 +52,11 @@ id int NOT NULL,
 greeting VARCHAR(255),
 KEY k (greeting(5))
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_b", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_b VALUES (1, "Hi!"),(2, "Aloha!"),(3, "Aloha!!!");
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT * FROM tbl_b WHERE greeting = "Aloha!"
   AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one";
 id	greeting
@@ -58,7 +66,11 @@ id int NOT NULL,
 greeting TEXT,
 KEY k (greeting(5))
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_c", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_c VALUES (1, "Hi!"),(2, "Aloha!"),(3, "Aloha!!!");
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT * FROM tbl_c WHERE greeting = "Aloha!"
   AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one";
 id	greeting

storage/spider/mysql-test/spider/bugfix/r/mdev_28739.result

@@ -19,8 +19,12 @@ set spider_same_server_link = on;
 CREATE TABLE tbl_a (
 id INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT * FROM tbl_a;
 id
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 # restart
 connection master_1;
 DROP DATABASE IF EXISTS auto_test_local;

storage/spider/mysql-test/spider/bugfix/r/mdev_28739_simple.result

@@ -10,8 +10,12 @@ OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT * FROM t1;
 c
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 # restart
 drop table t1, t2;
 drop server srv;

storage/spider/mysql-test/spider/bugfix/r/mdev_28854.result

@@ -17,6 +17,8 @@ USE auto_test_local;
 CREATE TABLE tbl_a (
 id INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 INSERT DELAYED INTO tbl_a VALUES (1);
 ERROR HY000: DELAYED option not supported for table 'tbl_a'

storage/spider/mysql-test/spider/bugfix/r/mdev_28856.result

@@ -12,6 +12,9 @@ INSERT INTO mysql.spider_link_mon_servers
 ('test', 't1', '0', 1, 'srv');
 create table t1 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", monitoring_kind "2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'monitoring_kind' is deprecated and will be removed in a future release
 /* 1 */ insert into t1 values (42);
 ERROR HY000: Table 'test.t2' get a problem
 /* 2 */ insert into t1 values (42);
@@ -23,14 +26,22 @@ drop table t1, t2;
 create table t1 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", monitoring_bg_kind "2",
          monitoring_bg_interval "500000"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'monitoring_bg_kind' is deprecated and will be removed in a future release
+Warning	1287	'monitoring_bg_interval' is deprecated and will be removed in a future release
 /* 4 */ insert into t1 values (42);
 ERROR 42S02: Table 'test.t2' doesn't exist
 drop table t1;
 # testing query_cache_sync
 create table t1 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", query_cache_sync "3"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 create table t2 (c int);
 /* 5 */ insert into t1 values (42);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select sql_cache * from t1;
 c
 42
@@ -42,7 +53,11 @@ drop table t1, t2;
 create table t2 (c int);
 create table t1 (c int, primary key (c)) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 6 */ insert ignore into t1 values (42), (42);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select * from t1;
 c
 42
@@ -51,8 +66,11 @@ drop table t1, t2;
 create table t2 (c int, primary key (c));
 create table t1 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 7 */ insert ignore into t1 values (42), (42);
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	1022	Can't write; duplicate key in table 't1'
 select * from t1;
 c
@@ -61,8 +79,11 @@ drop table t1, t2;
 create table t2 (c int, primary key (c));
 create table t1 (c int, primary key (c)) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 8 */ insert ignore into t1 values (42), (42);
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	1062	Duplicate entry '42' for key 'PRIMARY'
 select * from t1;
 c
@@ -71,8 +92,12 @@ drop table t1, t2;
 create table t2 (c int, primary key (c));
 create table t1 (c int, primary key (c)) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", pk_name "c"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'pk_name' is deprecated and will be removed in a future release
 /* 9 */ insert ignore into t1 values (42), (42);
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	1022	Can't write; duplicate key in table 't1'
 select * from t1;
 c
@@ -81,8 +106,12 @@ drop table t1, t2;
 create table t2 (c int, unique key (c));
 create table t1 (c int, primary key (c)) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", pk_name "c"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'pk_name' is deprecated and will be removed in a future release
 /* 9.1 */ insert ignore into t1 values (42), (42);
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	1062	Duplicate entry '42' for key 'PRIMARY'
 select * from t1;
 c
@@ -91,8 +120,12 @@ drop table t1, t2;
 create table t2 (c int, unique key (c));
 create table t1 (c int, key (c)) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", pk_name "f"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'pk_name' is deprecated and will be removed in a future release
 /* 10 */ insert ignore into t1 values (42), (42);
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	1062	Duplicate entry '42' for key 'c'
 select * from t1;
 c
@@ -101,8 +134,12 @@ drop table t1, t2;
 create table t2 (c int, primary key (c));
 create table t1 (c int, key (c)) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", pk_name "blah"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'pk_name' is deprecated and will be removed in a future release
 /* 11 */ insert ignore into t1 values (42), (42);
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	1022	Can't write; duplicate key in table 't1'
 select * from t1;
 c
@@ -111,8 +148,12 @@ drop table t1, t2;
 create table t2 (c int, d int, unique key (c), unique key (d));
 create table t1 (c int, d int, key (c), key (d)) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", pk_name "blah"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	1287	'pk_name' is deprecated and will be removed in a future release
 /* 12 */ insert ignore into t1 values (42, 43), (43, 43);
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	1062	Duplicate entry '43' for key 'd'
 select * from t1;
 c	d
@@ -130,6 +171,8 @@ t2	CREATE TABLE `t2` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 create table t1 (c int, d int, primary key (c), key (d)) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", idx000 "f d"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -138,6 +181,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`c`),
   KEY `d` (`d`)
 ) ENGINE=SPIDER DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", idx000 "f d"'
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 13 */ insert into t1 values (42, 23), (37, 93);
 select max(d) from t1;
 max(d)
@@ -156,6 +201,8 @@ t2	CREATE TABLE `t2` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 create table t1 (c int, d int, e int, primary key (c), key (d), unique key (e)) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", idx000 "f PRIMARY", idx001 "u d", idx002 "ig e"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -166,6 +213,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `e` (`e`),
   KEY `d` (`d`)
 ) ENGINE=SPIDER DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", idx000 "f PRIMARY", idx001 "u d", idx002 "ig e"'
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 14 */ insert into t1 values (42, 23, 89), (37, 93, 47);
 select max(d) from t1;
 max(d)

storage/spider/mysql-test/spider/bugfix/r/mdev_28996.result

@@ -20,9 +20,13 @@ USE auto_test_local;
 CREATE TABLE tbl_a (
 a CHAR(8)
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT MAX(BINARY a) FROM tbl_a;
 MAX(BINARY a)
 foo
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 DROP DATABASE auto_test_local;
 connection child2_1;
 DROP DATABASE auto_test_remote;

storage/spider/mysql-test/spider/bugfix/r/mdev_28998.result

@@ -10,7 +10,11 @@ CREATE SERVER s FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", D
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t1_SPIDER (a INT) ENGINE=SPIDER COMMENT = "wrapper 'mysql', srv 's', table 't1'";
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t2 AS SELECT a FROM t1_SPIDER;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT * FROM t2;
 a
 1

storage/spider/mysql-test/spider/bugfix/r/mdev_29008.result

@@ -22,10 +22,14 @@ CREATE TABLE tbl_a (
 a INT,
 b INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT MIN(t2.a) AS f1, t1.b AS f2 FROM tbl_a AS t1 JOIN tbl_a AS t2 GROUP BY f2 ORDER BY f1, f2;
 f1	f2
 1	2
 1	4
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 DROP DATABASE IF EXISTS auto_test_local;
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_29011.result

@@ -22,12 +22,16 @@ CREATE TABLE tbl_a (
 a INT,
 b INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT a XOR b AS f FROM tbl_a;
 f
 0
 1
 1
 0
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 DROP DATABASE IF EXISTS auto_test_local;
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_29163.result

@@ -9,10 +9,20 @@ CREATE TABLE t1 (a INT);
 CREATE TABLE t2 (b INT);
 CREATE TABLE t3 (c INT, PRIMARY KEY(c));
 CREATE TABLE t1_spider (a INT) ENGINE=SPIDER COMMENT = "wrapper 'mysql', srv 's', table 't1'";
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t2_spider (b INT) ENGINE=SPIDER COMMENT = "wrapper 'mysql', srv 's', table 't2'";
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t3_spider (c INT, PRIMARY KEY(c)) ENGINE=SPIDER COMMENT = "wrapper 'mysql', srv 's', table 't3'";
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT t1_spider.* FROM t1_spider LEFT JOIN t2_spider LEFT JOIN t3_spider ON b = c ON a = b;
 a
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 DROP TABLE t1_spider, t2_spider, t3_spider, t1, t2, t3;
 drop server s;
 for master_1

storage/spider/mysql-test/spider/bugfix/r/mdev_29421.result

@@ -7,6 +7,8 @@ CREATE SERVER srv FOREIGN DATA WRAPPER mysql
 OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
 CREATE TABLE t (c INT) ENGINE=InnoDB;
 CREATE TABLE t_s (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv", TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t1 (a INT) ENGINE=Spider;
 SELECT * FROM t1;
 ERROR HY000: Unable to connect to foreign data source: localhost

storage/spider/mysql-test/spider/bugfix/r/mdev_29447.result

@@ -19,8 +19,12 @@ USE auto_test_local;
 CREATE TABLE tbl_a (
 a INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT TRIM(LEADING 'c' FROM a) FROM tbl_a;
 TRIM(LEADING 'c' FROM a)
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection child2_1;
 DROP DATABASE auto_test_remote;
 connection master_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_29456.result

@@ -9,8 +9,12 @@ OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
 create table t1 (c int);
 create table t2 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t3 (c INT KEY) ENGINE=Spider;
 LOCK TABLE t2 WRITE;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLE t3 WRITE;
 ERROR HY000: Unable to connect to foreign data source: localhost
 UNLOCK TABLES;
@@ -18,7 +22,11 @@ drop table t1, t2, t3;
 CREATE TABLE t (c INT) ENGINE=InnoDB;
 CREATE TABLE t1 (c INT) ENGINE=Spider;
 CREATE TABLE t2 (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLES t2 WRITE;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLES t1 READ;
 ERROR HY000: Unable to connect to foreign data source: localhost
 CREATE TABLE t (c INT) ENGINE=Spider;
@@ -26,8 +34,12 @@ ERROR 42S01: Table 't' already exists
 drop table t, t1, t2;
 CREATE TABLE t (c INT) ENGINE=InnoDB;
 CREATE TABLE t2 (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t3 (c INT) ENGINE=InnoDB;
 LOCK TABLES t2 WRITE;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLES mysql.proc WRITE,mysql.user WRITE;
 ERROR HY000: You can't combine write-locking of system tables with other tables or lock types
 INSERT INTO t3 SELECT * FROM t;

storage/spider/mysql-test/spider/bugfix/r/mdev_29484.result

@@ -19,10 +19,14 @@ USE auto_test_local;
 CREATE TABLE tbl_a (
 a INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE tbl_b (
 a INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8;
 LOCK TABLES tbl_a WRITE;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLES tbl_b READ, tbl_a READ;
 ERROR HY000: Unable to connect to foreign data source: localhost
 disconnect master_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_29502.result

@@ -10,9 +10,13 @@ INSERT INTO t VALUES (23),(48);
 set @old_spider_direct_aggregate=@@session.spider_direct_aggregate;
 set spider_direct_aggregate=1;
 CREATE TABLE t1 (a INT KEY) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv_mdev_29502",TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT MAX(a) FROM t1;
 MAX(a)
 48
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT SUM(a) FROM t1;
 SUM(a)
 71
@@ -38,9 +42,13 @@ DROP TABLE t, t1;
 CREATE TABLE t (a INT, b INT);
 INSERT INTO t VALUES (23, -1),(48, 97);
 CREATE TABLE t1 (a INT, b INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv_mdev_29502",TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT MAX(a + b), SUM(a - b) FROM t1;
 MAX(a + b)	SUM(a - b)
 145	-25
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SHOW STATUS LIKE 'Spider_direct_aggregate';
 Variable_name	Value
 Spider_direct_aggregate	0
@@ -48,9 +56,13 @@ DROP TABLE t, t1;
 CREATE TABLE t (a INT);
 INSERT INTO t VALUES (23),(97),(42);
 CREATE TABLE t1 (a INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv_mdev_29502",TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT IF(COUNT(a > 0),'Y','N'), MAX(a) FROM t1;
 IF(COUNT(a > 0),'Y','N')	MAX(a)
 Y	97
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SHOW STATUS LIKE 'Spider_direct_aggregate';
 Variable_name	Value
 Spider_direct_aggregate	2

storage/spider/mysql-test/spider/bugfix/r/mdev_29562.result

@@ -28,13 +28,20 @@ ERROR HY000: Table storage engine 'SPIDER' does not support the create option 'C
 CREATE TABLE tbl_a (
 a INT
 ) ENGINE=Spider CHARSET utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT * FROM tbl_a;
 a
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 ALTER TABLE tbl_a CONVERT TO CHARACTER SET utf16;
 ERROR HY000: Table storage engine 'SPIDER' does not support the create option 'CHARSET utf16'
 ALTER TABLE tbl_a CONVERT TO CHARACTER SET utf16le;
 ERROR HY000: Table storage engine 'SPIDER' does not support the create option 'CHARSET utf16le'
 ALTER TABLE tbl_a CONVERT TO CHARACTER SET latin1;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 DROP DATABASE IF EXISTS auto_test_local;
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_29644.result

@@ -20,8 +20,12 @@ USE auto_test_local;
 CREATE TABLE tbl_a (
 a CHAR(255)
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SET sql_mode='';
 INSERT INTO tbl_a VALUES ("this will be truncated");
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 NOT FOUND /\[WARN SPIDER RESULT\].* Warning 1265 Data truncated for column 'a' at row 1.*/ in mysqld.1.1.err
 SET GLOBAL spider_log_result_errors=4;
 INSERT INTO tbl_a VALUES ("this will be truncated");

storage/spider/mysql-test/spider/bugfix/r/mdev_29653.result

@@ -19,8 +19,12 @@ USE auto_test_local;
 CREATE TABLE ts (
 c INT
 ) ENGINE=Spider COMMENT='table "t", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT 1 FROM ts WHERE ROW(c, c) NOT IN ((0,0),(1,1));
 1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 DROP DATABASE IF EXISTS auto_test_local;
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_29667.result

@@ -19,10 +19,14 @@ USE auto_test_local;
 CREATE TABLE tbl_a (
 a INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE tbl_b (
 a INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8;
 LOCK TABLES tbl_a WRITE;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLES tbl_b READ, tbl_a READ;
 ERROR HY000: Unable to connect to foreign data source: localhost
 connection master_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_29963.result

@@ -8,25 +8,37 @@ CREATE SERVER srv FOREIGN DATA WRAPPER mysql
 OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
 CREATE TABLE t (a INT) ENGINE=Spider;
 CREATE TABLE t2 (b INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLES t AS a READ,t2 AS b LOW_PRIORITY WRITE,t2 AS c WRITE;
 ERROR HY000: Unable to connect to foreign data source: localhost
 DROP TABLE t2;
 CREATE TABLE t2 (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLES t2 WRITE;
 ERROR HY000: Unable to connect to foreign data source: localhost
 DROP TABLE t2,t;
 CREATE TABLE t (a INT);
 CREATE TABLE t1 (a INT) ENGINE=Spider;
 CREATE TABLE t2 (b INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLES t1 READ, t2 WRITE;
 ERROR HY000: Unable to connect to foreign data source: localhost
 DROP TABLE t2;
 CREATE TABLE t2 (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLES t2 WRITE;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 UNLOCK TABLES;
 DROP TABLE t, t1, t2;
 CREATE TABLE t1 (c INT) ENGINE=Spider;
 CREATE TABLE t2 (c INT) ENGINE=Spider COMMENT="WRAPPER 'mysql',srv 'srv',TABLE 't1'";
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 LOCK TABLES t1 WRITE,t2 WRITE;
 ERROR HY000: Unable to connect to foreign data source: localhost
 TRUNCATE t2;

storage/spider/mysql-test/spider/bugfix/r/mdev_30014.result

@@ -9,6 +9,8 @@ OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
 create table t1 (c int);
 create table t2 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t3 (c INT KEY) ENGINE=Spider;
 LOCK TABLE t2 WRITE,t3 WRITE;
 ERROR HY000: Unable to connect to foreign data source: localhost
@@ -22,6 +24,8 @@ drop table t1, t2, t3, t4;
 create table t1 (c int);
 create table t2 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE t3 (c INT KEY) ENGINE=Spider;
 LOCK TABLE t2 WRITE, t3 WRITE;
 ERROR HY000: Unable to connect to foreign data source: localhost

storage/spider/mysql-test/spider/bugfix/r/mdev_30191.result

@@ -17,6 +17,8 @@ USE auto_test_local;
 CREATE TABLE tbl_a (
 c INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE tbl_b (c INT);
 CREATE PROCEDURE sp() BEGIN
 DECLARE v1 DATE;
@@ -32,6 +34,8 @@ SELECT 1;
 END WHILE; 
 END $$
 CALL sp();
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 DROP DATABASE IF EXISTS auto_test_local;
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/mdev_30392.result

@@ -8,10 +8,14 @@ CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK",
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (a INT) ENGINE=SPIDER COMMENT = "wrapper 'mysql', srv 'srv', table 't1'";
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT a FROM t2 WHERE a IN ( SELECT a FROM t2 );
 a
 1
 2
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 DROP TABLE t1, t2;
 DROP SERVER srv;
 for master_1

storage/spider/mysql-test/spider/bugfix/r/mdev_31117.result

@@ -14,6 +14,7 @@ create table t1 (c int) ENGINE=Spider COMMENT='WRAPPER "mysql", "srv" "srv",TABL
 ERROR HY000: The connect info '"srv" "srv",TABLE "t2"' is invalid
 create table t1 (c int) ENGINE=Spider CONNECTION='WRAPPER "mysql", srv \'srv\',TABLE "t2", password "say \\"hello\\ world!\\""';
 Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 Warning	138	The high availability feature of Spider has been deprecated and will be removed in a future release
 drop table t1, t2;
 drop server srv;

storage/spider/mysql-test/spider/bugfix/r/mdev_31338.result

@@ -7,8 +7,12 @@ for child3
 CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
 CREATE TABLE t (c BLOB) ENGINE=InnoDB;
 CREATE TABLE ts (c BLOB) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT TRIM(BOTH ' ' FROM c) FROM ts ORDER BY c;
 TRIM(BOTH ' ' FROM c)
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 drop table t, ts;
 drop server srv;
 for master_1

storage/spider/mysql-test/spider/bugfix/r/mdev_31463.result

@@ -15,6 +15,8 @@ connection master_1;
 CREATE DATABASE auto_test_local;
 USE auto_test_local;
 CREATE TABLE t2 (a INT) ENGINE=Spider COMMENT='table "t1", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connect  master_1_another, localhost, root, , auto_test_local, $MASTER_1_MYPORT, $MASTER_1_MYSOCK;
 SET DEBUG_SYNC='spider_set_lock_wait_timeout_before_query SIGNAL ready WAIT_FOR go';
 insert into t2 values (42);

storage/spider/mysql-test/spider/bugfix/r/mdev_31645.result

@@ -7,8 +7,12 @@ for child3
 CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
 CREATE TABLE t1 ( a bigint(20) NOT NULL, b bigint(20) DEFAULT 0, PRIMARY KEY (a));
 CREATE TABLE t2 ( a bigint(20) NOT NULL, b bigint(20) DEFAULT 0, PRIMARY KEY (a)) ENGINE=SPIDER COMMENT='srv "srv", WRAPPER "mysql", TABLE "t1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT * FROM t2 WHERE b IN (SELECT b FROM t2 WHERE a > 10);
 a	b
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SELECT * FROM t2
 WHERE A BETWEEN 0 AND 10 AND B IN(SELECT B FROM t2 WHERE A BETWEEN 11 AND 20);
 a	b

storage/spider/mysql-test/spider/bugfix/r/mdev_31996.result

@@ -7,12 +7,20 @@ set session spider_delete_all_rows_type=0;
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", delete_all_rows_type "0"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 delete from t1;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 drop table t1, t2;
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", delete_all_rows_type "0"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 insert ignore into t1 values (42), (378);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select * from t1;
 c
 42
@@ -24,17 +32,27 @@ drop table t1, t2;
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", delete_all_rows_type "0"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 truncate t1;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 drop table t1, t2;
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", delete_all_rows_type "0"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 insert ignore into t1 values (42), (378);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select * from t1;
 c
 42
 378
 truncate t1;
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select * from t1;
 c
 drop table t1, t2;

storage/spider/mysql-test/spider/bugfix/r/quick_mode_0.result

@@ -44,10 +44,18 @@ CREATE TABLE tbl_b (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_2
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (10),(11),(12),(13),(14),(15),(16),(17),(18),(19);
 INSERT INTO tbl_a (pkey) VALUES (20),(21),(22),(23),(24),(25),(26),(27),(28),(29);
 INSERT INTO tbl_b (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_b (pkey) VALUES (10),(11),(12),(13),(14),(15),(16),(17),(18),(19);
 INSERT INTO tbl_b (pkey) VALUES (20),(21),(22),(23),(24),(25),(26),(27),(28),(29);
 

storage/spider/mysql-test/spider/bugfix/r/quick_mode_1.result

@@ -44,10 +44,18 @@ CREATE TABLE tbl_b (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_2
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (10),(11),(12),(13),(14),(15),(16),(17),(18),(19);
 INSERT INTO tbl_a (pkey) VALUES (20),(21),(22),(23),(24),(25),(26),(27),(28),(29);
 INSERT INTO tbl_b (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_b (pkey) VALUES (10),(11),(12),(13),(14),(15),(16),(17),(18),(19);
 INSERT INTO tbl_b (pkey) VALUES (20),(21),(22),(23),(24),(25),(26),(27),(28),(29);
 

storage/spider/mysql-test/spider/bugfix/r/quick_mode_2.result

@@ -44,10 +44,18 @@ CREATE TABLE tbl_b (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_2
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (10),(11),(12),(13),(14),(15),(16),(17),(18),(19);
 INSERT INTO tbl_a (pkey) VALUES (20),(21),(22),(23),(24),(25),(26),(27),(28),(29);
 INSERT INTO tbl_b (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_b (pkey) VALUES (10),(11),(12),(13),(14),(15),(16),(17),(18),(19);
 INSERT INTO tbl_b (pkey) VALUES (20),(21),(22),(23),(24),(25),(26),(27),(28),(29);
 

storage/spider/mysql-test/spider/bugfix/r/quick_mode_3.result

@@ -44,10 +44,18 @@ CREATE TABLE tbl_b (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_2
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (10),(11),(12),(13),(14),(15),(16),(17),(18),(19);
 INSERT INTO tbl_a (pkey) VALUES (20),(21),(22),(23),(24),(25),(26),(27),(28),(29);
 INSERT INTO tbl_b (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_b (pkey) VALUES (10),(11),(12),(13),(14),(15),(16),(17),(18),(19);
 INSERT INTO tbl_b (pkey) VALUES (20),(21),(22),(23),(24),(25),(26),(27),(28),(29);
 

storage/spider/mysql-test/spider/bugfix/r/return_found_rows_insert.result

@@ -28,7 +28,11 @@ dt date NOT NULL,
 tm time NOT NULL,
 PRIMARY KEY (skey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (skey, dt, tm) VALUES (0, '2012-01-01', '12:00:00'),(1, '2012-02-01', '12:00:00'),(2, '2012-03-01', '12:00:00'),(3, '2012-04-01', '12:00:00'),(4, '2012-05-01', '12:00:00'),(5, '2012-06-01', '12:00:00'),(6, '2012-07-01', '12:00:00'),(7, '2012-08-01', '12:00:00'),(8, '2012-09-01', '12:00:00'),(9, '2012-10-01', '12:00:00');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 FLUSH TABLES;
 
 select test 1
@@ -45,8 +49,8 @@ Query OK, 0 rows affected
 INSERT IGNORE INTO tbl_a (skey, dt, tm) VALUES (0, '2013-01-01', '13:00:00'),(2, '2013-02-01', '13:00:00'),(4, '2013-03-01', '13:00:00'),(7, '2013-04-01', '13:00:00'),(8, '2013-05-01', '13:00:00'),(10, '2013-06-01', '13:00:00'),(11, '2013-07-01', '13:00:00'),(12, '2013-08-01', '13:00:00'),(13, '2013-09-01', '13:00:00'),(14, '2013-10-01', '13:00:00')
 --------------
 
-Query OK, 5 rows affected
-Records: 10  Duplicates: 5  Warnings: 0
+Query OK, 5 rows affected, 1 warning
+Records: 10  Duplicates: 5  Warnings: 1
 
 Bye
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/return_found_rows_update.result

@@ -28,7 +28,11 @@ dt date NOT NULL,
 tm time NOT NULL,
 KEY idx1 (skey,dt)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (skey, dt, tm) VALUES (0, '2012-01-01', '12:00:00'),(1, '2012-02-01', '12:00:00'),(2, '2012-03-01', '12:00:00'),(3, '2012-04-01', '12:00:00'),(4, '2012-05-01', '12:00:00'),(5, '2012-06-01', '12:00:00'),(6, '2012-07-01', '12:00:00'),(7, '2012-08-01', '12:00:00'),(8, '2012-09-01', '12:00:00'),(9, '2012-10-01', '12:00:00');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (skey, dt, tm) VALUES (0, '2013-01-01', '13:00:00'),(1, '2013-02-01', '13:00:00'),(2, '2013-03-01', '13:00:00'),(3, '2013-04-01', '13:00:00'),(4, '2013-05-01', '13:00:00'),(5, '2013-06-01', '13:00:00'),(6, '2013-07-01', '13:00:00'),(7, '2013-08-01', '13:00:00'),(8, '2013-09-01', '13:00:00'),(9, '2013-10-01', '13:00:00');
 INSERT INTO tbl_a (skey, dt, tm) VALUES (0, '2012-11-01', '11:00:00'),(1, '2012-12-01', '11:00:00'),(2, '2012-11-30', '11:00:00'),(3, '2012-11-29', '11:00:00'),(4, '2012-11-28', '11:00:00'),(5, '2012-11-27', '11:00:00'),(6, '2012-11-26', '11:00:00'),(7, '2012-11-25', '11:00:00'),(8, '2012-11-24', '11:00:00'),(9, '2012-11-23', '11:00:00');
 FLUSH TABLES;
@@ -41,8 +45,8 @@ MYSQL -v -v -u root -h localhost -P MASTER_1_MYPORT -S MASTER_1_MYSOCK -e "UPDAT
 UPDATE tbl_a SET tm = '12:00:00' WHERE skey = 0
 --------------
 
-Query OK, 2 rows affected
-Rows matched: 3  Changed: 2  Warnings: 0
+Query OK, 2 rows affected, 1 warning
+Rows matched: 3  Changed: 2  Warnings: 1
 
 Bye
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/same_server_link.result

@@ -20,6 +20,8 @@ CREATE TABLE tbl_a (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 CREATE TABLE tbl_b (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)

storage/spider/mysql-test/spider/bugfix/r/select_by_null.result

@@ -26,7 +26,11 @@ CREATE TABLE tbl_a (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (10),(11),(12),(13),(14),(15),(16),(17),(18),(19);
 INSERT INTO tbl_a (pkey) VALUES (20),(21),(22),(23),(24),(25),(26),(27),(28),(29);
 FLUSH TABLES;
@@ -37,6 +41,8 @@ TRUNCATE TABLE mysql.general_log;
 connection master_1;
 SELECT pkey FROM tbl_a WHERE NULL;
 pkey
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection child2_1;
 SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument

storage/spider/mysql-test/spider/bugfix/r/select_with_backquote.result

@@ -27,7 +27,11 @@ pkey int NOT NULL,
 txt_utf8 char(8) NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE DEFAULT CHARACTER SET utf8 MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey,txt_utf8) VALUES (0,'01234567'),(1,'12345678'),(2,'23456789'),(3,'34567890'),(4,'45678901'),(5,'56789012'),(6,'67890123'),(7,'78901234'),(8,'89012345'),(9,'90123456');
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 FLUSH TABLES;
 
 test 1
@@ -40,6 +44,8 @@ pkey	LEFT(`txt_utf8`, 4)
 0	0123
 1	1234
 2	2345
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection child2_1;
 SET NAMES utf8;
 SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';

storage/spider/mysql-test/spider/bugfix/r/self_reference.result

@@ -18,6 +18,8 @@ CREATE TABLE tbl_a (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 select test 1
 connection master_1;

storage/spider/mysql-test/spider/bugfix/r/self_reference_multi.result

@@ -7,8 +7,15 @@ MDEV-6268 SPIDER table with no COMMENT clause causes queries to wait forever
 CREATE SERVER $srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv_self_reference_multi",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 create table t0 (c int) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv_self_reference_multi",TABLE "t1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 alter table t2 ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv_self_reference_multi",TABLE "t0"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select * from t0;
 ERROR HY000: An infinite loop is detected when opening table test.t0
 select * from t1;

storage/spider/mysql-test/spider/bugfix/r/slave_trx_isolation.result

@@ -40,6 +40,8 @@ CREATE TABLE tbl_a (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 connection master_1;
 INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 connection slave1_1;

storage/spider/mysql-test/spider/bugfix/r/spider_join_with_non_spider.result

@@ -9,7 +9,11 @@ create table t1 (c int);
 create table t2 (d int);
 insert into t2 values (1), (2);
 create table t3 (c int) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv",TABLE "t1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 insert into t3 values (2), (3);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select c from t3 join t2 on c = d;
 c
 2

storage/spider/mysql-test/spider/bugfix/r/sql_mode_mariadb.result

@@ -29,7 +29,11 @@ CREATE TABLE tbl_a (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 select test
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/sql_mode_mysql.result

@@ -29,7 +29,11 @@ CREATE TABLE tbl_a (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 select test
 connection child2_1;

storage/spider/mysql-test/spider/bugfix/r/strict_group_by.result

@@ -42,7 +42,17 @@ skey int NOT NULL,
 PRIMARY KEY (pkey),
 KEY idx1 (skey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey,skey) VALUES (0,0),(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey,skey) VALUES (10,10),(11,11),(12,12),(13,13),(14,14),(15,15),(16,16),(17,17),(18,18),(19,19);
 INSERT INTO tbl_a (pkey,skey) VALUES (20,5),(21,6),(22,7),(23,8),(24,9),(25,10),(26,11),(27,12),(28,13),(29,14);
 
@@ -61,6 +71,11 @@ Spider_direct_aggregate	0
 SELECT count(pkey) cnt, skey FROM tbl_a;
 cnt	skey
 30	1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 SHOW STATUS LIKE 'Spider_direct_aggregate';
 Variable_name	Value
 Spider_direct_aggregate	2

storage/spider/mysql-test/spider/bugfix/r/subquery.result

@@ -10,10 +10,17 @@ create table t2 (c2 int);
 insert into t1 values (1), (2);
 insert into t2 values (0), (1), (2);
 create table t1s (c1 int) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv",TABLE "t1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 create table t2s (c2 int) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 select c1 from t1s, (select c2 from t2s where c2 > 0) t where c1 + 1 = c2;
 c1
 1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 drop table t1, t2, t1s, t2s;
 drop server srv;
 for master_1

storage/spider/mysql-test/spider/bugfix/r/sysvar_params.result

@@ -10,11 +10,17 @@ CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK",
 set session spider_read_only_mode = default;
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 1 */ insert into t1 values (42);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 drop table t1, t2;
 set session spider_read_only_mode = 1;
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 2 */ insert into t1 values (42);
 ERROR HY000: Table 'test.t1' is read only
 drop table t1, t2;
@@ -23,25 +29,37 @@ Warnings:
 Warning	138	The option value -1 (fallback to default) is deprecated and will be removed in a future release
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 3 */ insert into t1 values (42);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 drop table t1, t2;
 # Cases where table params are set
 SET session spider_read_only_mode = default;
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider COMMENT='read_only_mode "1", WRAPPER "mysql", srv "srv",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 4 */ insert into t1 values (42);
 ERROR HY000: Table 'test.t1' is read only
 drop table t1, t2;
 set session spider_read_only_mode = 1;
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider COMMENT='read_only_mode "0", WRAPPER "mysql", srv "srv",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 5 */ insert into t1 values (42);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 drop table t1, t2;
 SET session spider_read_only_mode = -1;
 Warnings:
 Warning	138	The option value -1 (fallback to default) is deprecated and will be removed in a future release
 create table t2 (c int);
 create table t1 (c int) ENGINE=Spider COMMENT='read_only_mode "1", WRAPPER "mysql", srv "",TABLE "t2"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 /* 6 */ insert into t1 values (42);
 ERROR HY000: Table 'test.t1' is read only
 drop table t1, t2;

storage/spider/mysql-test/spider/bugfix/r/udf_mysql_func_early.result

@@ -30,6 +30,8 @@ USE auto_test_local;
 CREATE TABLE tbl_a (
 a INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 create temporary table results (a int);
 SELECT SPIDER_DIRECT_SQL('select * from tbl_a', 'results', 'srv "s_2_1", database "auto_test_remote"');
 SPIDER_DIRECT_SQL('select * from tbl_a', 'results', 'srv "s_2_1", database "auto_test_remote"')

storage/spider/mysql-test/spider/bugfix/r/wrapper_mariadb.result

@@ -26,7 +26,11 @@ CREATE TABLE tbl_a (
 pkey int NOT NULL,
 PRIMARY KEY (pkey)
 ) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+Warnings:
+Warning	138	Spider table params in COMMENT or CONNECTION strings have been deprecated and will be removed in a future release. Please use table options instead.
 
 select test
 connection child2_1;