Merge branch '11.7' into 11.8

Author: vuvova

CMakeLists.txt

@@ -501,7 +501,9 @@ IF(UNIX)
   ADD_SUBDIRECTORY(man)
 ENDIF()
 
-INCLUDE(cmake/abi_check.cmake)
+IF (NOT WITHOUT_ABI_CHECK)
+    INCLUDE(cmake/abi_check.cmake)
+ENDIF()
 INCLUDE(cmake/tags.cmake)
 INCLUDE(for_clients)
 ADD_SUBDIRECTORY(scripts)

VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=11
 MYSQL_VERSION_MINOR=8
-MYSQL_VERSION_PATCH=0
-SERVER_MATURITY=alpha
+MYSQL_VERSION_PATCH=1
+SERVER_MATURITY=gamma

client/mysqlbinlog.cc

@@ -43,11 +43,6 @@
 #include "sql_priv.h"
 #include "sql_basic_types.h"
 #include <atomic>
-#if 0 /* FIXME: the following is broken for now */
-# include "mariadb_rpl.h"
-#else
-enum Item_result {STRING_RESULT,REAL_RESULT,INT_RESULT,ROW_RESULT,DECIMAL_RESULT};
-#endif
 #include "log_event.h"
 #include "compat56.h"
 #include "sql_common.h"
@@ -165,7 +160,9 @@ static Server_gtid_event_filter *server_id_gtid_filter= NULL;
 
 static char *start_datetime_str, *stop_datetime_str;
 static my_time_t start_datetime= 0, stop_datetime= 0;
+static my_time_t last_processed_datetime= MY_TIME_T_MAX;
 static bool stop_datetime_given= false;
+
 static ulonglong rec_count= 0;
 static MYSQL* mysql = NULL;
 static const char* dirname_for_local_load= 0;
@@ -871,6 +868,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
   DBUG_ENTER("process_event");
   Exit_status retval= OK_CONTINUE;
   IO_CACHE *const head= &print_event_info->head_cache;
