expand file path field

storage/spider/ha_spider.h

@@ -18,6 +18,7 @@
 #endif
 
 #define SPIDER_CONNECT_INFO_MAX_LEN 64
+#define SPIDER_CONNECT_INFO_PATH_MAX_LEN FN_REFLEN
 #define SPIDER_LONGLONG_LEN 20
 #define SPIDER_MAX_KEY_LENGTH 16384
 

storage/spider/mysql-test/spider/include/init_spider.inc

@@ -264,18 +264,18 @@ if (`SELECT IF($PLUGIN_VERSION = 3, 1, 0)`)
     scheme char(64) not null default '',
     host char(64) not null default '',
     port char(5) not null default '',
-    socket char(64) not null default '',
+    socket text not null default '',
     username char(64) not null default '',
     password char(64) not null default '',
-    ssl_ca char(64) default null,
-    ssl_capath char(64) default null,
-    ssl_cert char(64) default null,
+    ssl_ca text default null,
+    ssl_capath text default null,
+    ssl_cert text default null,
     ssl_cipher char(64) default null,
-    ssl_key char(64) default null,
+    ssl_key text default null,
     ssl_verify_server_cert tinyint not null default 0,
-    default_file char(64) default null,
+    default_file text default null,
     default_group char(64) default null,
-    PRIMARY KEY (data, format_id, gtrid_length, host, port, socket)
+    KEY idx1 (data, format_id, gtrid_length, host)
   ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
   DROP TABLE IF EXISTS mysql.spider_tables;
   CREATE TABLE mysql.spider_tables(
@@ -287,16 +287,16 @@ if (`SELECT IF($PLUGIN_VERSION = 3, 1, 0)`)
     scheme char(64) default null,
     host char(64) default null,
     port char(5) default null,
-    socket char(64) default null,
+    socket text default null,
     username char(64) default null,
     password char(64) default null,
-    ssl_ca char(64) default null,
-    ssl_capath char(64) default null,
-    ssl_cert char(64) default null,
+    ssl_ca text default null,
+    ssl_capath text default null,
+    ssl_cert text default null,
     ssl_cipher char(64) default null,
-    ssl_key char(64) default null,
+    ssl_key text default null,
     ssl_verify_server_cert tinyint not null default 0,
-    default_file char(64) default null,
+    default_file text default null,
     default_group char(64) default null,
     tgt_db_name char(64) default null,
     tgt_table_name char(64) default null,
@@ -314,16 +314,16 @@ if (`SELECT IF($PLUGIN_VERSION = 3, 1, 0)`)
     scheme char(64) default null,
     host char(64) default null,
     port char(5) default null,
-    socket char(64) default null,
+    socket text default null,
     username char(64) default null,
     password char(64) default null,
-    ssl_ca char(64) default null,
-    ssl_capath char(64) default null,
-    ssl_cert char(64) default null,
+    ssl_ca text default null,
+    ssl_capath text default null,
+    ssl_cert text default null,
     ssl_cipher char(64) default null,
-    ssl_key char(64) default null,
+    ssl_key text default null,
     ssl_verify_server_cert tinyint not null default 0,
-    default_file char(64) default null,
+    default_file text default null,
     default_group char(64) default null,
     PRIMARY KEY (db_name, table_name, link_id, sid)
   ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

storage/spider/spd_table.cc

@@ -2888,7 +2888,8 @@ int spider_parse_connect_info(
       DBUG_PRINT("info",
         ("spider tgt_sockets_lengths[%d] = %u", roop_count,
         share->tgt_sockets_lengths[roop_count]));
-      if (share->tgt_sockets_lengths[roop_count] > SPIDER_CONNECT_INFO_MAX_LEN)
+      if (share->tgt_sockets_lengths[roop_count] >
+        SPIDER_CONNECT_INFO_PATH_MAX_LEN)
       {
         error_num = ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_NUM;
         my_printf_error(error_num, ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_STR,
@@ -2912,7 +2913,7 @@ int spider_parse_connect_info(
         ("spider tgt_ssl_cas_lengths[%d] = %u", roop_count,
         share->tgt_ssl_cas_lengths[roop_count]));
       if (share->tgt_ssl_cas_lengths[roop_count] >
-        SPIDER_CONNECT_INFO_MAX_LEN)
+        SPIDER_CONNECT_INFO_PATH_MAX_LEN)
       {
         error_num = ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_NUM;
         my_printf_error(error_num, ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_STR,
@@ -2924,7 +2925,7 @@ int spider_parse_connect_info(
         ("spider tgt_ssl_capaths_lengths[%d] = %u", roop_count,
         share->tgt_ssl_capaths_lengths[roop_count]));
       if (share->tgt_ssl_capaths_lengths[roop_count] >
-        SPIDER_CONNECT_INFO_MAX_LEN)
+        SPIDER_CONNECT_INFO_PATH_MAX_LEN)
       {
         error_num = ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_NUM;
         my_printf_error(error_num, ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_STR,
@@ -2936,7 +2937,7 @@ int spider_parse_connect_info(
         ("spider tgt_ssl_certs_lengths[%d] = %u", roop_count,
         share->tgt_ssl_certs_lengths[roop_count]));
       if (share->tgt_ssl_certs_lengths[roop_count] >
-        SPIDER_CONNECT_INFO_MAX_LEN)
+        SPIDER_CONNECT_INFO_PATH_MAX_LEN)
       {
         error_num = ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_NUM;
         my_printf_error(error_num, ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_STR,
@@ -2960,7 +2961,7 @@ int spider_parse_connect_info(
         ("spider tgt_ssl_keys_lengths[%d] = %u", roop_count,
         share->tgt_ssl_keys_lengths[roop_count]));
       if (share->tgt_ssl_keys_lengths[roop_count] >
-        SPIDER_CONNECT_INFO_MAX_LEN)
+        SPIDER_CONNECT_INFO_PATH_MAX_LEN)
       {
         error_num = ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_NUM;
         my_printf_error(error_num, ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_STR,
@@ -2972,7 +2973,7 @@ int spider_parse_connect_info(
         ("spider tgt_default_files_lengths[%d] = %u", roop_count,
         share->tgt_default_files_lengths[roop_count]));
       if (share->tgt_default_files_lengths[roop_count] >
-        SPIDER_CONNECT_INFO_MAX_LEN)
+        SPIDER_CONNECT_INFO_PATH_MAX_LEN)
       {
         error_num = ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_NUM;
         my_printf_error(error_num, ER_SPIDER_INVALID_CONNECT_INFO_TOO_LONG_STR,