10.10 pr

.gitignore

@@ -261,7 +261,7 @@ support-files/my-innodb-heavy-4G.cnf
 support-files/my-large.cnf
 support-files/my-medium.cnf
 support-files/my-small.cnf
-support-files/mysql-log-rotate
+support-files/mariadb.logrotate
 support-files/mysql.10.0.11.spec
 support-files/mysql.server
 support-files/mysql.service

CMakeLists.txt

@@ -27,7 +27,7 @@ IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
    "None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 ENDIF()
 
-PROJECT(MySQL)
+PROJECT(MariaDB)
 
 # Remove the following comment if you don't want to have striped binaries
 # in RPM's:
@@ -88,6 +88,7 @@ ELSE()
   SET(CMAKE_CXX_STANDARD 11)
 ENDIF()
 
+# Lower case package names from PROJECT are used if not explictly upper case.
 SET(CPACK_PACKAGE_NAME "MariaDB")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB: a very fast and robust SQL database server")
 SET(CPACK_PACKAGE_URL "http://mariadb.org")

VERSION

@@ -1,4 +1,4 @@
-MYSQL_VERSION_MAJOR=10
-MYSQL_VERSION_MINOR=10
-MYSQL_VERSION_PATCH=3
-SERVER_MATURITY=stable
+MYSQL_VERSION_MAJOR=11
+MYSQL_VERSION_MINOR=0
+MYSQL_VERSION_PATCH=1
+SERVER_MATURITY=gamma

client/mysqlbinlog.cc

@@ -2394,48 +2394,11 @@ get_one_option(const struct my_option *opt, const char *argument, const char *fi
   case OPT_REWRITE_DB:    // db_from->db_to
   {
     /* See also handling of OPT_REPLICATE_REWRITE_DB in sql/mysqld.cc */
-    const char* ptr;
-    const char* key= argument;  // db-from
-    const char* val;            // db-to
-
-    // Skipp pre-space in key
-    while (*key && my_isspace(&my_charset_latin1, *key))
-      key++;
-
-    // Where val begins
-    if (!(ptr= strstr(key, "->")))
-    {
-      sql_print_error("Bad syntax in rewrite-db: missing '->'\n");
-      return 1;
-    }
-    val= ptr + 2;
-
-    // Skip blanks at the end of key
-    while (ptr > key && my_isspace(&my_charset_latin1, ptr[-1]))
-      ptr--;
-
-    if (ptr == key)
+    if (binlog_filter->add_rewrite_db(argument))
     {
-      sql_print_error("Bad syntax in rewrite-db: empty FROM db\n");
+      sql_print_error("Bad syntax in rewrite-db. Expected syntax is FROM->TO.");
       return 1;
     }
-    key= strmake_root(&glob_root, key, (size_t) (ptr-key));
-
-    /* Skipp pre space in value */
-    while (*val && my_isspace(&my_charset_latin1, *val))
-      val++;
-
-    // Value ends with \0 or space
-    for (ptr= val; *ptr && !my_isspace(&my_charset_latin1, *ptr) ; ptr++)
-    {}
-    if (ptr == val)
-    {
-      sql_print_error("Bad syntax in rewrite-db: empty TO db\n");
-      return 1;
-    }
-    val= strmake_root(&glob_root, val, (size_t) (ptr-val));
-
-    binlog_filter->add_db_rewrite(key, val);
     break;
   }
   case OPT_PRINT_ROW_COUNT:
@@ -2859,6 +2822,7 @@ static Exit_status check_master_version()
     break;
   case 5:
   case 10:
+  case 11:
     /*
       The server is soon going to send us its Format_description log
       event, unless it is a 5.0 server with 3.23 or 4.0 binlogs.
@@ -3690,7 +3654,7 @@ int main(int argc, char** argv)
     fprintf(result_file, "/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;\n");
 
     fprintf(result_file,
-	    "/*!40019 SET @@session.max_insert_delayed_threads=0*/;\n");
+	    "/*!40019 SET @@session.max_delayed_threads=0*/;\n");
 
     if (disable_log_bin)
       fprintf(result_file,