Merge 10.5 into 10.6

Author: dr-m

.gitignore

@@ -197,11 +197,12 @@ sql/lex_hash.h
 sql/mysql_tzinfo_to_sql
 sql/mysqld
 sql/sql_builtin.cc
-sql/sql_yacc.cc
-sql/sql_yacc.hh
-sql/sql_yacc_ora.cc
-sql/sql_yacc_ora.hh
-sql/sql_yacc_ora.yy
+sql/yy_mariadb.cc
+sql/yy_mariadb.hh
+sql/yy_mariadb.yy
+sql/yy_oracle.cc
+sql/yy_oracle.hh
+sql/yy_oracle.yy
 storage/heap/hp_test1
 storage/heap/hp_test2
 storage/maria/aria_chk

cmake/make_dist.cmake.in

@@ -125,15 +125,15 @@ IF(NOT GIT_EXECUTABLE)
 ENDIF()
 
 # Copy bison output
-CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.hh 
-   ${PACKAGE_DIR}/sql/sql_yacc.hh COPYONLY)
-CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
-   ${PACKAGE_DIR}/sql/sql_yacc.cc COPYONLY)
+CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/yy_mariadb.hh
+   ${PACKAGE_DIR}/sql/yy_mariadb.hh COPYONLY)
+CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/yy_mariadb.cc
+   ${PACKAGE_DIR}/sql/yy_mariadb.cc COPYONLY)
 # Copy bison output
-CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.hh
-   ${PACKAGE_DIR}/sql/sql_yacc_ora.hh COPYONLY)
-CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.cc
-   ${PACKAGE_DIR}/sql/sql_yacc_ora.cc COPYONLY)
+CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/yy_oracle.hh
+   ${PACKAGE_DIR}/sql/yy_oracle.hh COPYONLY)
+CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/yy_oracle.cc
+   ${PACKAGE_DIR}/sql/yy_oracle.cc COPYONLY)
 
 # Add documentation, if user has specified where to find them
 IF(MYSQL_DOCS_LOCATION)

cmake/os/WindowsCache.cmake

@@ -321,6 +321,7 @@ SET(HAVE_SNAPPY_H CACHE INTERNAL "")
 SET(HAVE_SCHED_GETCPU CACHE INTERNAL "")
 SET(HAVE_PTHREAD_THREADID_NP CACHE INTERNAL "")
 SET(HAVE_SYS_GETTID CACHE INTERNAL "")
+SET(HAVE_GETTID CACHE INTERNAL "")
 SET(HAVE_INTEGER_PTHREAD_SELF CACHE INTERNAL "")
 SET(HAVE_PTHREAD_GETTHREADID_NP CACHE INTERNAL "")
 SET(HAVE_TIMER_DELETE CACHE INTERNAL "")

debian/additions/innotop/innotop

