Merge branch '11.0' into 11.1

.gitignore

@@ -187,6 +187,7 @@ sql-bench/innotest1b.pl
 sql-bench/innotest2.pl
 sql-bench/innotest2a.pl
 sql-bench/innotest2b.pl
+sql-bench/output
 sql-bench/run-all-tests.pl
 sql-bench/server-cfg.pl
 sql-bench/test-ATIS.pl

cmake/libfmt.cmake

@@ -33,8 +33,9 @@ MACRO (CHECK_LIBFMT)
      #include <fmt/format-inl.h>
      #include <iostream>
      int main() {
+       int answer= 42;
        fmt::format_args::format_arg arg=
-         fmt::detail::make_arg<fmt::format_context>(42);
+         fmt::detail::make_arg<fmt::format_context>(answer);
          std::cout << fmt::vformat(\"The answer is {}.\",
                                    fmt::format_args(&arg, 1));
      }" HAVE_SYSTEM_LIBFMT)

include/my_base.h

@@ -219,9 +219,7 @@ enum ha_extra_function {
   /** Start writing rows during ALTER TABLE...ALGORITHM=COPY. */
   HA_EXTRA_BEGIN_ALTER_COPY,
   /** Finish writing rows during ALTER TABLE...ALGORITHM=COPY. */
-  HA_EXTRA_END_ALTER_COPY,
-  /** IGNORE is being used for the insert statement */
-  HA_EXTRA_IGNORE_INSERT
+  HA_EXTRA_END_ALTER_COPY
 };
 
 /* Compatible option, to be deleted in 6.0 */

mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.cnf

@@ -4,4 +4,4 @@
 log-bin=mysqld-bin
 log-slave-updates
 binlog-format=ROW
-wsrep-replicate-myisam=ON
+wsrep_mode=REPLICATE_MYISAM

mysql-test/suite/innodb/r/insert_into_empty,4k.rdiff

@@ -0,0 +1,2 @@
+423a424
+> ERROR 42000: Row size too large (> 1982). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.

mysql-test/suite/innodb/r/insert_into_empty_notembedded.result

@@ -28,14 +28,29 @@ DROP DATABASE db1;
 #
 # End of 10.6 tests
 #
+SET foreign_key_checks=0, unique_checks=0;
 #
 # MDEV-30796  Auto_increment values not updated after bulk
 #              insert operation
 #
 CREATE TABLE t1(f1 INT NOT NULL AUTO_INCREMENT,
 f2 INT NOT NULL, PRIMARY KEY(f1))ENGINE=InnoDB;
 INSERT INTO t1 VALUES(1, 2), (25, 3), (2, 4);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` int(11) NOT NULL AUTO_INCREMENT,
+  `f2` int(11) NOT NULL,
+  PRIMARY KEY (`f1`)
+) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 # restart
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` int(11) NOT NULL AUTO_INCREMENT,
+  `f2` int(11) NOT NULL,
+  PRIMARY KEY (`f1`)
+) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1(f2) VALUES(5);
 SELECT max(f1) FROM t1;
 max(f1)

mysql-test/suite/innodb/t/insert_into_empty.test

@@ -435,6 +435,14 @@ CREATE TABLE t1 (pk int primary key, c01 text, c02 text, c03 text,
 SET GLOBAL INNODB_DEFAULT_ROW_FORMAT= COMPACT;
 --replace_result 1982 8126 4030 8126
 ALTER TABLE t1 FORCE;
+let $page_size= `SELECT @@innodb_page_size`;
+let $error_code = 0;
+
+if ($page_size == 4096) {
+ let $error_code = ER_TOO_BIG_ROWSIZE;
+}
+
+--error $error_code
 INSERT IGNORE INTO t1 VALUES
 (1, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107)),
 (2, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107));

mysql-test/suite/innodb/t/insert_into_empty_notembedded.test

@@ -42,14 +42,17 @@ DROP DATABASE db1;
 --echo # End of 10.6 tests
 --echo #
 
+SET foreign_key_checks=0, unique_checks=0;
 --echo #
 --echo # MDEV-30796  Auto_increment values not updated after bulk
 --echo #              insert operation
 --echo #
 CREATE TABLE t1(f1 INT NOT NULL AUTO_INCREMENT,
 		f2 INT NOT NULL, PRIMARY KEY(f1))ENGINE=InnoDB;
 INSERT INTO t1 VALUES(1, 2), (25, 3), (2, 4);
+SHOW CREATE TABLE t1;
 --source include/restart_mysqld.inc
