After-merge fix

This fixes up 25b91c3f

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

@@ -20,6 +20,8 @@ CREATE TABLE tbl_a (
 a INT
 ) ENGINE=Spider DEFAULT CHARSET=utf8 COMMENT='table "tbl_a", srv "s_2_1"';
 SET spider_udf_ds_use_real_table=1;
+Warnings:
+Warning	1287	'@@spider_udf_ds_use_real_table' is deprecated and will be removed in a future release
 SELECT SPIDER_DIRECT_SQL('select 1 as 1', 'tbl_a', 'srv "s_2_1"');
 ERROR 3D000: No database selected
 connection master_1;