Merge 10.4 into 10.5

Author: dr-m

client/mysql.cc

@@ -1287,8 +1287,8 @@ sig_handler mysql_end(int sig)
 {
 #ifndef _WIN32
  /*
- Ingnoring SIGQUIT and SIGINT signals when cleanup process starts.
- This will help in resolving the double free issues, which occures in case
+ Ignoring SIGQUIT and SIGINT signals when cleanup process starts.
+ This will help in resolving the double free issues, which occurs in case
  the signal handler function is started in between the clean up function.
  */
  signal(SIGQUIT, SIG_IGN);
@@ -4720,7 +4720,7 @@ sql_real_connect(char *host,char *database,char *user,char *password,
  /*
  CLIENT_PROGRESS_OBSOLETE is set only if we requested it in
  mysql_real_connect() and the server also supports it
- */
+*/
  if (mysql.client_flag & CLIENT_PROGRESS_OBSOLETE)
  mysql_options(&mysql, MYSQL_PROGRESS_CALLBACK, (void*) report_progress);
 #else
@@ -4789,7 +4789,7 @@ com_status(String *buffer __attribute__((unused)),
  tee_fprintf(stdout, "\nConnection id:\t\t%lu\n",mysql_thread_id(&mysql));
  /*
  Don't remove "limit 1",
- it is protection againts SQL_SELECT_LIMIT=0
+ it is protection against SQL_SELECT_LIMIT=0
  */
  if (!mysql_store_result_for_lazy(&result))
  {
@@ -5138,7 +5138,7 @@ static const char *construct_prompt()
  time_t lclock = time(NULL);// Get the date struct
  struct tm *t = localtime(&lclock);
 
- /* parse thru the settings for the prompt */
+ /* parse through the settings for the prompt */
  for (char *c = current_prompt; *c ; c++)
  {
  if (*c != PROMPT_CHAR)

client/mysql_plugin.c

@@ -1024,7 +1024,7 @@ static int find_plugin(char *tp_path)
 
 
 /**
- Build the boostrap file.
+ Build the bootstrap file.
  
  Create a new file and populate it with SQL commands to ENABLE or DISABLE
  the plugin via REPLACE and DELETE operations on the mysql.plugin table.
@@ -1153,7 +1153,7 @@ static int dump_bootstrap_file(char *bootstrap_file)
  
  Create a command line sequence to launch mysqld in bootstrap mode. This
  will allow mysqld to launch a minimal server instance to read and
- execute SQL commands from a file piped in (the boostrap file). We use
+ execute SQL commands from a file piped in (the bootstrap file). We use
  the --no-defaults option to skip reading values from the config file.
 
  The bootstrap mode skips loading of plugins and many other subsystems.

client/mysqlbinlog.cc

@@ -753,7 +753,7 @@ static bool shall_skip_database(const char *log_dbname)
 /**
  Print "use <db>" statement when current db is to be changed.
 
- We have to control emiting USE statements according to rewrite-db options.
+ We have to control emitting USE statements according to rewrite-db options.
  We have to do it here (see process_event() below) and to suppress
  producing USE statements by corresponding log event print-functions.
 */
@@ -785,7 +785,7 @@ print_use_stmt(PRINT_EVENT_INFO* pinfo, const Query_log_event *ev)
  // In case of rewrite rule print USE statement for db_to
  my_fprintf(result_file, "use %`s%s\n", db_to, pinfo->delimiter);
 
- // Copy the *original* db to pinfo to suppress emiting
+ // Copy the *original* db to pinfo to suppress emitting
  // of USE stmts by log_event print-functions.
  memcpy(pinfo->db, db, db_len + 1);
 }

client/mysqldump.c

@@ -147,7 +147,7 @@ static char * opt_mysql_unix_port=0;
 static int first_error=0;
 /*
  multi_source is 0 if old server or 2 if server that support multi source 
- This is choosen this was as multi_source has 2 extra columns first in
+ This is chosen this was as multi_source has 2 extra columns first in
  SHOW ALL SLAVES STATUS.
 */
 static uint multi_source= 0;
@@ -2075,7 +2075,7 @@ static void print_xml_tag(FILE * xml_file, const char* sbeg,
  <stag_atr="sval" xsi:nil="true"/>
  NOTE
  sval MUST be a NULL terminated string.
- sval string will be qouted before output.
+ sval string will be quoted before output.
 */
 
 static void print_xml_null_tag(FILE * xml_file, const char* sbeg,
@@ -2147,7 +2147,7 @@ static void print_xml_cdata(FILE *xml_file, const char *str, ulong len)
  Print tag with many attribute to the xml_file. Format is:
  \t\t<row_name Atr1="Val1" Atr2="Val2"... />
  NOTE
- All atributes and values will be quoted before output.
+ All attributes and values will be quoted before output.
 */
 
 static void print_xml_row(FILE *xml_file, const char *row_name,
@@ -2632,7 +2632,7 @@ static uint dump_routines_for_db(char *db)
  print_comment(sql_file, 1,
  "-- does %s have permissions on mysql.proc?\n\n",
  fix_for_comment(current_user));
- maybe_die(EX_MYSQLERR,"%s has insufficent privileges to %s!",
+ maybe_die(EX_MYSQLERR,"%s has insufficient privileges to %s!",
  current_user, query_buff);
  }
  else if (strlen(row[2]))
@@ -4187,7 +4187,7 @@ static void dump_table(char *table, char *db, const uchar *hash_key, size_t len)
  }
  }
 
- /* XML - close table tag and supress regular output */
+ /* XML - close table tag and suppress regular output */
  if (opt_xml)
  fputs("\t</table_data>\n", md_result_file);
  else if (extended_insert && row_break)

client/mysqlimport.c

@@ -581,7 +581,7 @@ static char *field_escape(char *to,const char *from,uint length)
  else 
  {
  if (*from == '\'' && !end_backslashes)
-*to++= *from; /* We want a dublicate of "'" for MySQL */
+*to++= *from; /* We want a duplicate of "'" for MySQL */
  end_backslashes=0;
  }
  }

client/mysqlslap.c

@@ -2283,7 +2283,7 @@ slap_connect(MYSQL *mysql)
  opt_mysql_unix_port,
  connect_flags))
  {
- /* Connect suceeded */
+ /* Connect succeeded */
  connect_error= 0;
  break;
  }

client/mysqltest.cc

@@ -146,7 +146,7 @@ struct property {
  my_bool *var;/* Actual variable */
  my_bool set;/* Has been set for ONE command */
  my_bool old;/* If set, thus is the old value */
- my_bool reverse;/* Varible is true if disabled */
+ my_bool reverse;/* Variable is true if disabled */
  const char *env_name;/* Env. variable name */
 };
 
@@ -566,7 +566,7 @@ DYNAMIC_ARRAY regex_arr; /* stores a list of st_regex subsitutions */
 Temporary storage areas for substitutions. To reduce unnessary copying
 and memory freeing/allocation, we pre-allocate two buffers, and alternate
 their use, one for input/one for output, the roles changing on the next
-st_regex substition. At the end of substitutions buf points to the
+st_regex substitution. At the end of substitutions buf points to the
 one containing the final result.
 */
 char* buf;
@@ -3095,7 +3095,7 @@ void open_file(const char *name)
  strxnmov(buff, sizeof(buff), opt_overlay_dir, suffix, name, NullS);
 
  /*
- Overlayed rty/include/thing.inc can contain the line
+ Overlaid rty/include/thing.inc can contain the line
  --source thing.inc
  which would mean to include qwe/include/thing.inc.
  But it looks like including "itself", so don't try to open the file,
@@ -4803,7 +4803,7 @@ int do_save_master_pos()
 mysql_errno(mysql), mysql_error(mysql));
 
  if (!(res = mysql_store_result(mysql)))
- die("mysql_store_result() retuned NULL for '%s'", query);
+ die("mysql_store_result() returned NULL for '%s'", query);
  if (!(row = mysql_fetch_row(res)))
  die("empty result in show master status");
  strnmov(master_pos.file, row[0], sizeof(master_pos.file)-1);
@@ -5350,7 +5350,7 @@ void do_get_errcodes(struct st_command *command)
  p++;
  }
 
- /* Convert the sting to int */
+ /* Convert the string to int */
  if (!str2int(start, 10, (long) INT_MIN, (long) INT_MAX, &val))
 die("Invalid argument to error: '%s'", command->first_argument);
 
@@ -5742,7 +5742,7 @@ int connect_n_handle_errors(struct st_command *command,
  dynstr_append_mem(ds, delimiter, delimiter_length);
  dynstr_append_mem(ds, "\n", 1);
  }
- /* Simlified logging if enabled */
+ /* Simplified logging if enabled */
  if (!disable_connect_log && !disable_query_log)
  {
  replace_dynstr_append(ds, command->query);
@@ -8219,7 +8219,7 @@ void handle_no_error(struct st_command *command)
  SYNPOSIS
  run_query_stmt
  mysql - mysql handle
- command - currrent command pointer
+ command - current command pointer
  query - query string to execute
  query_len - length query string to execute
  ds - output buffer where to store result form query
@@ -8459,7 +8459,7 @@ void run_query_stmt(struct st_connection *cn, struct st_command *command,
 /*
  Create a util connection if one does not already exists
  and use that to run the query
- This is done to avoid implict commit when creating/dropping objects such
+ This is done to avoid implicit commit when creating/dropping objects such
  as view, sp etc.
 */
 
@@ -8500,7 +8500,7 @@ int util_query(MYSQL* org_mysql, const char* query){
  SYNPOSIS
  run_query()
  mysql	mysql handle
- commandcurrrent command pointer
+ commandcurrent command pointer
 
  flags control the phased/stages of query execution to be performed
  if QUERY_SEND_FLAG bit is on, the query will be sent. If QUERY_REAP_FLAG
@@ -10257,7 +10257,7 @@ int multi_reg_replace(struct st_replace_regex* r,char* val)
  if (!reg_replace(&out_buf, buf_len_p, re.pattern, re.replace,
  in_buf, re.icase))
  {
- /* if the buffer has been reallocated, make adjustements */
+ /* if the buffer has been reallocated, make adjustments */
  if (save_out_buf != out_buf)
  {
  if (save_out_buf == r->even_buf)
@@ -10524,7 +10524,7 @@ typedef struct st_rep_set {
  uint	found_len;/* Best match to date */
  intfound_offset;
  uint	table_offset;
- uint	size_of_bits;/* For convinience */
+ uint	size_of_bits;/* For convenience */
 } REP_SET;
 
 typedef struct st_rep_sets {
@@ -10627,7 +10627,7 @@ REPLACE *init_replace(char * *from, char * *to,uint count,
  DBUG_RETURN(0);
  }
  (void) make_new_set(&sets);/* Set starting set */
- make_sets_invisible(&sets);/* Hide previus sets */
+ make_sets_invisible(&sets);/* Hide previous sets */
  used_sets=-1;
  word_states=make_new_set(&sets);/* Start of new word */
  start_states=make_new_set(&sets);/* This is first state */

mysql-test/main/ctype_utf32_uca.result

@@ -7921,3 +7921,21 @@ SET NAMES utf8;
 #
 # End of 10.2 tests
 #
+#
+# Start of 10.4 tests
+#
+#
+# MDEV-22499 Assertion `(uint) (table_check_constraints - share->check_constraints) == (uint) (share->table_check_constraints - share->field_check_constraints)' failed in TABLE_SHARE::init_from_binary_frm_image
+#
+SET @@SESSION.collation_connection=utf32_estonian_ci;
+CREATE TABLE t1(c1 SET('a') COLLATE 'Binary',c2 JSON);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+ `c1` set('\0\0\0a') CHARACTER SET binary DEFAULT NULL,
+ `c2` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`c2`))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
+#
+# End of 10.4 tests
+#

mysql-test/main/ctype_utf32_uca.test

@@ -268,3 +268,21 @@ SET NAMES utf8;
 --echo #
 --echo # End of 10.2 tests
 --echo #
+
+
+--echo #
+--echo # Start of 10.4 tests
+--echo #
+
+--echo #
+--echo # MDEV-22499 Assertion `(uint) (table_check_constraints - share->check_constraints) == (uint) (share->table_check_constraints - share->field_check_constraints)' failed in TABLE_SHARE::init_from_binary_frm_image
+--echo #
+
+SET @@SESSION.collation_connection=utf32_estonian_ci;
+CREATE TABLE t1(c1 SET('a') COLLATE 'Binary',c2 JSON);
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.4 tests
+--echo #

mysql-test/main/func_math.result

@@ -2251,6 +2251,36 @@ SELECT ROUND( i, 18446744073709551594 ) AS f FROM t1;
 f
 DROP TABLE t1;
 #
+# MDEV-22268 virtual longlong Item_func_div::int_op(): Assertion `0' failed in Item_func_div::int_op
+#
+SET sql_mode='';
+SET @@SESSION.div_precision_increment=0;
+SELECT UTC_TIME / 0;
+UTC_TIME / 0
+NULL
+SELECT TIMESTAMP'2001-01-01 00:00:00'/0;
+TIMESTAMP'2001-01-01 00:00:00'/0
+NULL
+SELECT TIME'00:00:00'/0;
+TIME'00:00:00'/0
+NULL
+CREATE TABLE t1 AS SELECT
+UTC_TIME / 0 AS c1,
+TIMESTAMP'2001-01-01 00:00:00'/0 AS c3,
+TIME'00:00:00'/0 AS c4;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+ `c1` decimal(7,0) DEFAULT NULL,
+ `c3` decimal(14,0) DEFAULT NULL,
+ `c4` decimal(7,0) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
+SELECT(-0 * MOD((UTC_TIME / -0)MOD (ATAN('<img src_x0=x onerror="javascript:alert(0)">') MOD COT(0)),-0)) MOD (0 DIV 0);
+ERROR 22003: DOUBLE value is out of range in 'cot(0)'
+SET @@SESSION.div_precision_increment=DEFAULT;
+SET sql_mode=DEFAULT;
+#
 # End of 10.3 tests
 #
 #