+SHOW CREATE TABLE t1;
 INSERT INTO t1(f2) VALUES(5);
 SELECT max(f1) FROM t1;
 DROP TABLE t1;

plugin/hashicorp_key_management/mysql-test/vault/suite.pm

@@ -4,13 +4,13 @@ package My::Suite::Vault;
 
 use strict;
 
-return "Hashicorp Vault key management utility not found"
-  unless `sh -c "command -v vault"`;
-
 return "You need to set the value of the VAULT_ADDR variable"
   unless $ENV{VAULT_ADDR};
 
 return "You need to set the value of the VAULT_TOKEN variable"
   unless $ENV{VAULT_TOKEN};
 
+return "Hashicorp Vault key management utility not found"
+  unless `sh -c "command -v vault"`;
+
 bless {};

plugin/type_uuid/mysql-test/type_uuid/type_uuid.result

@@ -3187,3 +3187,18 @@ SELECT * FROM t1 WHERE d >= ALL (SELECT * FROM t1);
 d
 00000000-0000-0000-0000-111111111111
 DROP TABLE t1;
+#
+# MDEV-31719 Wrong result of: WHERE inet6_column IN ('','::1')
+#
+CREATE TABLE t1 (a UUID);
+INSERT INTO t1 VALUES ('00000000-0000-0000-0000-000000000000');
+SELECT * FROM t1 WHERE a IN ('','00000000-0000-0000-0000-000000000001');
+a
+Warnings:
+Warning	1292	Incorrect uuid value: ''
+SELECT * FROM t1 WHERE a='';
+a
+Warnings:
+Warning	1292	Incorrect uuid value: ''
+Warning	1292	Incorrect uuid value: ''
+DROP TABLE t1;

plugin/type_uuid/mysql-test/type_uuid/type_uuid.test

@@ -1682,3 +1682,14 @@ SELECT * FROM t1 ORDER BY d;
 SELECT * FROM t1 WHERE d <= ALL (SELECT * FROM t1);
 SELECT * FROM t1 WHERE d >= ALL (SELECT * FROM t1);
 DROP TABLE t1;
+
+
+--echo #
+--echo # MDEV-31719 Wrong result of: WHERE inet6_column IN ('','::1')
+--echo #
+
+CREATE TABLE t1 (a UUID);
+INSERT INTO t1 VALUES ('00000000-0000-0000-0000-000000000000');
+SELECT * FROM t1 WHERE a IN ('','00000000-0000-0000-0000-000000000001');
+SELECT * FROM t1 WHERE a='';
+DROP TABLE t1;

sql-bench/run-all-tests.sh

@@ -25,7 +25,7 @@
 # All options to this script is passed to all test program.
 # useful options:
 # --fast --force --lock-tables
-# --server   ==> mysql (default) / mSQL / Pg (postgres) / Solid
+# --server   ==> mariadb (default) / mysql / Pg (postgres) / Oracle
 # --user     ==> the user with permission to create / drop / select
 # --pass     ==> password for the user
 # --cmp      ==> Compare --server with one of the others (mysql/mSQL/Pg/Solid)

sql-bench/server-cfg.sh