@@ -466,7 +466,7 @@ sub parse_status_text {
    # too many locks to print, the output might be truncated)
 
    my $time_text;
-   if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[012]\./) ) {
+   if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) {
       ( $time_text ) = $fulltext =~ m/^([0-9-]* [0-9:]*) [0-9a-fx]* INNODB MONITOR OUTPUT/m;
       $innodb_data{'ts'} = [ parse_innodb_timestamp_56( $time_text ) ];
    } else {
@@ -634,7 +634,7 @@ sub parse_fk_section {
    return 0 unless $fulltext;
 
    my ( $ts, $type );
-   if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10.[012]\./) ) {
+   if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10.[0-9]\./) ) {
       ( $ts, $type ) = $fulltext =~ m/^([0-9-]* [0-9:]*)\s[0-9a-fx]*\s+(\w+)/m;
       $section->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
    } else {
@@ -894,7 +894,7 @@ sub parse_dl_section {
    my ( $ts ) = $fulltext =~ m/^$s$/m;
    return 0 unless $ts;
 
-   if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[012]\./) ) {
+   if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) {
       $dl->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
    }
    else {
@@ -12065,7 +12065,7 @@ This data is from the TRANSACTIONS section of SHOW INNODB STATUS.
 
 =item IO_THREADS
 
-This data is from the list of threads in the the FILE I/O section of SHOW INNODB
+This data is from the list of threads in the FILE I/O section of SHOW INNODB
 STATUS.
 
 =item INNODB_LOCKS

debian/additions/innotop/innotop.1

@@ -2048,7 +2048,7 @@ the processlist.
 This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW INNODB STATUS.\s0
 .IP "\s-1IO_THREADS\s0" 4
 .IX Item "IO_THREADS"
-This data is from the list of threads in the the \s-1FILE I/O\s0 section of \s-1SHOW INNODB
+This data is from the list of threads in the \s-1FILE I/O\s0 section of \s-1SHOW INNODB
 STATUS.\s0
 .IP "\s-1INNODB_LOCKS\s0" 4
 .IX Item "INNODB_LOCKS"

extra/mariabackup/innobackupex.cc

@@ -216,7 +216,7 @@ ibx_mode_t ibx_mode = IBX_MODE_BACKUP;
 
 static struct my_option ibx_long_options[] =
 {
-	{"version", 'v', "print xtrabackup version information",
+	{"version", 'v', "print version information",
 	 (uchar *) &opt_ibx_version, (uchar *) &opt_ibx_version, 0,
 	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 
@@ -259,12 +259,11 @@ static struct my_option ibx_long_options[] =
 	 (uchar *) &opt_ibx_slave_info, (uchar *) &opt_ibx_slave_info, 0,
 	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 
-	{"incremental", OPT_INCREMENTAL, "This option tells xtrabackup to "
-	 "create an incremental backup, rather than a full one. It is passed "
-	 "to the xtrabackup child process. When this option is specified, "
+	{"incremental", OPT_INCREMENTAL,
+	 "Create an incremental backup, rather than a full one. When this option is specified, "
 	 "either --incremental-lsn or --incremental-basedir can also be given. "
-	 "If neither option is given, option --incremental-basedir is passed "
-	 "to xtrabackup by default, set to the first timestamped backup "
+	 "If neither option is given, option --incremental-basedir is used "
+	 "by default, set to the first timestamped backup "
 	 "directory in the backup base directory.",
 	 (uchar *) &opt_ibx_incremental, (uchar *) &opt_ibx_incremental, 0,
 	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -379,14 +378,14 @@ static struct my_option ibx_long_options[] =
 	{"incremental-history-name", OPT_INCREMENTAL_HISTORY_NAME,
 	 "This option specifies the name of the backup series stored in the "
 	 "PERCONA_SCHEMA.xtrabackup_history history record to base an "
-	 "incremental backup on. Xtrabackup will search the history table "
+	 "incremental backup on. Backup will search the history table "
 	 "looking for the most recent (highest innodb_to_lsn), successful "
 	 "backup in the series and take the to_lsn value to use as the "
 	 "starting lsn for the incremental backup. This will be mutually "
 	 "exclusive with --incremental-history-uuid, --incremental-basedir "
 	 "and --incremental-lsn. If no valid lsn can be found (no series by "
-	 "that name, no successful backups by that name) xtrabackup will "
-	 "return with an error. It is used with the --incremental option.",
+	 "that name, no successful backups by that name), "
+	 "an error will be returned. It is used with the --incremental option.",
 	 (uchar*) &opt_ibx_incremental_history_name,
 	 (uchar*) &opt_ibx_incremental_history_name, 0, GET_STR,
 	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -396,8 +395,8 @@ static struct my_option ibx_long_options[] =
 	 "stored in the PERCONA_SCHEMA.xtrabackup_history to base an "
 	 "incremental backup on. --incremental-history-name, "
 	 "--incremental-basedir and --incremental-lsn. If no valid lsn can be "
-	 "found (no success record with that uuid) xtrabackup will return "
-	 "with an error. It is used with the --incremental option.",
+	 "found (no success record with that uuid), an error will be returned."
+	 " It is used with the --incremental option.",
 	 (uchar*) &opt_ibx_incremental_history_uuid,
 	 (uchar*) &opt_ibx_incremental_history_uuid, 0, GET_STR,
 	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -426,7 +425,7 @@ static struct my_option ibx_long_options[] =
 	{"include", OPT_INCLUDE,
 	 "This option is a regular expression to be matched against table "
 	 "names in databasename.tablename format. It is passed directly to "
-	 "xtrabackup's --tables option. See the xtrabackup documentation for "
+	 "--tables option. See the documentation for "
 	 "details.",
 	 (uchar*) &opt_ibx_include,
 	 (uchar*) &opt_ibx_include, 0, GET_STR,
@@ -476,12 +475,6 @@ static struct my_option ibx_long_options[] =
 	 (uchar*) &opt_ibx_lock_wait_threshold, 0, GET_UINT,
 	 REQUIRED_ARG, 60, 0, 0, 0, 0, 0},
 
-	{"debug-sleep-before-unlock", OPT_DEBUG_SLEEP_BEFORE_UNLOCK,
-	 "This is a debug-only option used by the XtraBackup test suite.",
-	 (uchar*) &opt_ibx_debug_sleep_before_unlock,
-	 (uchar*) &opt_ibx_debug_sleep_before_unlock, 0, GET_UINT,
-	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-
 	{"safe-slave-backup-timeout", OPT_SAFE_SLAVE_BACKUP_TIMEOUT,
 	 "How many seconds --safe-slave-backup should wait for "
 	 "Slave_open_temp_tables to become zero. (default 300)",
@@ -494,22 +487,20 @@ static struct my_option ibx_long_options[] =
 	We put them here with only purpose for them to showup in
 	innobackupex --help output */
 
-	{"close_files", OPT_CLOSE_FILES, "Do not keep files opened. This "
-	 "option is passed directly to xtrabackup. Use at your own risk.",
+	{"close_files", OPT_CLOSE_FILES, "Do not keep files opened."
+	" Use at your own risk.",
 	 (uchar*) &ibx_xb_close_files, (uchar*) &ibx_xb_close_files, 0,
 	 GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 
-	{"compress", OPT_COMPRESS, "This option instructs xtrabackup to "
-	 "compress backup copies of InnoDB data files. It is passed directly "
-	 "to the xtrabackup child process. Try 'xtrabackup --help' for more "
-	 "details.", (uchar*) &ibx_xtrabackup_compress_alg,
+	{"compress", OPT_COMPRESS, "This option instructs backup to "
+	 "compress backup copies of InnoDB data files."
+	 , (uchar*) &ibx_xtrabackup_compress_alg,
 	 (uchar*) &ibx_xtrabackup_compress_alg, 0,
 	 GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
 
 	{"compress-threads", OPT_COMPRESS_THREADS,
 	 "This option specifies the number of worker threads that will be used "
-	 "for parallel compression. It is passed directly to the xtrabackup "
-	 "child process. Try 'xtrabackup --help' for more details.",
+	 "for parallel compression.",
 	 (uchar*) &ibx_xtrabackup_compress_threads,
 	 (uchar*) &ibx_xtrabackup_compress_threads,
 	 0, GET_UINT, REQUIRED_ARG, 1, 1, UINT_MAX, 0, 0, 0},
@@ -520,17 +511,15 @@ static struct my_option ibx_long_options[] =
 	 (uchar*) &ibx_xtrabackup_compress_chunk_size,
 	 0, GET_ULL, REQUIRED_ARG, (1 << 16), 1024, ULONGLONG_MAX, 0, 0, 0},
 
-	{"export", OPT_EXPORT, "This option is passed directly to xtrabackup's "
-	 "--export option. It enables exporting individual tables for import "
-	 "into another server. See the xtrabackup documentation for details.",
+	{"export", OPT_EXPORT, " enables exporting individual tables for import "
+	 "into another server.",
 	 (uchar*) &ibx_xtrabackup_export, (uchar*) &ibx_xtrabackup_export,
 	 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 
 	{"extra-lsndir", OPT_EXTRA_LSNDIR, "This option specifies the "
 	 "directory in which to save an extra copy of the "
 	 "\"xtrabackup_checkpoints\" file. The option accepts a string "
-	 "argument. It is passed directly to xtrabackup's --extra-lsndir "
-	 "option. See the xtrabackup documentation for details.",
+	 "argument.",
 	 (uchar*) &ibx_xtrabackup_extra_lsndir,
 	 (uchar*) &ibx_xtrabackup_extra_lsndir,
 	 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -552,7 +541,7 @@ static struct my_option ibx_long_options[] =
 	 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 
 	{"incremental-force-scan", OPT_INCREMENTAL_FORCE_SCAN,
-	 "This options tells xtrabackup to perform full scan of data files "
+	 "Perform full scan of data files "
 	 "for taking an incremental backup even if full changed page bitmap "
 	 "data is available to enable the backup without the full scan.",
 	 (uchar*)&ibx_xtrabackup_incremental_force_scan,
@@ -578,34 +567,30 @@ static struct my_option ibx_long_options[] =
 	 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 
 	{"parallel", OPT_PARALLEL, "On backup, this option specifies the "
-	 "number of threads the xtrabackup child process should use to back "
-	 "up files concurrently.  The option accepts an integer argument. It "
-	 "is passed directly to xtrabackup's --parallel option. See the "
-	 "xtrabackup documentation for details.",
+	 "number of threads to use to back "
+	 "up files concurrently.  The option accepts an integer argument.",
 	 (uchar*) &ibx_xtrabackup_parallel, (uchar*) &ibx_xtrabackup_parallel,
 	 0, GET_INT, REQUIRED_ARG, 1, 1, INT_MAX, 0, 0, 0},
 
 
 	{"stream", OPT_STREAM, "This option specifies the format in which to "
 	 "do the streamed backup.  The option accepts a string argument. The "
 	 "backup will be done to STDOUT in the specified format. Currently, "
-	 "the only supported formats are tar and mbstream/xbstream. This "
-	 "option is passed directly to xtrabackup's --stream option.",
+	 "the only supported formats are tar and mbstream/xbstream.",
 	 (uchar*) &ibx_xtrabackup_stream_str,
 	 (uchar*) &ibx_xtrabackup_stream_str, 0, GET_STR,
 	 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 
 	{"tables-file", OPT_TABLES_FILE, "This option specifies the file in "
 	 "which there are a list of names of the form database.  The option "
-	 "accepts a string argument.table, one per line. The option is passed "
-	 "directly to xtrabackup's --tables-file option.",
+	 "accepts a string argument.table, one per line.",
 	 (uchar*) &ibx_xtrabackup_tables_file,
 	 (uchar*) &ibx_xtrabackup_tables_file,
 	 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 
 	{"throttle", OPT_THROTTLE, "This option specifies a number of I/O "
 	 "operations (pairs of read+write) per second.  It accepts an integer "
-	 "argument.  It is passed directly to xtrabackup's --throttle option.",
+	 "argument.",
 	 (uchar*) &ibx_xtrabackup_throttle, (uchar*) &ibx_xtrabackup_throttle,
 	 0, GET_LONG, REQUIRED_ARG, 0, 0, LONG_MAX, 0, 1, 0},
 
@@ -617,11 +602,10 @@ static struct my_option ibx_long_options[] =
 	 0, 0, 0, 0, 0, 0},
 
 	{"use-memory", OPT_USE_MEMORY, "This option accepts a string argument "
-	 "that specifies the amount of memory in bytes for xtrabackup to use "
+	 "that specifies the amount of memory in bytes to use "
 	 "for crash recovery while preparing a backup. Multiples are supported "
 	 "providing the unit (e.g. 1MB, 1GB). It is used only with the option "
-	 "--apply-log. It is passed directly to xtrabackup's --use-memory "
-	 "option. See the xtrabackup documentation for details.",
+	 "--apply-log.",
 	 (uchar*) &ibx_xtrabackup_use_memory,
 	 (uchar*) &ibx_xtrabackup_use_memory,
 	 0, GET_LL, REQUIRED_ARG, 100*1024*1024L, 1024*1024L, LONGLONG_MAX, 0,
@@ -643,7 +627,7 @@ static struct my_option ibx_long_options[] =
 
 static void usage(void)
 {
-	puts("Open source backup tool for InnoDB and XtraDB\n\
+	puts("Open source backup tool\n\
 \n\
 Copyright (C) 2009-2015 Percona LLC and/or its affiliates.\n\
 Portions Copyright (C) 2000, 2011, MySQL AB & Innobase Oy. All Rights Reserved.\n\
@@ -694,7 +678,7 @@ innobackupex [--decompress]\n\
 \n\
 DESCRIPTION\n\
 \n\
-The first command line above makes a hot backup of a MySQL database.\n\
+The first command line above makes a hot backup of a database.\n\
 By default it creates a backup directory (named by the current date\n\
 	and time) in the given backup root directory.  With the --no-timestamp\n\
 option it does not create a time-stamped backup directory, but it puts\n\
@@ -704,22 +688,18 @@ indexes in all databases or in all of the databases specified with the\n\
 --databases option.  The created backup contains .frm, .MRG, .MYD,\n\
 .MYI, .MAD, .MAI, .TRG, .TRN, .ARM, .ARZ, .CSM, CSV, .opt, .par, and\n\
 InnoDB data and log files.  The MY.CNF options file defines the\n\
-location of the database.  This command connects to the MySQL server\n\
-using the mysql client program, and runs xtrabackup as a child\n\
-process.\n\
+location of the database.\n\
 \n\
 The --apply-log command prepares a backup for starting a MySQL\n\
 server on the backup. This command recovers InnoDB data files as specified\n\
 in BACKUP-DIR/backup-my.cnf using BACKUP-DIR/ib_logfile0,\n\
 and creates new InnoDB log files as specified in BACKUP-DIR/backup-my.cnf.\n\
-The BACKUP-DIR should be the path to a backup directory created by\n\
-xtrabackup. This command runs xtrabackup as a child process, but it does not \n\
-connect to the database server.\n\
+The BACKUP-DIR should be the path to a backup directory\n\
 \n\
 The --copy-back command copies data, index, and log files\n\
 from the backup directory back to their original locations.\n\
 The MY.CNF options file defines the original location of the database.\n\
-The BACKUP-DIR is the path to a backup directory created by xtrabackup.\n\
+The BACKUP-DIR is the path to a backup directory.\n\
 \n\
 The --move-back command is similar to --copy-back with the only difference that\n\
 it moves files to their original locations rather than copies them. As this\n\