+  my_time_t ev_when= ev->when;
 
   /*
     We use Gtid_list_log_event information to determine if there is missing
@@ -1371,6 +1369,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
 end:
   rec_count++;
 end_skip_count:
+  last_processed_datetime= ev_when;
 
   DBUG_PRINT("info", ("end event processing"));
   /*
@@ -2935,6 +2934,7 @@ static Exit_status check_header(IO_CACHE* file,
   uchar buf[PROBE_HEADER_LEN];
   my_off_t tmp_pos, pos;
   MY_STAT my_file_stat;
+  int read_error;
 
   delete glob_description_event;
   if (!(glob_description_event= new Format_description_log_event(4)))
@@ -3017,7 +3017,8 @@ static Exit_status check_header(IO_CACHE* file,
         Format_description_log_event *new_description_event;
         my_b_seek(file, tmp_pos); /* seek back to event's start */
         if (!(new_description_event= (Format_description_log_event*) 
-              Log_event::read_log_event(file, glob_description_event,
+              Log_event::read_log_event(file, &read_error,
+                                        glob_description_event,
                                         opt_verify_binlog_checksum)))
           /* EOF can't be hit here normally, so it's a real error */
         {
@@ -3050,7 +3051,8 @@ static Exit_status check_header(IO_CACHE* file,
       {
         Log_event *ev;
         my_b_seek(file, tmp_pos); /* seek back to event's start */
-        if (!(ev= Log_event::read_log_event(file, glob_description_event,
+        if (!(ev= Log_event::read_log_event(file, &read_error,
+                                            glob_description_event,
                                             opt_verify_binlog_checksum)))
         {
           /* EOF can't be hit here normally, so it's a real error */
@@ -3090,7 +3092,6 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
   IO_CACHE cache,*file= &cache;
   uchar tmp_buff[BIN_LOG_HEADER_SIZE];
   Exit_status retval= OK_CONTINUE;
-  my_time_t last_ev_when= MY_TIME_T_MAX;
 
   if (logname && strcmp(logname, "-") != 0)
   {
@@ -3164,8 +3165,10 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
   {
     char llbuff[21];
     my_off_t old_off = my_b_tell(file);
+    int read_error;
 
-    Log_event* ev = Log_event::read_log_event(file, glob_description_event,
+    Log_event* ev = Log_event::read_log_event(file, &read_error,
+                                              glob_description_event,
                                               opt_verify_binlog_checksum);
     if (!ev)
     {
@@ -3174,15 +3177,15 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
         about a corruption, but treat it as EOF and move to the next binlog.
       */
       if (glob_description_event->flags & LOG_EVENT_BINLOG_IN_USE_F)
-        file->error= 0;
-      else if (file->error)
+        read_error= 0;
+      else if (read_error)
       {
         error("Could not read entry at offset %s: "
               "Error in log format or read error.",
               llstr(old_off,llbuff));
         goto err;
       }
-      // else file->error == 0 means EOF, that's OK, we break in this case
+      // else read_error == 0 means EOF, that's OK, we break in this case
 
       /*
         Emit a warning in the event that we finished processing input
@@ -3196,21 +3199,8 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
                   "end of input", stop_position);
       }
 
-      /*
-        Emit a warning in the event that we finished processing input
-        before reaching the boundary indicated by --stop-datetime.
-      */
-      if (stop_datetime_given &&
-          stop_datetime > last_ev_when)
-      {
-          retval = OK_STOP;
-          warning("Did not reach stop datetime '%s' "
-                  "before end of input", stop_datetime_str);
-      }
-
       goto end;
     }
-    last_ev_when= ev->when;
     if ((retval= process_event(print_event_info, ev, old_off, logname)) !=
         OK_CONTINUE)
       goto end;
@@ -3389,6 +3379,10 @@ int main(int argc, char** argv)
     start_position= BIN_LOG_HEADER_SIZE;
   }
 
+  if (stop_datetime_given && stop_datetime > last_processed_datetime)
+    warning("Did not reach stop datetime '%s' before end of input",
+            stop_datetime_str);
+
   /*
     If enable flashback, need to print the events from the end to the
     beginning

client/mysqldump.cc

@@ -103,6 +103,9 @@
 #define DUMP_TABLE_TABLE 0
 #define DUMP_TABLE_SEQUENCE 1
 
+/* until MDEV-35831 is implemented, we'll have to detect VECTOR by name */
+#define MYSQL_TYPE_VECTOR "V"
+
 static my_bool ignore_table_data(const uchar *hash_key, size_t len);
 static void add_load_option(DYNAMIC_STRING *str, const char *option,
                              const char *option_value);
@@ -147,7 +150,7 @@ static my_bool insert_pat_inited= 0, debug_info_flag= 0, debug_check_flag= 0,
 static ulong opt_max_allowed_packet, opt_net_buffer_length;
 static double opt_max_statement_time= 0.0;
 static MYSQL *mysql=0;
-static DYNAMIC_STRING insert_pat, select_field_names,
+static DYNAMIC_STRING insert_pat, select_field_names, field_flags,
                       select_field_names_for_header, insert_field_names;
 static char  *opt_password=0,*current_user=0,
              *current_host=0,*path=0,*fields_terminated=0,
@@ -2009,6 +2012,7 @@ static void free_resources()
   dynstr_free(&dynamic_where);
   dynstr_free(&insert_pat);
   dynstr_free(&select_field_names);
+  dynstr_free(&field_flags);
   dynstr_free(&select_field_names_for_header);
   dynstr_free(&insert_field_names);
   if (defaults_argv)
@@ -3181,13 +3185,15 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
   {
     select_field_names_inited= 1;
     init_dynamic_string_checked(&select_field_names, "", 1024, 1024);
+    init_dynamic_string_checked(&field_flags, "", 1024, 1024);
     init_dynamic_string_checked(&insert_field_names, "", 1024, 1024);
     if (opt_header)
       init_dynamic_string_checked(&select_field_names_for_header, "", 1024, 1024);
   }
   else
   {
     dynstr_set_checked(&select_field_names, "");
+    dynstr_set_checked(&field_flags, "");
     dynstr_set_checked(&insert_field_names, "");
     if (opt_header)
       dynstr_set_checked(&select_field_names_for_header, "");
@@ -3355,7 +3361,7 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
 
           fprintf(sql_file,
                   "SET @saved_cs_client     = @@character_set_client;\n"
-                  "SET character_set_client = utf8;\n"
+                  "SET character_set_client = utf8mb4;\n"
                   "/*!50001 CREATE VIEW %s AS SELECT\n",
                   result_table);
 
@@ -3423,7 +3429,7 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
       {
         fprintf(sql_file,
                 "/*!40101 SET @saved_cs_client     = @@character_set_client */;\n"
-                "/*!40101 SET character_set_client = utf8 */;\n"
+                "/*!40101 SET character_set_client = utf8mb4 */;\n"
                 "%s%s;\n"
                 "/*!40101 SET character_set_client = @saved_cs_client */;\n",
                 is_log_table ? "CREATE TABLE IF NOT EXISTS " : "",
@@ -3489,6 +3495,11 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
       if (opt_header)
         dynstr_append_checked(&select_field_names_for_header,
                               quote_for_equal(row[0], name_buff));
+      /* VECTOR doesn't have a type code yet, must be detected by name */
+      if (row[3] && strcmp(row[3], "vector") == 0)
+        dynstr_append_checked(&field_flags, MYSQL_TYPE_VECTOR);
+      else
+        dynstr_append_checked(&field_flags, " ");
     }
 
     if (vers_hidden)
@@ -3502,6 +3513,7 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
                             "row_end" :
                             "row_end");
       dynstr_append_checked(&insert_field_names, ", row_start, row_end");
+      dynstr_append_checked(&field_flags, "  ");
     }
 
     /*
@@ -3608,6 +3620,11 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
     while ((row= mysql_fetch_row(result)))
     {
       ulong *lengths= mysql_fetch_lengths(result);
+      /* VECTOR doesn't have a type code yet, must be detected by name */
+      if (strncmp(row[SHOW_TYPE], STRING_WITH_LEN("vector(")) == 0)
+        dynstr_append_checked(&field_flags, MYSQL_TYPE_VECTOR);
+      else
+        dynstr_append_checked(&field_flags, " ");
       if (init)
       {
         if (!opt_xml && !opt_no_create_info)
@@ -4491,21 +4508,23 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
                       "Not enough fields from table %s! Aborting.\n",
                       result_table);
 
+        DBUG_ASSERT(field_flags.length > i);
         /*
            63 is my_charset_bin. If charsetnr is not 63,
            we have not a BLOB but a TEXT column.
            we'll dump in hex only BLOB columns.
         */
-        is_blob= (opt_hex_blob && field->charsetnr == 63 &&
-                  (field->type == MYSQL_TYPE_BIT ||
-                   field->type == MYSQL_TYPE_STRING ||
-                   field->type == MYSQL_TYPE_VAR_STRING ||
-                   field->type == MYSQL_TYPE_VARCHAR ||
-                   field->type == MYSQL_TYPE_BLOB ||
-                   field->type == MYSQL_TYPE_LONG_BLOB ||
-                   field->type == MYSQL_TYPE_MEDIUM_BLOB ||
-                   field->type == MYSQL_TYPE_TINY_BLOB ||
-                   field->type == MYSQL_TYPE_GEOMETRY)) ? 1 : 0;
+        is_blob= field->type == MYSQL_TYPE_GEOMETRY ||
+                 field->type == MYSQL_TYPE_BIT ||
+                 field_flags.str[i] == MYSQL_TYPE_VECTOR[0] ||
+                 (opt_hex_blob && field->charsetnr == 63 &&
+                   (field->type == MYSQL_TYPE_STRING ||
+                    field->type == MYSQL_TYPE_VAR_STRING ||
+                    field->type == MYSQL_TYPE_VARCHAR ||
+                    field->type == MYSQL_TYPE_BLOB ||
+                    field->type == MYSQL_TYPE_LONG_BLOB ||
+                    field->type == MYSQL_TYPE_MEDIUM_BLOB ||
+                    field->type == MYSQL_TYPE_TINY_BLOB));
         if (extended_insert && !opt_xml)
         {
           if (i == 0)
@@ -4528,7 +4547,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
                   Also we need to reserve 1 byte for terminating '\0'.
                 */
                 dynstr_realloc_checked(&extended_row,length * 2 + 2 + 1);
-                if (opt_hex_blob && is_blob)
+                if (is_blob)
                 {
                   dynstr_append_checked(&extended_row, "0x");
                   extended_row.length+= mysql_hex_string(extended_row.str +
@@ -4589,7 +4608,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
             {
               if (opt_xml)
               {
-                if (opt_hex_blob && is_blob && length)
+                if (is_blob && length)
                 {
                   /* Define xsi:type="xs:hexBinary" for hex encoded data */
                   print_xml_tag(md_result_file, "\t\t", "", "field", "name=",
@@ -4604,7 +4623,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
                 }
                 fputs("</field>\n", md_result_file);
               }
-              else if (opt_hex_blob && is_blob && length)
+              else if (is_blob && length)
               {
                 fputs("0x", md_result_file);
                 print_blob_as_hex(md_result_file, row[i], length);