@@ -37,7 +37,7 @@ sub get_server
 {
   my ($name,$host,$database,$odbc,$machine,$socket,$connect_options)=@_;
   my ($server);
-  if ($name =~ /mysql/i)
+  if ($name =~ /mysql/i || $name =~ /mariadb/i)
   { $server=new db_MySQL($host, $database, $machine, $socket,$connect_options); }
   elsif ($name =~ /pg/i)
   { $server= new db_Pg($host,$database); }
@@ -77,7 +77,7 @@ sub get_server
   { $server= new db_interbase($host,$database); }
   else
   {
-      die "Unknown sql server name used: $name\nUse one of: Access, Adabas, AdabasD, Empress, FrontBase, Oracle, Informix, InterBase, DB2, mSQL, Mimer, MS-SQL, MySQL, Pg, Solid, SAPDB or Sybase.\nIf the connection is done trough ODBC the name must end with _ODBC\n";
+      die "Unknown sql server name used: $name\nUse one of: Access, Adabas, AdabasD, Empress, FrontBase, Oracle, Informix, InterBase, DB2, mSQL, MariaDB, Mimer, MS-SQL, MySQL, Pg, Solid, SAPDB or Sybase.\nIf the connection is done trough ODBC the name must end with _ODBC\n";
   }
   if ($name =~ /_ODBC$/i || defined($odbc) && $odbc)
   {
@@ -98,12 +98,12 @@ sub get_server
 sub all_servers
 {
   return ["Access", "Adabas", "DB2", "Empress", "FrontBase", "Oracle",
-	  "Informix", "InterBase", "Mimer", "mSQL", "MS-SQL", "MySQL", "Pg","SAPDB",
-	  "Solid", "Sybase"];
+	  "Informix", "InterBase", "MariaDB", "Mimer", "mSQL", "MS-SQL", "MySQL",
+          "Pg","SAPDB", "Solid", "Sybase"];
 }
 
 #############################################################################
-#	     First the configuration for MySQL off course :-)
+#	     First the configuration for MariaDB / MySQL off course :-)
 #############################################################################
 
 package db_MySQL;
@@ -165,6 +165,7 @@ sub new
   $limits{'max_text_size'}	= 1000000; # Good enough for tests
   $limits{'multi_drop'}		= 1; # Drop table can take many tables
   $limits{'order_by_position'}  = 1; # Can use 'ORDER BY 1'
+  $limits{'order_by_null'}      = 1; # Can use 'ORDER BY NULL'
   $limits{'order_by_unused'}	= 1;
   $limits{'query_size'}		= 1000000; # Max size with default buffers.
   $limits{'select_without_from'}= 1; # Can do 'select 1';
@@ -224,7 +225,7 @@ sub version
   if ($sth->execute && (@row = $sth->fetchrow_array))
   {
     $row[0] =~ s/-/ /g;			# To get better tables with long names
-    $version="MySQL $row[0]";
+    $version="$row[0]";
   }
   $sth->finish;
 
@@ -283,7 +284,6 @@ sub create
   }
   foreach $field (@$fields)
   {
-#    $field =~ s/ decimal/ double(10,2)/i;
     $field =~ s/ big_decimal/ double(10,2)/i;
     $query.= $field . ',';
   }
@@ -604,12 +604,14 @@ sub new
   $self->{'transactions'}	= 1; # Transactions enabled
   $self->{"vacuum"}		= 1;
   $limits{'join_optimizer'}	= 1;		# Can optimize FROM tables
+  # load_data_infile could use function 'insert_file', but I could not get it to
+  # work because of permissions problems. Disabling for now.
   $limits{'load_data_infile'}	= 0;
-
   $limits{'NEG'}		= 1;
-  $limits{'alter_add_multi_col'}= 0;		# alter_add_multi_col ?
+  $limits{'alter_add_multi_col'}= 1;
   $limits{'alter_table'}	= 1;
-  $limits{'alter_table_dropcol'}= 0;
+  $limits{'alter_table_dropcol'}= 1;
+  $limits{'alter_table_after'}  = 0;   # Have ALTER TABLE .. AFTER other_column
   $limits{'column_alias'}	= 1;
   $limits{'func_extra_%'}	= 1;
   $limits{'func_extra_if'}	= 0;
@@ -649,29 +651,28 @@ sub new
   $limits{'working_all_fields'} = 1;
   $limits{'working_blobs'}	= 1; # If big varchar/blobs works
   $limits{'multi_distinct'}     = 1; # allows select count(distinct a),count(distinct b).. 
-
+  $limits{'insert_multi_value'} = 1; # Have INSERT ... values (1,2),(3,4)
   return $self;
 }
 
 # couldn't find the option to get the version number
 
 sub version
 {
-  my ($version,$dir);
-  $version = "PostgreSQL version ???";
-  foreach $dir ($ENV{'PGDATA'},"/usr/local/pgsql/data", "/usr/local/pg/data")
+  my ($self)=@_;
+  my ($dbh,$sth,$version,@row);
+
+  $dbh=$self->connect();
+  $sth = $dbh->prepare("select VERSION()") or die $DBI::errstr;
+  $version="PostgreSQL ?";
+  if ($sth->execute && (@row = $sth->fetchrow_array))
   {
-    if ($dir && -e "$dir/PG_VERSION")
-    {
-      $version= `cat $dir/PG_VERSION`;
-      if ($? == 0)
-      {
-	chomp($version);
-	$version .= "/ODBC" if ($self->{'data_source'} =~ /:ODBC:/);
-	return "PostgreSQL $version";
-      }
-    }
+    $row[0] =~ s/-/ /g;			# To get better tables with long names
+    $version="PostgreSQL $row[0]";
   }
+  $sth->finish;
+
+  $dbh->disconnect;
   $version .= "/ODBC" if ($self->{'data_source'} =~ /:ODBC:/);
   return $version;
 }
