MDEV4786 - merge 10.0-monty → 10.0

sql/sql_table.cc:
  Removed false assertion that HA_NO_COPY_ON_ALTER is merge specific.
  This flag is used at least by Spider and Connect.
storage/spider/ha_spider.cc:
  Renamed THD::stmt_da -> THD::get_stmt_da().
  Renamed KEY::key_parts -> KEY::user_defined_key_parts.
  Renamed ALTER_* flags -> Alter_info::ALTER_*.
storage/spider/spd_conn.cc:
  Renamed THD::stmt_da -> THD::get_stmt_da().
storage/spider/spd_db_conn.cc:
  Renamed MYSQL_ERROR -> Sql_condition.
  Renamed KEY::key_parts -> KEY::user_defined_key_parts.
storage/spider/spd_db_include.h:
  current_comment_start argument of generate_parition_syntax()
  was removed during merge.
storage/spider/spd_db_mysql.cc:
  Renamed KEY::key_parts -> KEY::user_defined_key_parts.
storage/spider/spd_ping_table.cc:
  Renamed THD::stmt_da -> THD::get_stmt_da().
storage/spider/spd_table.cc:
  Include my_getopt.h so that it exports my_defaults_file and
  my_defaults_extra_file.
  Renamed KEY::key_parts -> KEY::user_defined_key_parts.

1 files changed, 14 insertions, 14 deletions

diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
index f2b79424ba0..b93c49be130 100644
--- a/storage/spider/ha_spider.cc
+++ b/storage/spider/ha_spider.cc
@@ -7840,7 +7840,7 @@ int ha_spider::info(
                       thd->main_da.message());
 #else
                     strmov(spider_init_error_table->init_error_msg,
-                      thd->stmt_da->message());
+                      thd->get_stmt_da()->message());
 #endif
                   spider_init_error_table->init_error_time =
                     (time_t) time((time_t*) 0);
@@ -8066,7 +8066,7 @@ ha_rows ha_spider::records_in_range(
                       thd->main_da.message());
 #else
                     strmov(spider_init_error_table->init_error_msg,
-                      thd->stmt_da->message());
+                      thd->get_stmt_da()->message());
 #endif
                   spider_init_error_table->init_error_time =
                     (time_t) time((time_t*) 0);
@@ -8110,7 +8110,7 @@ ha_rows ha_spider::records_in_range(
 
     KEY *key_info = &table->key_info[inx];
     key_part_map full_key_part_map =
-      make_prev_keypart_map(key_info->key_parts);
+      make_prev_keypart_map(key_info->user_defined_key_parts);
     key_part_map start_key_part_map;
     key_part_map end_key_part_map;
     key_part_map tgt_key_part_map;
@@ -8308,7 +8308,7 @@ int ha_spider::check_crd()
                     thd->main_da.message());
 #else
                   strmov(spider_init_error_table->init_error_msg,
-                    thd->stmt_da->message());
+                    thd->get_stmt_da()->message());
 #endif
                 spider_init_error_table->init_error_time =
                   (time_t) time((time_t*) 0);
@@ -9726,9 +9726,9 @@ int ha_spider::create(
     if (
       (thd->lex->alter_info.flags &
         (
-          ALTER_ADD_PARTITION | ALTER_DROP_PARTITION |
-          ALTER_COALESCE_PARTITION | ALTER_REORGANIZE_PARTITION |
-          ALTER_TABLE_REORG | ALTER_REBUILD_PARTITION
+          Alter_info::ALTER_ADD_PARTITION | Alter_info::ALTER_DROP_PARTITION |
+          Alter_info::ALTER_COALESCE_PARTITION | Alter_info::ALTER_REORGANIZE_PARTITION |
+          Alter_info::ALTER_TABLE_REORG | Alter_info::ALTER_REBUILD_PARTITION
         )
       ) &&
       memcmp(name + strlen(name) - 5, "#TMP#", 5)
@@ -9873,9 +9873,9 @@ int ha_spider::rename_table(
     if (
       (thd->lex->alter_info.flags &
         (
-          ALTER_ADD_PARTITION | ALTER_DROP_PARTITION |
-          ALTER_COALESCE_PARTITION | ALTER_REORGANIZE_PARTITION |
-          ALTER_TABLE_REORG | ALTER_REBUILD_PARTITION
+          Alter_info::ALTER_ADD_PARTITION | Alter_info::ALTER_DROP_PARTITION |
+          Alter_info::ALTER_COALESCE_PARTITION | Alter_info::ALTER_REORGANIZE_PARTITION |
+          Alter_info::ALTER_TABLE_REORG | Alter_info::ALTER_REBUILD_PARTITION
         )
       )
     )
@@ -10000,9 +10000,9 @@ int ha_spider::delete_table(
       sql_command == SQLCOM_ALTER_TABLE &&
       (thd->lex->alter_info.flags &
         (
-          ALTER_ADD_PARTITION | ALTER_DROP_PARTITION |
-          ALTER_COALESCE_PARTITION | ALTER_REORGANIZE_PARTITION |
-          ALTER_TABLE_REORG | ALTER_REBUILD_PARTITION
+          Alter_info::ALTER_ADD_PARTITION | Alter_info::ALTER_DROP_PARTITION |
+          Alter_info::ALTER_COALESCE_PARTITION | Alter_info::ALTER_REORGANIZE_PARTITION |
+          Alter_info::ALTER_TABLE_REORG | Alter_info::ALTER_REBUILD_PARTITION
         )
       )
     )
@@ -10614,7 +10614,7 @@ void ha_spider::set_select_column_mode()
           /* need primary key columns */
           key_info = &table_share->key_info[table_share->primary_key];
           key_part = key_info->key_part;
-          for (roop_count = 0; roop_count < (int) key_info->key_parts;
+          for (roop_count = 0; roop_count < (int) key_info->user_defined_key_parts;
             roop_count++)
           {
             field = key_part[roop_count].field;