@@ -707,9 +708,6 @@ sub create
     $field =~ s/int\(\d*\)/int/;
     $field =~ s/float\(\d*,\d*\)/float/;
     $field =~ s/ double/ float/;
-#    $field =~ s/ decimal/ float/i;
-#    $field =~ s/ big_decimal/ float/i;
-#    $field =~ s/ date/ int/i;
     # Pg doesn't have blob, it has text instead
     $field =~ s/ blob/ text/;
     $query.= $field . ',';
@@ -718,13 +716,14 @@ sub create
   push(@queries,$query);
   foreach $index (@$index)
   {
-    $index =~ s/primary key/unique index primary_key/i;
-    if ($index =~ /^unique.*\(([^\(]*)\)$/i)
+    if ($index =~ /primary key/ || $index =~ /PRIMARY KEY/)
     {
-      # original: $indfield="using btree (" .$1.")";
-      # using btree doesn´t seem to work with Postgres anymore; it creates
-      # the table and adds the index, but it isn´t unique
-      $indfield=" (" .$1.")";	
+      $query= substr($query, 0, length($query)-1) . ", $index )";
+      next;
+    }
+    elsif ($index =~ /^unique.*\(([^\(]*)\)$/i)
+    {
+      $indfield=" (" .$1.")";
       $in="unique index";
       $table="index_$nr"; $nr++;
     }
@@ -752,52 +751,14 @@ sub insert_file {
 # Syntax:
 # copy [binary] <class_name> [with oids]
 #      {to|from} {<filename>|stdin|stdout} [using delimiters <delim>]
-  print "The ascii files aren't correct for postgres ....!!!\n";
-  $command = "copy $dbname from '$file' using delimiters ','";
+  $command = "copy $dbname from '$file' using delimiters ',' QUOTE ''''";
   print "$command\n";
   $sth = $dbh->do($command) or die $DBI::errstr;
   return $sth;
 }
 
-#
-# As postgreSQL wants A % B instead of standard mod(A,B) we have to map
-# This will not handle all cases, but as the benchmarks doesn't use functions
-# inside MOD() the following should work
-#
-# PostgreSQL cant handle count(*) or even count(1), but it can handle
-# count(1+1) sometimes. ==> this is solved in PostgreSQL 6.3
-#
-# PostgreSQL 6.5 is supporting MOD.
-
 sub query {
   my($self,$sql) = @_;
-  my(@select,$change);
-# if you use PostgreSQL 6.x and x is lower as 5 then uncomment the line below.
-#  $sql =~ s/mod\(([^,]*),([^\)]*)\)/\($1 % $2\)/gi;
-#
-# if you use PostgreSQL 6.1.x uncomment the lines below
-#  if ($sql =~ /select\s+count\(\*\)\s+from/i) {
-#  }
-#  elsif ($sql =~ /count\(\*\)/i)
-#  {
-#    if ($sql =~ /select\s+(.*)\s+from/i)
-#    {
-#      @select = split(/,/,$1);
-#      if ($select[0] =~ /(.*)\s+as\s+\w+$/i)
-#      {
-# 	$change = $1;
-#      }
-#      else
-#      {
-#	$change = $select[0];
-#      }
-#    }
-#    if (($change =~ /count/i) || ($change eq "")) {
-#      $change = "1+1";
-#    }
-#    $sql =~ s/count\(\*\)/count($change)/gi;
-#  }
-# till here.
   return $sql;
 }
 
@@ -849,10 +810,8 @@ sub vacuum
   }
   else
   {
-#    $dbh->do("vacuum pg_attributes") || die "Got error: $DBI::errstr when executing 'vacuum'\n";
-#    $dbh->do("vacuum pg_index") || die "Got error: $DBI::errstr when executing 'vacuum'\n";
-    $dbh->do("vacuum analyze") || die "Got error: $DBI::errstr when executing 'vacuum analyze'\n";
-    $dbh->do("vacuum") || die "Got error: $DBI::errstr when executing 'vacuum'\n";
+     $dbh->do("vacuum analyze") || die "Got error: $DBI::errstr when executing 'vacuum analyze'\n";
+     $dbh->do("vacuum") || die "Got error: $DBI::errstr when executing 'vacuum'\n";
   }
   $end_time=new Benchmark;
   print "Time for book-keeping (1): " .

sql-bench/test-ATIS.sh

@@ -220,7 +220,7 @@ print "Retrieving data\n";
      "select category,count(*) from aircraft where engines=2 group by category having count(*)>4",3,$limits->{'group_functions'} && $limits->{'having_with_group'},
      "select flight_number,range_miles,fare_class FROM aircraft,flight,flight_class WHERE flight.flight_code=flight_class.flight_code AND flight.aircraft_code=aircraft.aircraft_code AND range_miles<>0 AND (stops=1 OR stops=2) GROUP BY flight_number,range_miles,fare_class",150,$limits->{'group_functions'},
      "select distinct from_airport.time_zone_code,to_airport.time_zone_code,(FLOOR(arrival_time/100)*60+MOD(arrival_time,100)-FLOOR(departure_time/100)*60-MOD(departure_time,100)-time_elapsed)/60 AS time_zone_diff FROM flight,airport AS from_airport,airport AS to_airport WHERE flight.from_airport=from_airport.airport_code AND flight.to_airport=to_airport.airport_code GROUP BY from_airport.time_zone_code,to_airport.time_zone_code,arrival_time,departure_time,time_elapsed",21,$limits->{'func_odbc_mod'} && $limits->{'func_odbc_floor'} && $limits->{'group_functions'},
-     "select DISTINCT from_airport.time_zone_code,to_airport.time_zone_code,MOD((FLOOR(arrival_time/100)*60+MOD(arrival_time,100)-FLOOR(departure_time/100)*60-MOD(departure_time,100)-time_elapsed)/60+36,24)-12 AS time_zone_diff FROM flight,airport AS from_airport,airport AS to_airport WHERE flight.from_airport=from_airport.airport_code AND flight.to_airport=to_airport.airport_code and MOD((FLOOR(arrival_time/100)*60+MOD(arrival_time,100)-FLOOR(departure_time/100)*60-MOD(departure_time,100)-time_elapsed)/60+36,24)-12 < 10",14,$limits->{'func_odbc_mod'} && $limits->{'func_odbc_floor'} && $limits->{'group_functions'},
+     "select DISTINCT from_airport.time_zone_code,to_airport.time_zone_code,MOD(CAST((FLOOR(arrival_time/100)*60+MOD(arrival_time,100)-FLOOR(departure_time/100)*60-MOD(departure_time,100)-time_elapsed)/60+36 AS INTEGER),24)-12 AS time_zone_diff FROM flight,airport AS from_airport,airport AS to_airport WHERE flight.from_airport=from_airport.airport_code AND flight.to_airport=to_airport.airport_code and MOD(CAST((FLOOR(arrival_time/100)*60+MOD(arrival_time,100)-FLOOR(departure_time/100)*60-MOD(departure_time,100)-time_elapsed)/60+36 AS INTEGER),24)-12 < 10",14,$limits->{'func_odbc_mod'} && $limits->{'func_odbc_floor'} && $limits->{'group_functions'},
      "select from_airport,to_airport,range_miles,time_elapsed FROM aircraft,flight WHERE aircraft.aircraft_code=flight.aircraft_code AND to_airport NOT LIKE from_airport AND range_miles<>0 AND time_elapsed<>0 GROUP BY from_airport,to_airport,range_miles,time_elapsed",409,$limits->{'group_functions'} && $limits->{'like_with_column'},
      "SELECT airport.country_name,state.state_name,city.city_name,airport_service.direction FROM airport_service,state,airport,city WHERE airport_service.city_code=city.city_code AND airport_service.airport_code=airport.airport_code AND state.state_code=airport.state_code AND state.state_code=city.state_code AND airport.state_code=city.state_code AND airport.country_name=city.country_name AND airport.country_name=state.country_name AND city.time_zone_code=airport.time_zone_code GROUP BY airport.country_name,state.state_name,city.city_name,airport_service.direction ORDER BY state_name",11,$limits->{'group_functions'},
      "SELECT airport.country_name,state.state_name,city.city_name,airport_service.direction FROM airport_service,state,airport,city WHERE airport_service.city_code=city.city_code AND airport_service.airport_code=airport.airport_code AND state.state_code=airport.state_code AND state.state_code=city.state_code AND airport.state_code=city.state_code AND airport.country_name=city.country_name AND airport.country_name=state.country_name AND city.time_zone_code=airport.time_zone_code GROUP BY airport.country_name,state.state_name,city.city_name,airport_service.direction ORDER BY state_name DESC",11,$limits->{'group_functions'},
@@ -369,7 +369,7 @@ sub init_data
   @class_of_service=
     $server->create("class_of_service",
 		    ["class_code char(2) NOT NULL",
-		     "`rank` tinyint(2) NOT NULL",
+		     "rank tinyint(2) NOT NULL",
 		     "class_description char(80) NOT NULL"],
 		    ["PRIMARY KEY (class_code)"]);
   @code_description=