mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 00:34:18 +01:00
Merge branch '10.2' into 10.3
This commit is contained in:
commit
36e59752e7
273 changed files with 4467 additions and 1284 deletions
.gitignoreCMakeLists.txt
client
cmake
debian
autobake-deb.shcontrolmariadb-plugin-tokudb.installmariadb-server-10.2.triggersmariadb-server-10.3.postinst
extra/mariabackup
include
mysql-test
main
alter_table.resultalter_table.testanalyze_stmt_orderby.resultauto_increment.resultauto_increment.testcte_nonrecursive.resultcte_nonrecursive.testderived_cond_pushdown.resultderived_cond_pushdown.testfunc_json.resultfunc_json.testgrant.resultgrant.testgrant2.resultgrant2.testhaving.resulthaving.testinformation_schema.resultlimit.resultlimit.testlock.resultlock.testmax_statement_time.resultmax_statement_time.testmysqldump.resultmysqldump.testmysqlslap.resultmysqlslap.testmysqltest_tracking_info.resultmysqltest_tracking_info.testolap.resultolap.testps.resultps.testread_only_innodb.resultread_only_innodb.testreset_connection.resultreset_connection.testselectivity.resultselectivity.testselectivity_innodb.resultsession_tracker_last_gtid.resultsession_tracker_last_gtid.testset_password.resultset_password.testshow_grants_with_plugin-7985.resultshow_grants_with_plugin-7985.testsp-security.resultsp-security.teststatistics.resultstatistics.testsubselect_mat_cost_bugs.resultsubselect_sj2_mat.resultsubselect_sj2_mat.testsubselect_sj_nonmerged.resulttype_blob.resulttype_blob.testtype_decimal.resulttype_decimal.test
mysql-test-run.plstd_data/frm
suite
7
.gitignore
vendored
7
.gitignore
vendored
|
@ -127,6 +127,7 @@ scripts/mytop
|
|||
scripts/wsrep_sst_common
|
||||
scripts/wsrep_sst_mysqldump
|
||||
scripts/wsrep_sst_rsync
|
||||
scripts/wsrep_sst_rsync_wan
|
||||
scripts/wsrep_sst_mariabackup
|
||||
scripts/wsrep_sst_xtrabackup
|
||||
scripts/wsrep_sst_xtrabackup-v2
|
||||
|
@ -498,6 +499,12 @@ UpgradeLog*.htm
|
|||
# Microsoft Fakes
|
||||
FakesAssemblies/
|
||||
|
||||
# macOS garbage
|
||||
.DS_Store
|
||||
|
||||
# QtCreator && CodeBlocks
|
||||
*.cbp
|
||||
|
||||
compile_commands.json
|
||||
.clang-format
|
||||
.kscope/
|
||||
|
|
|
@ -297,7 +297,7 @@ ELSE()
|
|||
ENDIF()
|
||||
SET(DEFAULT_CHARSET_HOME "${DEFAULT_MYSQL_HOME}")
|
||||
SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}")
|
||||
IF(INSTALL_SYSCONFDIR AND NOT DEFAULT_SYSCONFDIR)
|
||||
IF(INSTALL_SYSCONFDIR AND NOT DEFAULT_SYSCONFDIR AND NOT DEB)
|
||||
SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}")
|
||||
ENDIF()
|
||||
|
||||
|
|
|
@ -5090,6 +5090,14 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
|
|||
if (opt_xml)
|
||||
print_xml_tag(md_result_file, "", "\n", "database", "name=", db, NullS);
|
||||
|
||||
|
||||
/* obtain dump of routines (procs/functions) */
|
||||
if (opt_routines && mysql_get_server_version(mysql) >= 50009)
|
||||
{
|
||||
DBUG_PRINT("info", ("Dumping routines for database %s", db));
|
||||
dump_routines_for_db(db);
|
||||
}
|
||||
|
||||
if (opt_single_transaction && mysql_get_server_version(mysql) >= 50500)
|
||||
{
|
||||
verbose_msg("-- Setting savepoint...\n");
|
||||
|
@ -5099,7 +5107,6 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
|
|||
DBUG_RETURN(1);
|
||||
}
|
||||
}
|
||||
|
||||
/* Dump each selected table */
|
||||
for (pos= dump_tables; pos < end; pos++)
|
||||
{
|
||||
|
@ -5161,12 +5168,6 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
|
|||
DBUG_PRINT("info", ("Dumping events for database %s", db));
|
||||
dump_events_for_db(db);
|
||||
}
|
||||
/* obtain dump of routines (procs/functions) */
|
||||
if (opt_routines && mysql_get_server_version(mysql) >= 50009)
|
||||
{
|
||||
DBUG_PRINT("info", ("Dumping routines for database %s", db));
|
||||
dump_routines_for_db(db);
|
||||
}
|
||||
free_root(&glob_root, MYF(0));
|
||||
if (opt_xml)
|
||||
{
|
||||
|
|
|
@ -850,7 +850,7 @@ build_table_string(void)
|
|||
|
||||
if (auto_generate_sql_guid_primary)
|
||||
{
|
||||
dynstr_append(&table_string, "id varchar(32) primary key");
|
||||
dynstr_append(&table_string, "id varchar(36) primary key");
|
||||
|
||||
if (num_int_cols || num_char_cols || auto_generate_sql_guid_primary)
|
||||
dynstr_append(&table_string, ",");
|
||||
|
@ -865,7 +865,7 @@ build_table_string(void)
|
|||
if (count) /* Except for the first pass we add a comma */
|
||||
dynstr_append(&table_string, ",");
|
||||
|
||||
if (snprintf(buf, HUGE_STRING_LENGTH, "id%d varchar(32) unique key", count)
|
||||
if (snprintf(buf, HUGE_STRING_LENGTH, "id%d varchar(36) unique key", count)
|
||||
> HUGE_STRING_LENGTH)
|
||||
{
|
||||
fprintf(stderr, "Memory Allocation error in create table\n");
|
||||
|
|
|
@ -125,7 +125,8 @@ static my_bool view_protocol= 0, view_protocol_enabled= 0;
|
|||
static my_bool cursor_protocol= 0, cursor_protocol_enabled= 0;
|
||||
static my_bool parsing_disabled= 0;
|
||||
static my_bool display_result_vertically= FALSE, display_result_lower= FALSE,
|
||||
display_metadata= FALSE, display_result_sorted= FALSE;
|
||||
display_metadata= FALSE, display_result_sorted= FALSE,
|
||||
display_session_track_info= FALSE;
|
||||
static my_bool disable_query_log= 0, disable_result_log= 0;
|
||||
static my_bool disable_connect_log= 0;
|
||||
static my_bool disable_warnings= 0, disable_column_names= 0;
|
||||
|
@ -153,6 +154,7 @@ static struct property prop_list[] = {
|
|||
{ &abort_on_error, 0, 1, 0, "$ENABLED_ABORT_ON_ERROR" },
|
||||
{ &disable_connect_log, 0, 1, 1, "$ENABLED_CONNECT_LOG" },
|
||||
{ &disable_info, 0, 1, 1, "$ENABLED_INFO" },
|
||||
{ &display_session_track_info, 0, 1, 1, "$ENABLED_STATE_CHANGE_INFO" },
|
||||
{ &display_metadata, 0, 0, 0, "$ENABLED_METADATA" },
|
||||
{ &ps_protocol_enabled, 0, 0, 0, "$ENABLED_PS_PROTOCOL" },
|
||||
{ &disable_query_log, 0, 0, 1, "$ENABLED_QUERY_LOG" },
|
||||
|
@ -166,6 +168,7 @@ enum enum_prop {
|
|||
P_ABORT= 0,
|
||||
P_CONNECT,
|
||||
P_INFO,
|
||||
P_SESSION_TRACK,
|
||||
P_META,
|
||||
P_PS,
|
||||
P_QUERY,
|
||||
|
@ -362,6 +365,7 @@ enum enum_commands {
|
|||
Q_WAIT_FOR_SLAVE_TO_STOP,
|
||||
Q_ENABLE_WARNINGS, Q_DISABLE_WARNINGS,
|
||||
Q_ENABLE_INFO, Q_DISABLE_INFO,
|
||||
Q_ENABLE_SESSION_TRACK_INFO, Q_DISABLE_SESSION_TRACK_INFO,
|
||||
Q_ENABLE_METADATA, Q_DISABLE_METADATA,
|
||||
Q_ENABLE_COLUMN_NAMES, Q_DISABLE_COLUMN_NAMES,
|
||||
Q_EXEC, Q_DELIMITER,
|
||||
|
@ -384,6 +388,7 @@ enum enum_commands {
|
|||
Q_RESULT_FORMAT_VERSION,
|
||||
Q_MOVE_FILE, Q_REMOVE_FILES_WILDCARD, Q_SEND_EVAL,
|
||||
Q_ENABLE_PREPARE_WARNINGS, Q_DISABLE_PREPARE_WARNINGS,
|
||||
Q_RESET_CONNECTION,
|
||||
Q_UNKNOWN, /* Unknown command. */
|
||||
Q_COMMENT, /* Comments, ignored. */
|
||||
Q_COMMENT_WITH_COMMAND,
|
||||
|
@ -435,6 +440,8 @@ const char *command_names[]=
|
|||
"disable_warnings",
|
||||
"enable_info",
|
||||
"disable_info",
|
||||
"enable_session_track_info",
|
||||
"disable_session_track_info",
|
||||
"enable_metadata",
|
||||
"disable_metadata",
|
||||
"enable_column_names",
|
||||
|
@ -491,6 +498,7 @@ const char *command_names[]=
|
|||
"send_eval",
|
||||
"enable_prepare_warnings",
|
||||
"disable_prepare_warnings",
|
||||
"reset_connection",
|
||||
|
||||
0
|
||||
};
|
||||
|
@ -6531,6 +6539,34 @@ void do_delimiter(struct st_command* command)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
do_reset_connection
|
||||
|
||||
DESCRIPTION
|
||||
Reset the current session.
|
||||
*/
|
||||
|
||||
static void do_reset_connection()
|
||||
{
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
MYSQL *mysql = cur_con->mysql;
|
||||
|
||||
DBUG_ENTER("do_reset_connection");
|
||||
if (mysql_reset_connection(mysql))
|
||||
die("reset connection failed: %s", mysql_error(mysql));
|
||||
if (cur_con->stmt)
|
||||
{
|
||||
mysql_stmt_close(cur_con->stmt);
|
||||
cur_con->stmt= NULL;
|
||||
}
|
||||
DBUG_VOID_RETURN;
|
||||
#else
|
||||
die("reset connection failed: unsupported by embedded server client library");
|
||||
return;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
my_bool match_delimiter(int c, const char *delim, size_t length)
|
||||
{
|
||||
uint i;
|
||||
|
@ -7786,6 +7822,70 @@ void append_info(DYNAMIC_STRING *ds, ulonglong affected_rows,
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
@brief Append state change information (received through Ok packet) to the output.
|
||||
|
||||
@param [in,out] ds Dynamic string to hold the content to be printed.
|
||||
@param [in] mysql Connection handle.
|
||||
*/
|
||||
|
||||
static void append_session_track_info(DYNAMIC_STRING *ds, MYSQL *mysql)
|
||||
{
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
for (unsigned int type= SESSION_TRACK_BEGIN; type <= SESSION_TRACK_END; type++)
|
||||
{
|
||||
const char *data;
|
||||
size_t data_length;
|
||||
|
||||
if (!mysql_session_track_get_first(mysql,
|
||||
(enum_session_state_type) type,
|
||||
&data, &data_length))
|
||||
{
|
||||
dynstr_append(ds, "-- ");
|
||||
switch (type)
|
||||
{
|
||||
case SESSION_TRACK_SYSTEM_VARIABLES:
|
||||
dynstr_append(ds, "Tracker : SESSION_TRACK_SYSTEM_VARIABLES\n");
|
||||
break;
|
||||
case SESSION_TRACK_SCHEMA:
|
||||
dynstr_append(ds, "Tracker : SESSION_TRACK_SCHEMA\n");
|
||||
break;
|
||||
case SESSION_TRACK_STATE_CHANGE:
|
||||
dynstr_append(ds, "Tracker : SESSION_TRACK_STATE_CHANGE\n");
|
||||
break;
|
||||
case SESSION_TRACK_GTIDS:
|
||||
dynstr_append(ds, "Tracker : SESSION_TRACK_GTIDS\n");
|
||||
break;
|
||||
case SESSION_TRACK_TRANSACTION_CHARACTERISTICS:
|
||||
dynstr_append(ds, "Tracker : SESSION_TRACK_TRANSACTION_CHARACTERISTICS\n");
|
||||
break;
|
||||
case SESSION_TRACK_TRANSACTION_TYPE:
|
||||
dynstr_append(ds, "Tracker : SESSION_TRACK_TRANSACTION_TYPE\n");
|
||||
break;
|
||||
default:
|
||||
DBUG_ASSERT(0);
|
||||
dynstr_append(ds, "\n");
|
||||
}
|
||||
|
||||
|
||||
dynstr_append(ds, "-- ");
|
||||
dynstr_append_mem(ds, data, data_length);
|
||||
}
|
||||
else
|
||||
continue;
|
||||
while (!mysql_session_track_get_next(mysql,
|
||||
(enum_session_state_type) type,
|
||||
&data, &data_length))
|
||||
{
|
||||
dynstr_append(ds, "\n-- ");
|
||||
dynstr_append_mem(ds, data, data_length);
|
||||
}
|
||||
dynstr_append(ds, "\n\n");
|
||||
}
|
||||
#endif /* EMBEDDED_LIBRARY */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Display the table headings with the names tab separated
|
||||
*/
|
||||
|
@ -7966,6 +8066,9 @@ void run_query_normal(struct st_connection *cn, struct st_command *command,
|
|||
if (!disable_info)
|
||||
append_info(ds, mysql_affected_rows(mysql), mysql_info(mysql));
|
||||
|
||||
if (display_session_track_info)
|
||||
append_session_track_info(ds, mysql);
|
||||
|
||||
/*
|
||||
Add all warnings to the result. We can't do this if we are in
|
||||
the middle of processing results from multi-statement, because
|
||||
|
@ -8381,6 +8484,10 @@ void run_query_stmt(struct st_connection *cn, struct st_command *command,
|
|||
if (!disable_info)
|
||||
append_info(ds, mysql_stmt_affected_rows(stmt), mysql_info(mysql));
|
||||
|
||||
if (display_session_track_info)
|
||||
append_session_track_info(ds, mysql);
|
||||
|
||||
|
||||
if (!disable_warnings)
|
||||
{
|
||||
/* Get the warnings from execute */
|
||||
|
@ -8776,6 +8883,7 @@ void init_re(void)
|
|||
"[[:space:]]*SELECT[[:space:]]|"
|
||||
"[[:space:]]*CREATE[[:space:]]+TABLE[[:space:]]|"
|
||||
"[[:space:]]*DO[[:space:]]|"
|
||||
"[[:space:]]*HANDLER[[:space:]]+.*[[:space:]]+READ[[:space:]]|"
|
||||
"[[:space:]]*SET[[:space:]]+OPTION[[:space:]]|"
|
||||
"[[:space:]]*DELETE[[:space:]]+MULTI[[:space:]]|"
|
||||
"[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|"
|
||||
|
@ -9361,6 +9469,12 @@ int main(int argc, char **argv)
|
|||
case Q_DISABLE_INFO:
|
||||
set_property(command, P_INFO, 1);
|
||||
break;
|
||||
case Q_ENABLE_SESSION_TRACK_INFO:
|
||||
set_property(command, P_SESSION_TRACK, 1);
|
||||
break;
|
||||
case Q_DISABLE_SESSION_TRACK_INFO:
|
||||
set_property(command, P_SESSION_TRACK, 0);
|
||||
break;
|
||||
case Q_ENABLE_METADATA:
|
||||
set_property(command, P_META, 1);
|
||||
break;
|
||||
|
@ -9571,6 +9685,9 @@ int main(int argc, char **argv)
|
|||
case Q_PING:
|
||||
handle_command_error(command, mysql_ping(cur_con->mysql), -1);
|
||||
break;
|
||||
case Q_RESET_CONNECTION:
|
||||
do_reset_connection();
|
||||
break;
|
||||
case Q_SEND_SHUTDOWN:
|
||||
handle_command_error(command,
|
||||
mysql_shutdown(cur_con->mysql,
|
||||
|
|
|
@ -171,6 +171,7 @@ SET(INSTALL_SYSTEMD_TMPFILESDIR_RPM "/usr/lib/tmpfiles.d")
|
|||
SET(INSTALL_BINDIR_DEB "bin")
|
||||
SET(INSTALL_SBINDIR_DEB "sbin")
|
||||
SET(INSTALL_SCRIPTDIR_DEB "bin")
|
||||
SET(INSTALL_SYSCONFDIR_DEB "/etc")
|
||||
SET(INSTALL_SYSCONF2DIR_DEB "/etc/mysql/conf.d")
|
||||
#
|
||||
SET(INSTALL_LIBDIR_DEB "lib")
|
||||
|
|
16
debian/autobake-deb.sh
vendored
16
debian/autobake-deb.sh
vendored
|
@ -36,19 +36,12 @@ fi
|
|||
# Debian policy and targeting Debian Sid. Then case-by-case run in autobake-deb.sh
|
||||
# tests for backwards compatibility and strip away parts on older builders.
|
||||
|
||||
# If iproute2 is not available (before Debian Jessie and Ubuntu Trusty)
|
||||
# fall back to the old iproute package.
|
||||
if ! apt-cache madison iproute2 | grep 'iproute2 *|' >/dev/null 2>&1
|
||||
then
|
||||
sed 's/iproute2/iproute/' -i debian/control
|
||||
fi
|
||||
|
||||
# If libcrack2 (>= 2.9.0) is not available (before Debian Jessie and Ubuntu Trusty)
|
||||
# clean away the cracklib stanzas so the package can build without them.
|
||||
if ! apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1
|
||||
then
|
||||
sed '/libcrack2-dev/d' -i debian/control
|
||||
sed '/Package: mariadb-plugin-cracklib/,+11d' -i debian/control
|
||||
sed '/Package: mariadb-plugin-cracklib/,+9d' -i debian/control
|
||||
fi
|
||||
|
||||
# If libpcre3-dev (>= 2:8.35-3.2~) is not available (before Debian Jessie or Ubuntu Wily)
|
||||
|
@ -120,8 +113,7 @@ Breaks: mariadb-aws-key-management-10.1,
|
|||
mariadb-aws-key-management-10.2
|
||||
Replaces: mariadb-aws-key-management-10.1,
|
||||
mariadb-aws-key-management-10.2
|
||||
Depends: libcurl3,
|
||||
mariadb-server-10.3,
|
||||
Depends: mariadb-server-10.3,
|
||||
\${misc:Depends},
|
||||
\${shlibs:Depends}
|
||||
Description: Amazon Web Service Key Management Service Plugin for MariaDB
|
||||
|
@ -134,8 +126,8 @@ fi
|
|||
# Mroonga, TokuDB never built on Travis CI anyway, see build flags above
|
||||
if [[ $TRAVIS ]]
|
||||
then
|
||||
sed -i -e "/Package: mariadb-plugin-tokudb/,+17d" debian/control
|
||||
sed -i -e "/Package: mariadb-plugin-mroonga/,+16d" debian/control
|
||||
sed -i -e "/Package: mariadb-plugin-tokudb/,+19d" debian/control
|
||||
sed -i -e "/Package: mariadb-plugin-mroonga/,+17d" debian/control
|
||||
fi
|
||||
|
||||
# Adjust changelog, add new version
|
||||
|
|
6
debian/control
vendored
6
debian/control
vendored
|
@ -423,7 +423,7 @@ Pre-Depends: adduser (>= 3.40),
|
|||
mariadb-common (>= ${source:Version})
|
||||
Depends: galera-3 (>=25.3),
|
||||
gawk,
|
||||
iproute2,
|
||||
iproute | iproute2,
|
||||
libdbi-perl,
|
||||
lsb-base (>= 3.0-10),
|
||||
lsof,
|
||||
|
@ -569,6 +569,7 @@ Description: OQGraph storage engine for MariaDB
|
|||
Package: mariadb-plugin-tokudb
|
||||
Architecture: amd64
|
||||
Depends: mariadb-server-10.3 (= ${binary:Version}),
|
||||
libjemalloc1 (>= 3.0.0~),
|
||||
${misc:Depends},
|
||||
${shlibs:Depends}
|
||||
Breaks: mariadb-server-10.0,
|
||||
|
@ -704,9 +705,6 @@ Depends: libcrack2 (>= 2.9.0),
|
|||
Description: CrackLib Password Validation Plugin for MariaDB
|
||||
This password validation plugin uses cracklib to allow only
|
||||
sufficiently secure (as defined by cracklib) user passwords in MariaDB.
|
||||
.
|
||||
Plese refer to the MariaDB Knowledge Base on more information on
|
||||
how to use this tool.
|
||||
|
||||
Package: mariadb-test
|
||||
Architecture: any
|
||||
|
|
1
debian/mariadb-plugin-tokudb.install
vendored
1
debian/mariadb-plugin-tokudb.install
vendored
|
@ -1,4 +1,5 @@
|
|||
etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
|
||||
etc/systemd/system/mariadb.service.d/tokudb.conf
|
||||
usr/bin/tokuft_logprint
|
||||
usr/bin/tokuftdump
|
||||
usr/lib/mysql/plugin/ha_tokudb.so
|
||||
|
|
2
debian/mariadb-server-10.2.triggers
vendored
Normal file
2
debian/mariadb-server-10.2.triggers
vendored
Normal file
|
@ -0,0 +1,2 @@
|
|||
interest-noawait /etc/mysql
|
||||
interest-noawait /etc/systemd/system/mariadb.service.d
|
19
debian/mariadb-server-10.3.postinst
vendored
19
debian/mariadb-server-10.3.postinst
vendored
|
@ -50,14 +50,14 @@ EOF
|
|||
return $retval
|
||||
}
|
||||
|
||||
# This is necessary because mysql_install_db removes the pid file in /var/run
|
||||
# and because changed configuration options should take effect immediately.
|
||||
# In case the server wasn't running at all it should be ok if the stop
|
||||
# script fails. I can't tell at this point because of the cleaned /var/run.
|
||||
set +e; invoke stop; set -e
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
# This is needed because mysql_install_db removes the pid file in /var/run
|
||||
# and because changed configuration options should take effect immediately.
|
||||
# In case the server wasn't running at all it should be ok if the stop
|
||||
# script fails. I can't tell at this point because of the cleaned /var/run.
|
||||
set +e; invoke stop; set -e
|
||||
|
||||
mysql_statedir=/usr/share/mysql
|
||||
mysql_datadir=/var/lib/mysql
|
||||
mysql_logdir=/var/log/mysql
|
||||
|
@ -242,6 +242,13 @@ EOF
|
|||
abort-upgrade|abort-remove|abort-configure)
|
||||
;;
|
||||
|
||||
triggered)
|
||||
if [ -x "$(command -v systemctl)" ]; then
|
||||
systemctl daemon-reload
|
||||
fi
|
||||
invoke restart
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postinst called with unknown argument '$1'" 1>&2
|
||||
exit 1
|
||||
|
|
|
@ -187,6 +187,7 @@ xb_mysql_query(MYSQL *connection, const char *query, bool use_result,
|
|||
|
||||
if (!use_result) {
|
||||
mysql_free_result(mysql_result);
|
||||
mysql_result = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1784,12 +1785,17 @@ mdl_lock_table(ulint space_id)
|
|||
MYSQL_RES *mysql_result = xb_mysql_query(mdl_con, oss.str().c_str(), true, true);
|
||||
|
||||
while (MYSQL_ROW row = mysql_fetch_row(mysql_result)) {
|
||||
|
||||
DBUG_EXECUTE_IF("rename_during_mdl_lock_table",
|
||||
if (strcmp(row[0], "test/t1") == 0)
|
||||
xb_mysql_query(mysql_connection, "RENAME TABLE test.t1 to test.t2", false, true
|
||||
););
|
||||
|
||||
std::string full_table_name = ut_get_name(0,row[0]);
|
||||
std::ostringstream lock_query;
|
||||
lock_query << "SELECT 1 FROM " << full_table_name << " LIMIT 0";
|
||||
|
||||
msg_ts("Locking MDL for %s\n", full_table_name.c_str());
|
||||
xb_mysql_query(mdl_con, lock_query.str().c_str(), false, false);
|
||||
xb_mysql_query(mdl_con, lock_query.str().c_str(), false, true);
|
||||
}
|
||||
|
||||
pthread_mutex_unlock(&mdl_lock_con_mutex);
|
||||
|
|
|
@ -109,6 +109,7 @@ int sys_var_init();
|
|||
char xtrabackup_real_target_dir[FN_REFLEN] = "./xtrabackup_backupfiles/";
|
||||
char *xtrabackup_target_dir= xtrabackup_real_target_dir;
|
||||
static my_bool xtrabackup_version;
|
||||
static my_bool verbose;
|
||||
my_bool xtrabackup_backup;
|
||||
my_bool xtrabackup_prepare;
|
||||
my_bool xtrabackup_copy_back;
|
||||
|
@ -692,6 +693,9 @@ enum options_xtrabackup
|
|||
|
||||
struct my_option xb_client_options[] =
|
||||
{
|
||||
{"verbose", 'V', "display verbose output",
|
||||
(G_PTR*) &verbose, (G_PTR*) &verbose, 0, GET_BOOL, NO_ARG,
|
||||
FALSE, 0, 0, 0, 0, 0},
|
||||
{"version", 'v', "print xtrabackup version information",
|
||||
(G_PTR *) &xtrabackup_version, (G_PTR *) &xtrabackup_version, 0, GET_BOOL,
|
||||
NO_ARG, 0, 0, 0, 0, 0, 0},
|
||||
|
@ -1236,7 +1240,7 @@ struct my_option xb_server_options[] =
|
|||
&xb_rocksdb_datadir, &xb_rocksdb_datadir,
|
||||
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
||||
|
||||
{ "backup-rocksdb", OPT_BACKUP_ROCKSDB, "Backup rocksdb data, if rocksdb plugin is installed."
|
||||
{ "rocksdb-backup", OPT_BACKUP_ROCKSDB, "Backup rocksdb data, if rocksdb plugin is installed."
|
||||
"Used only with --backup option. Can be useful for partial backups, to exclude all rocksdb data",
|
||||
&xb_backup_rocksdb, &xb_backup_rocksdb,
|
||||
0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0 },
|
||||
|
@ -1749,7 +1753,7 @@ static bool innodb_init_param()
|
|||
srv_max_n_open_files = ULINT_UNDEFINED - 5;
|
||||
srv_innodb_status = (ibool) innobase_create_status_file;
|
||||
|
||||
srv_print_verbose_log = 1;
|
||||
srv_print_verbose_log = verbose ? 2 : 1;
|
||||
|
||||
/* Store the default charset-collation number of this MySQL
|
||||
installation */
|
||||
|
@ -2459,9 +2463,10 @@ skip:
|
|||
/** Copy redo log blocks to the data sink.
|
||||
@param start_lsn buffer start LSN
|
||||
@param end_lsn buffer end LSN
|
||||
@param last whether we are copying the final part of the log
|
||||
@return last scanned LSN
|
||||
@retval 0 on failure */
|
||||
static lsn_t xtrabackup_copy_log(lsn_t start_lsn, lsn_t end_lsn)
|
||||
static lsn_t xtrabackup_copy_log(lsn_t start_lsn, lsn_t end_lsn, bool last)
|
||||
{
|
||||
lsn_t scanned_lsn = start_lsn;
|
||||
const byte* log_block = log_sys.buf;
|
||||
|
@ -2520,7 +2525,7 @@ static lsn_t xtrabackup_copy_log(lsn_t start_lsn, lsn_t end_lsn)
|
|||
|
||||
log_sys.log.scanned_lsn = scanned_lsn;
|
||||
|
||||
end_lsn = metadata_to_lsn
|
||||
end_lsn = last
|
||||
? ut_uint64_align_up(scanned_lsn, OS_FILE_LOG_BLOCK_SIZE)
|
||||
: scanned_lsn & ~lsn_t(OS_FILE_LOG_BLOCK_SIZE - 1);
|
||||
|
||||
|
@ -2540,8 +2545,9 @@ static lsn_t xtrabackup_copy_log(lsn_t start_lsn, lsn_t end_lsn)
|
|||
}
|
||||
|
||||
/** Copy redo log until the current end of the log is reached
|
||||
@param last whether we are copying the final part of the log
|
||||
@return whether the operation failed */
|
||||
static bool xtrabackup_copy_logfile()
|
||||
static bool xtrabackup_copy_logfile(bool last = false)
|
||||
{
|
||||
ut_a(dst_log_file != NULL);
|
||||
ut_ad(recv_sys != NULL);
|
||||
|
@ -2571,7 +2577,7 @@ static bool xtrabackup_copy_logfile()
|
|||
}
|
||||
|
||||
start_lsn = (lsn == start_lsn)
|
||||
? 0 : xtrabackup_copy_log(start_lsn, lsn);
|
||||
? 0 : xtrabackup_copy_log(start_lsn, lsn, last);
|
||||
|
||||
log_mutex_exit();
|
||||
|
||||
|
@ -3701,6 +3707,12 @@ static bool xtrabackup_backup_low()
|
|||
|
||||
stop_backup_threads();
|
||||
|
||||
if (metadata_to_lsn && xtrabackup_copy_logfile(true)) {
|
||||
ds_close(dst_log_file);
|
||||
dst_log_file = NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (ds_close(dst_log_file) || !metadata_to_lsn) {
|
||||
dst_log_file = NULL;
|
||||
return false;
|
||||
|
|
|
@ -619,6 +619,8 @@ typedef SOCKET_SIZE_TYPE size_socket;
|
|||
#endif
|
||||
#ifndef SOCK_CLOEXEC
|
||||
#define SOCK_CLOEXEC 0
|
||||
#else
|
||||
#define HAVE_SOCK_CLOEXEC
|
||||
#endif
|
||||
|
||||
/* additional file share flags for win32 */
|
||||
|
|
|
@ -561,6 +561,12 @@ inline_mysql_socket_socket
|
|||
(key, (const my_socket*)&mysql_socket.fd, NULL, 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* SOCK_CLOEXEC isn't always a number - can't preprocessor compare */
|
||||
#if defined(HAVE_FCNTL) && defined(FD_CLOEXEC) && !defined(HAVE_SOCK_CLOEXEC)
|
||||
(void) fcntl(mysql_socket.fd, F_SETFD, FD_CLOEXEC);
|
||||
#endif
|
||||
|
||||
return mysql_socket;
|
||||
}
|
||||
|
||||
|
|
|
@ -179,6 +179,7 @@ enum enum_indicator_type
|
|||
#define BINCMP_FLAG 131072U /* Intern: Used by sql_yacc */
|
||||
#define GET_FIXED_FIELDS_FLAG (1U << 18) /* Used to get fields in item tree */
|
||||
#define FIELD_IN_PART_FUNC_FLAG (1U << 19)/* Field part of partition func */
|
||||
#define PART_INDIRECT_KEY_FLAG (1U << 20)
|
||||
|
||||
/**
|
||||
Intern: Field in TABLE object for new version of altered table,
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#define HAVE_OPENSSL11 1
|
||||
#define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
|
||||
#define ERR_remove_state(X) ERR_clear_error()
|
||||
#define EVP_CIPHER_CTX_SIZE 168
|
||||
#define EVP_CIPHER_CTX_SIZE 176
|
||||
#define EVP_MD_CTX_SIZE 48
|
||||
#undef EVP_MD_CTX_init
|
||||
#define EVP_MD_CTX_init(X) do { bzero((X), EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0)
|
||||
|
@ -77,6 +77,10 @@
|
|||
#define X509_get0_notAfter(X) X509_get_notAfter(X)
|
||||
#endif
|
||||
|
||||
#ifndef TLS1_3_VERSION
|
||||
#define SSL_CTX_set_ciphersuites(X,Y) 0
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
|
|
@ -2235,6 +2235,29 @@ t1 CREATE TABLE `t1` (
|
|||
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# MDEV-14668 ADD PRIMARY KEY IF NOT EXISTS on composite key
|
||||
#
|
||||
CREATE TABLE t1 (
|
||||
`ID` BIGINT(20) NOT NULL,
|
||||
`RANK` MEDIUMINT(4) NOT NULL,
|
||||
`CHECK_POINT` BIGINT(20) NOT NULL,
|
||||
UNIQUE INDEX `HORIZON_UIDX01` (`ID`, `RANK`)
|
||||
) ENGINE=InnoDB;
|
||||
ALTER TABLE t1 ADD PRIMARY KEY IF NOT EXISTS (`ID`, `CHECK_POINT`);
|
||||
SHOW CREATE TABLE t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`ID` bigint(20) NOT NULL,
|
||||
`RANK` mediumint(4) NOT NULL,
|
||||
`CHECK_POINT` bigint(20) NOT NULL,
|
||||
PRIMARY KEY (`ID`,`CHECK_POINT`),
|
||||
UNIQUE KEY `HORIZON_UIDX01` (`ID`,`RANK`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
||||
ALTER TABLE t1 ADD PRIMARY KEY IF NOT EXISTS (`ID`, `CHECK_POINT`);
|
||||
Warnings:
|
||||
Note 1061 Multiple primary key defined
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# End of 10.0 tests
|
||||
#
|
||||
#
|
||||
|
|
|
@ -1834,6 +1834,21 @@ ALTER TABLE t1 DROP INDEX IF EXISTS fk, DROP COLUMN IF EXISTS c;
|
|||
SHOW CREATE TABLE t1;
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-14668 ADD PRIMARY KEY IF NOT EXISTS on composite key
|
||||
--echo #
|
||||
CREATE TABLE t1 (
|
||||
`ID` BIGINT(20) NOT NULL,
|
||||
`RANK` MEDIUMINT(4) NOT NULL,
|
||||
`CHECK_POINT` BIGINT(20) NOT NULL,
|
||||
UNIQUE INDEX `HORIZON_UIDX01` (`ID`, `RANK`)
|
||||
) ENGINE=InnoDB;
|
||||
|
||||
ALTER TABLE t1 ADD PRIMARY KEY IF NOT EXISTS (`ID`, `CHECK_POINT`);
|
||||
SHOW CREATE TABLE t1;
|
||||
ALTER TABLE t1 ADD PRIMARY KEY IF NOT EXISTS (`ID`, `CHECK_POINT`);
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.0 tests
|
||||
--echo #
|
||||
|
|
|
@ -306,7 +306,7 @@ ANALYZE
|
|||
"r_rows": 10,
|
||||
"r_total_time_ms": "REPLACED",
|
||||
"filtered": 100,
|
||||
"r_filtered": 1,
|
||||
"r_filtered": 100,
|
||||
"attached_condition": "t0.a is not null"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -538,6 +538,35 @@ pk
|
|||
1
|
||||
drop table t1;
|
||||
#
|
||||
# End of 5.3 tests
|
||||
#
|
||||
#
|
||||
# MDEV-16534 PPC64: Unexpected error with a negative values into auto-increment columns in HEAP, MyISAM, ARIA
|
||||
#
|
||||
CREATE TABLE t1 (
|
||||
id TINYINT NOT NULL AUTO_INCREMENT,
|
||||
name CHAR(30) NOT NULL,
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=MyISAM;
|
||||
SHOW CREATE TABLE t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`id` tinyint(4) NOT NULL AUTO_INCREMENT,
|
||||
`name` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
INSERT INTO t1 (name) VALUES ('dog');
|
||||
UPDATE t1 SET id=-1 WHERE id=1;
|
||||
INSERT INTO t1 (name) VALUES ('cat');
|
||||
SELECT * FROM t1;
|
||||
id name
|
||||
-1 dog
|
||||
2 cat
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# End of 5.5 tests
|
||||
#
|
||||
#
|
||||
# MDEV-15352 AUTO_INCREMENT breaks after updating a column value to a negative number
|
||||
#
|
||||
SET @engine='MyISAM';
|
||||
|
@ -657,3 +686,6 @@ id name
|
|||
-1 dog
|
||||
2 cat
|
||||
DROP PROCEDURE autoinc_mdev15353_one;
|
||||
#
|
||||
# End of 10.2 tests
|
||||
#
|
||||
|
|
|
@ -398,6 +398,29 @@ select last_insert_id();
|
|||
select * from t1;
|
||||
drop table t1;
|
||||
|
||||
--echo #
|
||||
--echo # End of 5.3 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-16534 PPC64: Unexpected error with a negative values into auto-increment columns in HEAP, MyISAM, ARIA
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (
|
||||
id TINYINT NOT NULL AUTO_INCREMENT,
|
||||
name CHAR(30) NOT NULL,
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=MyISAM;
|
||||
SHOW CREATE TABLE t1;
|
||||
INSERT INTO t1 (name) VALUES ('dog');
|
||||
UPDATE t1 SET id=-1 WHERE id=1;
|
||||
INSERT INTO t1 (name) VALUES ('cat');
|
||||
SELECT * FROM t1;
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # End of 5.5 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-15352 AUTO_INCREMENT breaks after updating a column value to a negative number
|
||||
|
@ -405,3 +428,8 @@ drop table t1;
|
|||
|
||||
SET @engine='MyISAM';
|
||||
--source include/autoinc_mdev15353.inc
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.2 tests
|
||||
--echo #
|
||||
|
||||
|
|
|
@ -1478,3 +1478,37 @@ select 2 as f;
|
|||
f
|
||||
2
|
||||
drop table t1;
|
||||
#
|
||||
# MDEV-16473: query with CTE when no database is set
|
||||
#
|
||||
create database db_mdev_16473;
|
||||
use db_mdev_16473;
|
||||
drop database db_mdev_16473;
|
||||
# Now no default database is set
|
||||
select database();
|
||||
database()
|
||||
NULL
|
||||
with cte as (select 1 as a) select * from cte;
|
||||
a
|
||||
1
|
||||
create database db_mdev_16473;
|
||||
create table db_mdev_16473.t1 (a int);
|
||||
insert into db_mdev_16473.t1 values (2), (7), (3), (1);
|
||||
with cte as (select * from db_mdev_16473.t1) select * from cte;
|
||||
a
|
||||
2
|
||||
7
|
||||
3
|
||||
1
|
||||
with cte as (select * from db_mdev_16473.t1)
|
||||
select * from cte, t1 as t where cte.a=t.a;
|
||||
ERROR 3D000: No database selected
|
||||
with cte as (select * from db_mdev_16473.t1)
|
||||
select * from cte, db_mdev_16473.t1 as t where cte.a=t.a;
|
||||
a a
|
||||
2 2
|
||||
7 7
|
||||
3 3
|
||||
1 1
|
||||
drop database db_mdev_16473;
|
||||
use test;
|
||||
|
|
|
@ -1029,4 +1029,31 @@ with cte as
|
|||
select 2 as f;
|
||||
|
||||
drop table t1;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-16473: query with CTE when no database is set
|
||||
--echo #
|
||||
|
||||
create database db_mdev_16473;
|
||||
use db_mdev_16473;
|
||||
drop database db_mdev_16473;
|
||||
|
||||
--echo # Now no default database is set
|
||||
select database();
|
||||
|
||||
with cte as (select 1 as a) select * from cte;
|
||||
|
||||
create database db_mdev_16473;
|
||||
create table db_mdev_16473.t1 (a int);
|
||||
insert into db_mdev_16473.t1 values (2), (7), (3), (1);
|
||||
with cte as (select * from db_mdev_16473.t1) select * from cte;
|
||||
|
||||
--error ER_NO_DB_ERROR
|
||||
with cte as (select * from db_mdev_16473.t1)
|
||||
select * from cte, t1 as t where cte.a=t.a;
|
||||
with cte as (select * from db_mdev_16473.t1)
|
||||
select * from cte, db_mdev_16473.t1 as t where cte.a=t.a;
|
||||
|
||||
drop database db_mdev_16473;
|
||||
|
||||
use test;
|
||||
|
|
|
@ -13402,6 +13402,145 @@ EXPLAIN
|
|||
}
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# MDEV-16517: pushdown condition with the IN predicate defined
|
||||
# with non-constant values
|
||||
#
|
||||
CREATE TABLE t1 (a INT, b INT);
|
||||
INSERT INTO t1 VALUES (1,2),(1,3);
|
||||
SELECT * FROM
|
||||
(
|
||||
SELECT t1.a
|
||||
FROM t1
|
||||
WHERE 1 IN (0,t1.a)
|
||||
GROUP BY t1.a
|
||||
) AS dt1
|
||||
JOIN
|
||||
(
|
||||
SELECT t1.a
|
||||
FROM t1
|
||||
WHERE 1 IN (0,t1.a)
|
||||
) AS dt2
|
||||
ON dt1.a = dt2.a;
|
||||
a a
|
||||
1 1
|
||||
1 1
|
||||
EXPLAIN FORMAT=JSON SELECT * FROM
|
||||
(
|
||||
SELECT t1.a
|
||||
FROM t1
|
||||
WHERE 1 IN (0,t1.a)
|
||||
GROUP BY t1.a
|
||||
) AS dt1
|
||||
JOIN
|
||||
(
|
||||
SELECT t1.a
|
||||
FROM t1
|
||||
WHERE 1 IN (0,t1.a)
|
||||
) AS dt2
|
||||
ON dt1.a = dt2.a;
|
||||
EXPLAIN
|
||||
{
|
||||
"query_block": {
|
||||
"select_id": 1,
|
||||
"table": {
|
||||
"table_name": "<derived2>",
|
||||
"access_type": "ALL",
|
||||
"rows": 2,
|
||||
"filtered": 100,
|
||||
"attached_condition": "1 in (0,dt1.a)",
|
||||
"materialized": {
|
||||
"query_block": {
|
||||
"select_id": 2,
|
||||
"filesort": {
|
||||
"sort_key": "t1.a",
|
||||
"temporary_table": {
|
||||
"table": {
|
||||
"table_name": "t1",
|
||||
"access_type": "ALL",
|
||||
"rows": 2,
|
||||
"filtered": 100,
|
||||
"attached_condition": "1 in (0,t1.a) and 1 in (0,t1.a)"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"block-nl-join": {
|
||||
"table": {
|
||||
"table_name": "t1",
|
||||
"access_type": "ALL",
|
||||
"rows": 2,
|
||||
"filtered": 100
|
||||
},
|
||||
"buffer_type": "flat",
|
||||
"buffer_size": "256Kb",
|
||||
"join_type": "BNL",
|
||||
"attached_condition": "t1.a = dt1.a"
|
||||
}
|
||||
}
|
||||
}
|
||||
SELECT * FROM
|
||||
(
|
||||
SELECT t1.a,MAX(t1.b)
|
||||
FROM t1
|
||||
GROUP BY t1.a
|
||||
) AS dt, t1
|
||||
WHERE dt.a=t1.a AND dt.a IN (1,t1.a);
|
||||
a MAX(t1.b) a b
|
||||
1 3 1 2
|
||||
1 3 1 3
|
||||
EXPLAIN FORMAT=JSON SELECT * FROM
|
||||
(
|
||||
SELECT t1.a,MAX(t1.b)
|
||||
FROM t1
|
||||
GROUP BY t1.a
|
||||
) AS dt, t1
|
||||
WHERE dt.a=t1.a AND dt.a IN (1,t1.a);
|
||||
EXPLAIN
|
||||
{
|
||||
"query_block": {
|
||||
"select_id": 1,
|
||||
"table": {
|
||||
"table_name": "<derived2>",
|
||||
"access_type": "ALL",
|
||||
"rows": 2,
|
||||
"filtered": 100,
|
||||
"attached_condition": "dt.a in (1,dt.a)",
|
||||
"materialized": {
|
||||
"query_block": {
|
||||
"select_id": 2,
|
||||
"filesort": {
|
||||
"sort_key": "t1.a",
|
||||
"temporary_table": {
|
||||
"table": {
|
||||
"table_name": "t1",
|
||||
"access_type": "ALL",
|
||||
"rows": 2,
|
||||
"filtered": 100,
|
||||
"attached_condition": "t1.a in (1,t1.a)"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"block-nl-join": {
|
||||
"table": {
|
||||
"table_name": "t1",
|
||||
"access_type": "ALL",
|
||||
"rows": 2,
|
||||
"filtered": 100
|
||||
},
|
||||
"buffer_type": "flat",
|
||||
"buffer_size": "256Kb",
|
||||
"join_type": "BNL",
|
||||
"attached_condition": "t1.a = dt.a"
|
||||
}
|
||||
}
|
||||
}
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# MDEV-10855: Pushdown into derived with window functions
|
||||
#
|
||||
set @save_optimizer_switch= @@optimizer_switch;
|
||||
|
|
|
@ -2176,7 +2176,7 @@ CREATE TABLE t2 (x INT, y INT, z INT);
|
|||
INSERT INTO t1 VALUES (1,1,66,1), (1,1,56,2), (3,2,42,3);
|
||||
INSERT INTO t2 VALUES (1,1,66), (1,12,32);
|
||||
|
||||
LET $query=
|
||||
let $query=
|
||||
SELECT *
|
||||
FROM t2,
|
||||
(
|
||||
|
@ -2187,11 +2187,11 @@ FROM t2,
|
|||
) AS v1
|
||||
WHERE (v1.a=1) AND (v1.b=v1.a) AND
|
||||
(v1.a=t2.x) AND (v1.max_c>30);
|
||||
EVAL $query;
|
||||
EVAL EXPLAIN $query;
|
||||
EVAL EXPLAIN FORMAT=JSON $query;
|
||||
eval $query;
|
||||
eval EXPLAIN $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
LET $query=
|
||||
let $query=
|
||||
SELECT *
|
||||
FROM t2,
|
||||
(
|
||||
|
@ -2202,9 +2202,9 @@ FROM t2,
|
|||
) AS v1
|
||||
WHERE (v1.a=1) AND (v1.b=v1.a) AND (v1.b=v1.d) AND
|
||||
(v1.a=t2.x) AND (v1.max_c>30);
|
||||
EVAL $query;
|
||||
EVAL EXPLAIN $query;
|
||||
EVAL EXPLAIN FORMAT=JSON $query;
|
||||
eval $query;
|
||||
eval EXPLAIN $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
DROP TABLE t1,t2;
|
||||
|
||||
|
@ -2230,7 +2230,7 @@ CREATE TABLE t2 (e INT, f INT, g INT);
|
|||
INSERT INTO t1 VALUES (1,14),(2,13),(1,19),(2,32),(3,24);
|
||||
INSERT INTO t2 VALUES (1,19,2),(3,24,1),(1,12,2),(3,11,3),(2,32,1);
|
||||
|
||||
LET $query=
|
||||
let $query=
|
||||
SELECT * FROM t1
|
||||
WHERE (t1.a,t1.b) IN
|
||||
(
|
||||
|
@ -2244,11 +2244,11 @@ WHERE (t1.a,t1.b) IN
|
|||
WHERE d_tab.e>1
|
||||
)
|
||||
;
|
||||
EVAL $query;
|
||||
EVAL EXPLAIN $query;
|
||||
EVAL EXPLAIN FORMAT=JSON $query;
|
||||
eval $query;
|
||||
eval EXPLAIN $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
LET $query=
|
||||
let $query=
|
||||
SELECT * FROM t1
|
||||
WHERE (t1.a,t1.b) IN
|
||||
(
|
||||
|
@ -2262,11 +2262,11 @@ WHERE (t1.a,t1.b) IN
|
|||
WHERE d_tab.max_f<25
|
||||
)
|
||||
;
|
||||
EVAL $query;
|
||||
EVAL EXPLAIN $query;
|
||||
EVAL EXPLAIN FORMAT=JSON $query;
|
||||
eval $query;
|
||||
eval EXPLAIN $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
LET $query=
|
||||
let $query=
|
||||
SELECT * FROM t1
|
||||
WHERE (t1.a,t1.b) IN
|
||||
(
|
||||
|
@ -2280,11 +2280,11 @@ WHERE (t1.a,t1.b) IN
|
|||
GROUP BY d_tab.g
|
||||
)
|
||||
;
|
||||
EVAL $query;
|
||||
EVAL EXPLAIN $query;
|
||||
EVAL EXPLAIN FORMAT=JSON $query;
|
||||
eval $query;
|
||||
eval EXPLAIN $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
LET $query=
|
||||
let $query=
|
||||
SELECT * FROM t1
|
||||
WHERE (t1.a,t1.b) IN
|
||||
(
|
||||
|
@ -2298,9 +2298,9 @@ WHERE (t1.a,t1.b) IN
|
|||
GROUP BY d_tab.g
|
||||
)
|
||||
;
|
||||
EVAL $query;
|
||||
EVAL EXPLAIN $query;
|
||||
EVAL EXPLAIN FORMAT=JSON $query;
|
||||
eval $query;
|
||||
eval EXPLAIN $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
DROP TABLE t1,t2;
|
||||
|
||||
|
@ -2329,7 +2329,7 @@ CREATE TABLE t1 (a INT, b INT);
|
|||
|
||||
INSERT INTO t1 VALUES (1,2),(2,3),(3,4);
|
||||
|
||||
LET $query=
|
||||
let $query=
|
||||
SELECT * FROM
|
||||
(
|
||||
SELECT t1.b AS a
|
||||
|
@ -2337,10 +2337,10 @@ SELECT * FROM
|
|||
GROUP BY t1.a
|
||||
) dt
|
||||
WHERE (dt.a=2);
|
||||
EVAL $query;
|
||||
EVAL EXPLAIN FORMAT=JSON $query;
|
||||
eval $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
LET $query=
|
||||
let $query=
|
||||
SELECT * FROM
|
||||
(
|
||||
SELECT t1.b AS a
|
||||
|
@ -2349,10 +2349,10 @@ SELECT * FROM
|
|||
HAVING (t1.a<3)
|
||||
) dt
|
||||
WHERE (dt.a>1);
|
||||
EVAL $query;
|
||||
EVAL EXPLAIN FORMAT=JSON $query;
|
||||
eval $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
LET $query=
|
||||
let $query=
|
||||
SELECT * FROM
|
||||
(
|
||||
SELECT 'ab' AS a
|
||||
|
@ -2360,10 +2360,10 @@ SELECT * FROM
|
|||
GROUP BY t1.a
|
||||
) dt
|
||||
WHERE (dt.a='ab');
|
||||
EVAL $query;
|
||||
EVAL EXPLAIN FORMAT=JSON $query;
|
||||
eval $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
LET $query=
|
||||
let $query=
|
||||
SELECT * FROM
|
||||
(
|
||||
SELECT 1 AS a
|
||||
|
@ -2371,11 +2371,49 @@ SELECT * FROM
|
|||
GROUP BY t1.a
|
||||
) dt
|
||||
WHERE (dt.a=1);
|
||||
EVAL $query;
|
||||
EVAL EXPLAIN FORMAT=JSON $query;
|
||||
eval $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-16517: pushdown condition with the IN predicate defined
|
||||
--echo # with non-constant values
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (a INT, b INT);
|
||||
INSERT INTO t1 VALUES (1,2),(1,3);
|
||||
|
||||
let $query=
|
||||
SELECT * FROM
|
||||
(
|
||||
SELECT t1.a
|
||||
FROM t1
|
||||
WHERE 1 IN (0,t1.a)
|
||||
GROUP BY t1.a
|
||||
) AS dt1
|
||||
JOIN
|
||||
(
|
||||
SELECT t1.a
|
||||
FROM t1
|
||||
WHERE 1 IN (0,t1.a)
|
||||
) AS dt2
|
||||
ON dt1.a = dt2.a;
|
||||
eval $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
|
||||
let $query=
|
||||
SELECT * FROM
|
||||
(
|
||||
SELECT t1.a,MAX(t1.b)
|
||||
FROM t1
|
||||
GROUP BY t1.a
|
||||
) AS dt, t1
|
||||
WHERE dt.a=t1.a AND dt.a IN (1,t1.a);
|
||||
eval $query;
|
||||
eval EXPLAIN FORMAT=JSON $query;
|
||||
DROP TABLE t1;
|
||||
|
||||
# Start of 10.3 tests
|
||||
|
||||
--echo #
|
||||
|
|
|
@ -739,6 +739,14 @@ drop table t1;
|
|||
select json_extract('{"test":8.437e-5}','$.test');
|
||||
json_extract('{"test":8.437e-5}','$.test')
|
||||
8.437e-5
|
||||
select json_value('{"b":true}','$.b')=1;
|
||||
json_value('{"b":true}','$.b')=1
|
||||
1
|
||||
CREATE TABLE t1 (c VARCHAR(8));
|
||||
INSERT INTO t1 VALUES ('foo'),('bar');
|
||||
SELECT * FROM t1 WHERE c IN (JSON_EXTRACT('{"a":"b"}', '$.*'));
|
||||
c
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# End of 10.2 tests
|
||||
#
|
||||
|
|
|
@ -397,6 +397,21 @@ drop table t1;
|
|||
|
||||
select json_extract('{"test":8.437e-5}','$.test');
|
||||
|
||||
#
|
||||
# MDEV-15905 select json_value('{"b":true}','$.b')=1 --> false with
|
||||
# "Truncated incorrect DOUBLE value: 'true'"
|
||||
#
|
||||
select json_value('{"b":true}','$.b')=1;
|
||||
|
||||
#
|
||||
# MDEV-16209 JSON_EXTRACT in query crashes server.
|
||||
#
|
||||
|
||||
CREATE TABLE t1 (c VARCHAR(8));
|
||||
INSERT INTO t1 VALUES ('foo'),('bar');
|
||||
SELECT * FROM t1 WHERE c IN (JSON_EXTRACT('{"a":"b"}', '$.*'));
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.2 tests
|
||||
--echo #
|
||||
|
|
|
@ -1451,6 +1451,7 @@ CURRENT_USER()
|
|||
root@localhost
|
||||
SET PASSWORD FOR CURRENT_USER() = PASSWORD("admin");
|
||||
SET PASSWORD FOR CURRENT_USER() = PASSWORD("");
|
||||
update mysql.user set plugin='';
|
||||
|
||||
# Bug#57952
|
||||
|
||||
|
|
|
@ -1265,6 +1265,9 @@ SELECT CURRENT_USER();
|
|||
SET PASSWORD FOR CURRENT_USER() = PASSWORD("admin");
|
||||
SET PASSWORD FOR CURRENT_USER() = PASSWORD("");
|
||||
|
||||
#cleanup after MDEV-16238
|
||||
update mysql.user set plugin='';
|
||||
|
||||
#
|
||||
# Bug#57952: privilege change is not taken into account by EXECUTE.
|
||||
#
|
||||
|
|
|
@ -372,8 +372,8 @@ mysqltest_1@127.0.0.1
|
|||
set password = password('changed');
|
||||
disconnect b12302;
|
||||
connection default;
|
||||
select host, length(password) from mysql.user where user like 'mysqltest\_1';
|
||||
host length(password)
|
||||
select host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
|
||||
host length(authentication_string)
|
||||
127.0.0.1 41
|
||||
revoke all on mysqltest_1.* from mysqltest_1@'127.0.0.1';
|
||||
delete from mysql.user where user like 'mysqltest\_1';
|
||||
|
@ -387,8 +387,8 @@ mysqltest_1@127.0.0.0/255.0.0.0
|
|||
set password = password('changed');
|
||||
disconnect b12302_2;
|
||||
connection default;
|
||||
select host, length(password) from mysql.user where user like 'mysqltest\_1';
|
||||
host length(password)
|
||||
select host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
|
||||
host length(authentication_string)
|
||||
127.0.0.0/255.0.0.0 41
|
||||
revoke all on mysqltest_1.* from mysqltest_1@'127.0.0.0/255.0.0.0';
|
||||
delete from mysql.user where user like 'mysqltest\_1';
|
||||
|
|
|
@ -385,7 +385,7 @@ select current_user();
|
|||
set password = password('changed');
|
||||
disconnect b12302;
|
||||
connection default;
|
||||
select host, length(password) from mysql.user where user like 'mysqltest\_1';
|
||||
select host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
|
||||
revoke all on mysqltest_1.* from mysqltest_1@'127.0.0.1';
|
||||
delete from mysql.user where user like 'mysqltest\_1';
|
||||
flush privileges;
|
||||
|
@ -396,7 +396,7 @@ select current_user();
|
|||
set password = password('changed');
|
||||
disconnect b12302_2;
|
||||
connection default;
|
||||
select host, length(password) from mysql.user where user like 'mysqltest\_1';
|
||||
select host, length(authentication_string) from mysql.user where user like 'mysqltest\_1';
|
||||
revoke all on mysqltest_1.* from mysqltest_1@'127.0.0.0/255.0.0.0';
|
||||
delete from mysql.user where user like 'mysqltest\_1';
|
||||
flush privileges;
|
||||
|
|
|
@ -711,6 +711,23 @@ a ct
|
|||
set sql_mode=@save_sql_mode;
|
||||
drop table t1;
|
||||
#
|
||||
# mdev-16235: impossible HAVING in query without aggregation
|
||||
#
|
||||
explain extended
|
||||
select * from mysql.help_topic where example = 'foo' having description is null;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible HAVING
|
||||
Warnings:
|
||||
Note 1003 select `mysql`.`help_topic`.`help_topic_id` AS `help_topic_id`,`mysql`.`help_topic`.`name` AS `name`,`mysql`.`help_topic`.`help_category_id` AS `help_category_id`,`mysql`.`help_topic`.`description` AS `description`,`mysql`.`help_topic`.`example` AS `example`,`mysql`.`help_topic`.`url` AS `url` from `mysql`.`help_topic` where `mysql`.`help_topic`.`example` = 'foo' having 0
|
||||
select * from mysql.help_topic where example = 'foo' having description is null;
|
||||
help_topic_id name help_category_id description example url
|
||||
#
|
||||
# End of 5. tests
|
||||
#
|
||||
#
|
||||
# Start of 10.0 tests
|
||||
#
|
||||
#
|
||||
# Bug mdev-5160: two-way join with HAVING over the second table
|
||||
#
|
||||
CREATE TABLE t1 (c1 varchar(6)) ENGINE=MyISAM;
|
||||
|
|
|
@ -745,6 +745,23 @@ set sql_mode=@save_sql_mode;
|
|||
|
||||
drop table t1;
|
||||
|
||||
--echo #
|
||||
--echo # mdev-16235: impossible HAVING in query without aggregation
|
||||
--echo #
|
||||
|
||||
explain extended
|
||||
select * from mysql.help_topic where example = 'foo' having description is null;
|
||||
|
||||
select * from mysql.help_topic where example = 'foo' having description is null;
|
||||
|
||||
--echo #
|
||||
--echo # End of 5. tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # Start of 10.0 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # Bug mdev-5160: two-way join with HAVING over the second table
|
||||
--echo #
|
||||
|
|
|
@ -1489,7 +1489,7 @@ USE test;
|
|||
End of 5.0 tests.
|
||||
select * from information_schema.engines WHERE ENGINE="MyISAM";
|
||||
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
|
||||
MyISAM DEFAULT MyISAM storage engine NO NO NO
|
||||
MyISAM DEFAULT Non-transactional engine with good performance and small data footprint NO NO NO
|
||||
grant select on *.* to user3148@localhost;
|
||||
connect con3148,localhost,user3148,,test;
|
||||
connection con3148;
|
||||
|
|
|
@ -146,3 +146,19 @@ a
|
|||
16
|
||||
DROP TABLE t1;
|
||||
End of 5.1 tests
|
||||
#
|
||||
# mdev-16235: SELECT over a table with LIMIT 0
|
||||
#
|
||||
EXPLAIN
|
||||
SELECT * FROM mysql.slow_log WHERE sql_text != 'foo' LIMIT 0;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Zero limit
|
||||
SELECT * FROM mysql.slow_log WHERE sql_text != 'foo' LIMIT 0;
|
||||
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text thread_id rows_affected
|
||||
EXPLAIN
|
||||
SELECT * FROM mysql.help_topic WHERE help_category_id != example LIMIT 0;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Zero limit
|
||||
SELECT * FROM mysql.help_topic WHERE help_category_id != example LIMIT 0;
|
||||
help_topic_id name help_category_id description example url
|
||||
End of 5.5 tests
|
||||
|
|
|
@ -115,3 +115,17 @@ SELECT a FROM t1 ORDER BY a LIMIT 2 OFFSET 14;
|
|||
DROP TABLE t1;
|
||||
|
||||
--echo End of 5.1 tests
|
||||
|
||||
--echo #
|
||||
--echo # mdev-16235: SELECT over a table with LIMIT 0
|
||||
--echo #
|
||||
|
||||
EXPLAIN
|
||||
SELECT * FROM mysql.slow_log WHERE sql_text != 'foo' LIMIT 0;
|
||||
SELECT * FROM mysql.slow_log WHERE sql_text != 'foo' LIMIT 0;
|
||||
|
||||
EXPLAIN
|
||||
SELECT * FROM mysql.help_topic WHERE help_category_id != example LIMIT 0;
|
||||
SELECT * FROM mysql.help_topic WHERE help_category_id != example LIMIT 0;
|
||||
|
||||
--echo End of 5.5 tests
|
||||
|
|
|
@ -406,7 +406,7 @@ LOCK TABLE t1 WRITE;
|
|||
HANDLER t1 OPEN;
|
||||
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
|
||||
HANDLER t1 READ FIRST;
|
||||
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
|
||||
Got one of the listed errors
|
||||
HANDLER t1 CLOSE;
|
||||
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
|
||||
UNLOCK TABLES;
|
||||
|
|
|
@ -474,7 +474,7 @@ LOCK TABLE t1 WRITE;
|
|||
--echo # HANDLER commands are not allowed in LOCK TABLES mode
|
||||
--error ER_LOCK_OR_ACTIVE_TRANSACTION
|
||||
HANDLER t1 OPEN;
|
||||
--error ER_LOCK_OR_ACTIVE_TRANSACTION
|
||||
--error ER_LOCK_OR_ACTIVE_TRANSACTION,ER_UNKNOWN_TABLE
|
||||
HANDLER t1 READ FIRST;
|
||||
--error ER_LOCK_OR_ACTIVE_TRANSACTION
|
||||
HANDLER t1 CLOSE;
|
||||
|
|
|
@ -181,3 +181,6 @@ ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
|
|||
set max_statement_time = 0;
|
||||
drop procedure pr;
|
||||
drop table t1;
|
||||
SET max_statement_time= 1;
|
||||
CREATE TABLE t ENGINE=InnoDB SELECT * FROM seq_1_to_50000;
|
||||
ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
--source include/not_embedded.inc
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_sequence.inc
|
||||
--source include/not_valgrind.inc
|
||||
|
||||
--echo
|
||||
|
@ -226,3 +227,10 @@ call pr();
|
|||
set max_statement_time = 0;
|
||||
drop procedure pr;
|
||||
drop table t1;
|
||||
|
||||
#
|
||||
# MDEV-16615 ASAN SEGV in handler::print_error or server crash after error upon CREATE TABLE
|
||||
#
|
||||
SET max_statement_time= 1;
|
||||
--error ER_STATEMENT_TIMEOUT
|
||||
CREATE TABLE t ENGINE=InnoDB SELECT * FROM seq_1_to_50000;
|
||||
|
|
|
@ -5608,6 +5608,21 @@ DROP DATABASE db1;
|
|||
DROP DATABASE db2;
|
||||
FOUND 1 /Database: mysql/ in bug11505.sql
|
||||
#
|
||||
# MDEV-15021: Fix the order in which routines are called
|
||||
#
|
||||
use test;
|
||||
CREATE FUNCTION f() RETURNS INT RETURN 1;
|
||||
CREATE VIEW v1 AS SELECT f();
|
||||
# Running mysqldump -uroot test --routines --tables v1 > **vardir**/test.dmp
|
||||
DROP VIEW v1;
|
||||
DROP FUNCTION f;
|
||||
# Running mysql -uroot test < **vardir**/test.dmp
|
||||
#
|
||||
# Cleanup after succesful import.
|
||||
#
|
||||
DROP VIEW v1;
|
||||
DROP FUNCTION f;
|
||||
#
|
||||
# Test for --add-drop-trigger
|
||||
#
|
||||
use test;
|
||||
|
|
|
@ -2644,6 +2644,28 @@ let SEARCH_PATTERN=Database: mysql;
|
|||
exec $MYSQL_DUMP mysql func > $SEARCH_FILE;
|
||||
source include/search_pattern_in_file.inc;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-15021: Fix the order in which routines are called
|
||||
--echo #
|
||||
use test;
|
||||
CREATE FUNCTION f() RETURNS INT RETURN 1;
|
||||
CREATE VIEW v1 AS SELECT f();
|
||||
|
||||
--echo # Running mysqldump -uroot test --routines --tables v1 > **vardir**/test.dmp
|
||||
--exec $MYSQL_DUMP -uroot test --routines --tables v1 > $MYSQLTEST_VARDIR/test.dmp
|
||||
|
||||
DROP VIEW v1;
|
||||
DROP FUNCTION f;
|
||||
|
||||
--echo # Running mysql -uroot test < **vardir**/test.dmp
|
||||
--exec $MYSQL -uroot test < $MYSQLTEST_VARDIR/test.dmp
|
||||
|
||||
--echo #
|
||||
--echo # Cleanup after succesful import.
|
||||
--echo #
|
||||
DROP VIEW v1;
|
||||
DROP FUNCTION f;
|
||||
|
||||
--echo #
|
||||
--echo # Test for --add-drop-trigger
|
||||
--echo #
|
||||
|
|
|
@ -255,3 +255,6 @@ Benchmark
|
|||
# MDEV-4684 - Enhancement request: --init-command support for mysqlslap
|
||||
#
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# Bug MDEV-15789 (Upstream: #80329): MYSQLSLAP OPTIONS --AUTO-GENERATE-SQL-GUID-PRIMARY and --AUTO-GENERATE-SQL-SECONDARY-INDEXES DONT WORK
|
||||
#
|
||||
|
|
|
@ -80,3 +80,11 @@ DROP DATABASE bug58090;
|
|||
|
||||
--exec $MYSQL_SLAP --create-schema=test --init-command="CREATE TABLE t1(a INT)" --silent --concurrency=1 --iterations=1
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # Bug MDEV-15789 (Upstream: #80329): MYSQLSLAP OPTIONS --AUTO-GENERATE-SQL-GUID-PRIMARY and --AUTO-GENERATE-SQL-SECONDARY-INDEXES DONT WORK
|
||||
--echo #
|
||||
|
||||
--exec $MYSQL_SLAP --concurrency=1 --silent --iterations=1 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --auto-generate-sql-guid-primary --create-schema=slap
|
||||
|
||||
--exec $MYSQL_SLAP --concurrency=1 --silent --iterations=1 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --auto-generate-sql-secondary-indexes=1 --create-schema=slap
|
||||
|
|
31
mysql-test/main/mysqltest_tracking_info.result
Normal file
31
mysql-test/main/mysqltest_tracking_info.result
Normal file
|
@ -0,0 +1,31 @@
|
|||
SELECT @@session.character_set_connection;
|
||||
@@session.character_set_connection
|
||||
latin1
|
||||
SET @@session.session_track_system_variables='character_set_connection';
|
||||
# tracking info on
|
||||
SET NAMES 'utf8';
|
||||
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
|
||||
-- character_set_connection
|
||||
-- utf8
|
||||
|
||||
SET NAMES 'big5';
|
||||
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
|
||||
-- character_set_connection
|
||||
-- big5
|
||||
|
||||
# tracking info on once
|
||||
SET NAMES 'utf8';
|
||||
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
|
||||
-- character_set_connection
|
||||
-- utf8
|
||||
|
||||
SET NAMES 'big5';
|
||||
# tracking info on
|
||||
SET NAMES 'utf8';
|
||||
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
|
||||
-- character_set_connection
|
||||
-- utf8
|
||||
|
||||
# tracking info off once
|
||||
SET NAMES 'big5';
|
||||
SET @@session.session_track_system_variables= default;
|
25
mysql-test/main/mysqltest_tracking_info.test
Normal file
25
mysql-test/main/mysqltest_tracking_info.test
Normal file
|
@ -0,0 +1,25 @@
|
|||
|
||||
--source include/no_protocol.inc
|
||||
--source include/not_embedded.inc
|
||||
|
||||
SELECT @@session.character_set_connection;
|
||||
SET @@session.session_track_system_variables='character_set_connection';
|
||||
|
||||
--echo # tracking info on
|
||||
--enable_session_track_info
|
||||
SET NAMES 'utf8';
|
||||
SET NAMES 'big5';
|
||||
--disable_session_track_info
|
||||
--echo # tracking info on once
|
||||
--enable_session_track_info ONCE
|
||||
SET NAMES 'utf8';
|
||||
SET NAMES 'big5';
|
||||
--echo # tracking info on
|
||||
--enable_session_track_info
|
||||
SET NAMES 'utf8';
|
||||
--echo # tracking info off once
|
||||
--disable_session_track_info ONCE
|
||||
SET NAMES 'big5';
|
||||
--disable_session_track_info
|
||||
|
||||
SET @@session.session_track_system_variables= default;
|
|
@ -767,7 +767,29 @@ NULL
|
|||
DROP TABLE t1, t2;
|
||||
End of 5.0 tests
|
||||
#
|
||||
# Start of 10.3 tests
|
||||
# End of 10.0 tests
|
||||
#
|
||||
#
|
||||
# MDEV-16190 Server crashes in Item_null_result::field_type on SELECT with time field, ROLLUP and HAVING
|
||||
#
|
||||
CREATE TABLE t1 (t TIME) ENGINE=MyISAM;
|
||||
INSERT INTO t1 VALUES ('12:12:12');
|
||||
SELECT t, COUNT(*) FROM t1 GROUP BY t WITH ROLLUP HAVING t > '00:00:00';
|
||||
t COUNT(*)
|
||||
12:12:12 1
|
||||
DROP TABLE t1;
|
||||
CREATE TABLE t1 (t TIME) ENGINE=MyISAM;
|
||||
INSERT INTO t1 VALUES ('12:12:12'),('12:12:13');
|
||||
SELECT t, COUNT(*) FROM t1 GROUP BY t WITH ROLLUP HAVING t > '00:00:00';
|
||||
t COUNT(*)
|
||||
12:12:12 1
|
||||
12:12:13 1
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# End of 10.1 tests
|
||||
#
|
||||
#
|
||||
# End of 10.2 tests
|
||||
#
|
||||
#
|
||||
# MDEV-12886 Different default for INT and BIGINT column in a VIEW for a SELECT with ROLLUP
|
||||
|
|
|
@ -406,7 +406,29 @@ DROP TABLE t1, t2;
|
|||
--echo End of 5.0 tests
|
||||
|
||||
--echo #
|
||||
--echo # Start of 10.3 tests
|
||||
--echo # End of 10.0 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-16190 Server crashes in Item_null_result::field_type on SELECT with time field, ROLLUP and HAVING
|
||||
--echo #
|
||||
CREATE TABLE t1 (t TIME) ENGINE=MyISAM;
|
||||
INSERT INTO t1 VALUES ('12:12:12');
|
||||
SELECT t, COUNT(*) FROM t1 GROUP BY t WITH ROLLUP HAVING t > '00:00:00';
|
||||
DROP TABLE t1;
|
||||
|
||||
CREATE TABLE t1 (t TIME) ENGINE=MyISAM;
|
||||
INSERT INTO t1 VALUES ('12:12:12'),('12:12:13');
|
||||
SELECT t, COUNT(*) FROM t1 GROUP BY t WITH ROLLUP HAVING t > '00:00:00';
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.1 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.2 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
|
@ -462,5 +484,4 @@ SELECT NULLIF( CAST( 'foo' AS DATE ), NULL & 'bar' ) AS f FROM t1 GROUP BY f WIT
|
|||
--enable_warnings
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
--echo # End of 10.3 Tests
|
||||
|
|
|
@ -4368,7 +4368,46 @@ LINE3 3
|
|||
drop table t1;
|
||||
# End of 5.5 tests
|
||||
#
|
||||
# Start of 10.2 tests
|
||||
# End of 10.0 tests
|
||||
#
|
||||
#
|
||||
# MDEV-12060 Crash in EXECUTE IMMEDIATE with an expression returning a GRANT command
|
||||
# (the 10.1 part)
|
||||
#
|
||||
CREATE PROCEDURE p2 ()
|
||||
BEGIN
|
||||
SET STATEMENT join_cache_level=CAST(CONCAT(_utf8'6',_latin1'') AS INT) FOR PREPARE stmt FROM 'SELECT 1';
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
END;
|
||||
/
|
||||
CALL p2();
|
||||
1
|
||||
1
|
||||
DROP PROCEDURE p2;
|
||||
BEGIN NOT ATOMIC
|
||||
SET STATEMENT join_cache_level=CAST(CONCAT(_utf8'6',_latin1'') AS INT) FOR PREPARE stmt FROM 'SELECT 1';
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
END;
|
||||
/
|
||||
1
|
||||
1
|
||||
BEGIN NOT ATOMIC
|
||||
SET STATEMENT join_cache_level=CAST(CONCAT(_utf8'6',_latin1'') AS INT) FOR PREPARE stmt FROM 'SELECT 1';
|
||||
DEALLOCATE PREPARE stmt;
|
||||
END;
|
||||
/
|
||||
BEGIN NOT ATOMIC
|
||||
PREPARE stmt FROM 'SELECT 1';
|
||||
SET STATEMENT join_cache_level=CAST(CONCAT(_utf8'6',_latin1'') AS INT) FOR EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
END;
|
||||
/
|
||||
1
|
||||
1
|
||||
#
|
||||
# End of 10.1 tests
|
||||
#
|
||||
#
|
||||
# MDEV-10709 Expressions as parameters to Dynamic SQL
|
||||
|
|
|
@ -3875,7 +3875,58 @@ drop table t1;
|
|||
--echo # End of 5.5 tests
|
||||
|
||||
--echo #
|
||||
--echo # Start of 10.2 tests
|
||||
--echo # End of 10.0 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-12060 Crash in EXECUTE IMMEDIATE with an expression returning a GRANT command
|
||||
--echo # (the 10.1 part)
|
||||
--echo #
|
||||
|
||||
DELIMITER /;
|
||||
CREATE PROCEDURE p2 ()
|
||||
BEGIN
|
||||
SET STATEMENT join_cache_level=CAST(CONCAT(_utf8'6',_latin1'') AS INT) FOR PREPARE stmt FROM 'SELECT 1';
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
END;
|
||||
/
|
||||
DELIMITER ;/
|
||||
CALL p2();
|
||||
DROP PROCEDURE p2;
|
||||
|
||||
|
||||
DELIMITER /;
|
||||
BEGIN NOT ATOMIC
|
||||
SET STATEMENT join_cache_level=CAST(CONCAT(_utf8'6',_latin1'') AS INT) FOR PREPARE stmt FROM 'SELECT 1';
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
END;
|
||||
/
|
||||
DELIMITER ;/
|
||||
|
||||
|
||||
DELIMITER /;
|
||||
BEGIN NOT ATOMIC
|
||||
SET STATEMENT join_cache_level=CAST(CONCAT(_utf8'6',_latin1'') AS INT) FOR PREPARE stmt FROM 'SELECT 1';
|
||||
DEALLOCATE PREPARE stmt;
|
||||
END;
|
||||
/
|
||||
DELIMITER ;/
|
||||
|
||||
|
||||
DELIMITER /;
|
||||
BEGIN NOT ATOMIC
|
||||
PREPARE stmt FROM 'SELECT 1';
|
||||
SET STATEMENT join_cache_level=CAST(CONCAT(_utf8'6',_latin1'') AS INT) FOR EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
END;
|
||||
/
|
||||
DELIMITER ;/
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.1 tests
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
|
@ -4733,7 +4784,6 @@ DROP PROCEDURE p2;
|
|||
DROP PROCEDURE p1;
|
||||
DROP ROLE testrole;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.2 tests
|
||||
--echo #
|
||||
|
|
|
@ -237,14 +237,6 @@ a a
|
|||
5 10
|
||||
DROP TABLE temp1, temp2;
|
||||
|
||||
# MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only and InnoDB.
|
||||
|
||||
CREATE TEMPORARY TABLE temp1 ENGINE=INNODB AS SELECT a FROM t1;
|
||||
SELECT * FROM temp1;
|
||||
a
|
||||
1
|
||||
DROP TABLE temp1;
|
||||
|
||||
# Disconnect and cleanup
|
||||
|
||||
disconnect con1;
|
||||
|
|
|
@ -240,15 +240,6 @@ UPDATE temp1,temp2 SET temp1.a = 5, temp2.a = 10;
|
|||
SELECT * FROM temp1, temp2;
|
||||
DROP TABLE temp1, temp2;
|
||||
|
||||
--echo
|
||||
--echo # MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only and InnoDB.
|
||||
--echo
|
||||
|
||||
CREATE TEMPORARY TABLE temp1 ENGINE=INNODB AS SELECT a FROM t1;
|
||||
SELECT * FROM temp1;
|
||||
DROP TABLE temp1;
|
||||
|
||||
|
||||
--echo
|
||||
--echo # Disconnect and cleanup
|
||||
--echo
|
||||
|
|
7
mysql-test/main/reset_connection.result
Normal file
7
mysql-test/main/reset_connection.result
Normal file
|
@ -0,0 +1,7 @@
|
|||
FLUSH STATUS;
|
||||
SHOW local STATUS LIKE 'com_select';
|
||||
Variable_name Value
|
||||
Com_select 10
|
||||
SHOW local STATUS LIKE 'com_select';
|
||||
Variable_name Value
|
||||
Com_select 0
|
25
mysql-test/main/reset_connection.test
Normal file
25
mysql-test/main/reset_connection.test
Normal file
|
@ -0,0 +1,25 @@
|
|||
--source include/not_embedded.inc
|
||||
|
||||
FLUSH STATUS;
|
||||
|
||||
--disable_result_log
|
||||
--disable_query_log
|
||||
|
||||
let $i = 10;
|
||||
begin;
|
||||
while ($i)
|
||||
{
|
||||
dec $i;
|
||||
SELECT 1;
|
||||
}
|
||||
commit;
|
||||
|
||||
--enable_query_log
|
||||
--enable_result_log
|
||||
|
||||
SHOW local STATUS LIKE 'com_select';
|
||||
|
||||
--reset_connection
|
||||
|
||||
SHOW local STATUS LIKE 'com_select';
|
||||
|
|
@ -356,13 +356,13 @@ and o_orderkey = l_orderkey
|
|||
group by c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice
|
||||
order by o_totalprice desc, o_orderdate;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 6005 0.00 Using temporary; Using filesort
|
||||
1 PRIMARY orders eq_ref PRIMARY,i_o_custkey PRIMARY 4 <subquery2>.l_orderkey 1 100.00 Using where
|
||||
1 PRIMARY orders ALL PRIMARY,i_o_custkey NULL NULL NULL 1500 100.00 Using where; Using temporary; Using filesort
|
||||
1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 dbt3_s001.orders.o_orderkey 1 100.00
|
||||
1 PRIMARY customer eq_ref PRIMARY PRIMARY 4 dbt3_s001.orders.o_custkey 1 100.00
|
||||
1 PRIMARY lineitem ref PRIMARY,i_l_orderkey,i_l_orderkey_quantity PRIMARY 4 <subquery2>.l_orderkey 4 100.00
|
||||
1 PRIMARY lineitem ref PRIMARY,i_l_orderkey,i_l_orderkey_quantity i_l_orderkey_quantity 4 dbt3_s001.orders.o_orderkey 4 100.00 Using index
|
||||
2 MATERIALIZED lineitem index NULL i_l_orderkey_quantity 13 NULL 6005 100.00 Using index
|
||||
Warnings:
|
||||
Note 1003 /* select#1 */ select `dbt3_s001`.`customer`.`c_name` AS `c_name`,`dbt3_s001`.`customer`.`c_custkey` AS `c_custkey`,`dbt3_s001`.`orders`.`o_orderkey` AS `o_orderkey`,`dbt3_s001`.`orders`.`o_orderDATE` AS `o_orderdate`,`dbt3_s001`.`orders`.`o_totalprice` AS `o_totalprice`,sum(`dbt3_s001`.`lineitem`.`l_quantity`) AS `sum(l_quantity)` from <materialize> (/* select#2 */ select `dbt3_s001`.`lineitem`.`l_orderkey` from `dbt3_s001`.`lineitem` group by `dbt3_s001`.`lineitem`.`l_orderkey` having sum(`dbt3_s001`.`lineitem`.`l_quantity`) > 250) join `dbt3_s001`.`customer` join `dbt3_s001`.`orders` join `dbt3_s001`.`lineitem` where `dbt3_s001`.`customer`.`c_custkey` = `dbt3_s001`.`orders`.`o_custkey` and `dbt3_s001`.`orders`.`o_orderkey` = `<subquery2>`.`l_orderkey` and `dbt3_s001`.`lineitem`.`l_orderkey` = `<subquery2>`.`l_orderkey` group by `dbt3_s001`.`customer`.`c_name`,`dbt3_s001`.`customer`.`c_custkey`,`dbt3_s001`.`orders`.`o_orderkey`,`dbt3_s001`.`orders`.`o_orderDATE`,`dbt3_s001`.`orders`.`o_totalprice` order by `dbt3_s001`.`orders`.`o_totalprice` desc,`dbt3_s001`.`orders`.`o_orderDATE`
|
||||
Note 1003 /* select#1 */ select `dbt3_s001`.`customer`.`c_name` AS `c_name`,`dbt3_s001`.`customer`.`c_custkey` AS `c_custkey`,`dbt3_s001`.`orders`.`o_orderkey` AS `o_orderkey`,`dbt3_s001`.`orders`.`o_orderDATE` AS `o_orderdate`,`dbt3_s001`.`orders`.`o_totalprice` AS `o_totalprice`,sum(`dbt3_s001`.`lineitem`.`l_quantity`) AS `sum(l_quantity)` from <materialize> (/* select#2 */ select `dbt3_s001`.`lineitem`.`l_orderkey` from `dbt3_s001`.`lineitem` group by `dbt3_s001`.`lineitem`.`l_orderkey` having sum(`dbt3_s001`.`lineitem`.`l_quantity`) > 250) join `dbt3_s001`.`customer` join `dbt3_s001`.`orders` join `dbt3_s001`.`lineitem` where `dbt3_s001`.`customer`.`c_custkey` = `dbt3_s001`.`orders`.`o_custkey` and `<subquery2>`.`l_orderkey` = `dbt3_s001`.`orders`.`o_orderkey` and `dbt3_s001`.`lineitem`.`l_orderkey` = `dbt3_s001`.`orders`.`o_orderkey` group by `dbt3_s001`.`customer`.`c_name`,`dbt3_s001`.`customer`.`c_custkey`,`dbt3_s001`.`orders`.`o_orderkey`,`dbt3_s001`.`orders`.`o_orderDATE`,`dbt3_s001`.`orders`.`o_totalprice` order by `dbt3_s001`.`orders`.`o_totalprice` desc,`dbt3_s001`.`orders`.`o_orderDATE`
|
||||
select
|
||||
c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, sum(l_quantity)
|
||||
from customer, orders, lineitem
|
||||
|
@ -1530,6 +1530,68 @@ t
|
|||
10:00:00
|
||||
11:00:00
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# MDEV-16374: filtered shows 0 for materilization scan for a semi join, which makes optimizer
|
||||
# always pick materialization scan over materialization lookup
|
||||
#
|
||||
create table t0(a int);
|
||||
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
|
||||
create table t1 (a int, b int);
|
||||
insert into t1 values (0,0),(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),
|
||||
(11,11),(12,12),(13,13),(14,14),(15,15);
|
||||
set @@optimizer_use_condition_selectivity=2;
|
||||
explain extended select * from t1 where a in (select max(a) from t1 group by b);
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 PRIMARY t1 ALL NULL NULL NULL NULL 16 100.00 Using where
|
||||
1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 test.t1.a 1 100.00
|
||||
2 MATERIALIZED t1 ALL NULL NULL NULL NULL 16 100.00 Using temporary
|
||||
Warnings:
|
||||
Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from <materialize> (/* select#2 */ select max(`test`.`t1`.`a`) from `test`.`t1` group by `test`.`t1`.`b`) join `test`.`t1` where `<subquery2>`.`max(a)` = `test`.`t1`.`a`
|
||||
select * from t1 where a in (select max(a) from t1 group by b);
|
||||
a b
|
||||
0 0
|
||||
1 1
|
||||
2 2
|
||||
3 3
|
||||
4 4
|
||||
5 5
|
||||
6 6
|
||||
7 7
|
||||
8 8
|
||||
9 9
|
||||
10 10
|
||||
11 11
|
||||
12 12
|
||||
13 13
|
||||
14 14
|
||||
15 15
|
||||
set @@optimizer_use_condition_selectivity=1;
|
||||
explain extended select * from t1 where a in (select max(a) from t1 group by b);
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 PRIMARY t1 ALL NULL NULL NULL NULL 16 100.00 Using where
|
||||
1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 test.t1.a 1 100.00
|
||||
2 MATERIALIZED t1 ALL NULL NULL NULL NULL 16 100.00 Using temporary
|
||||
Warnings:
|
||||
Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from <materialize> (/* select#2 */ select max(`test`.`t1`.`a`) from `test`.`t1` group by `test`.`t1`.`b`) join `test`.`t1` where `<subquery2>`.`max(a)` = `test`.`t1`.`a`
|
||||
select * from t1 where a in (select max(a) from t1 group by b);
|
||||
a b
|
||||
0 0
|
||||
1 1
|
||||
2 2
|
||||
3 3
|
||||
4 4
|
||||
5 5
|
||||
6 6
|
||||
7 7
|
||||
8 8
|
||||
9 9
|
||||
10 10
|
||||
11 11
|
||||
12 12
|
||||
13 13
|
||||
14 14
|
||||
15 15
|
||||
drop table t1,t0;
|
||||
set histogram_size=@save_histogram_size;
|
||||
set optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity;
|
||||
set use_stat_tables=@save_use_stat_tables;
|
||||
|
|
|
@ -1045,6 +1045,24 @@ SELECT * FROM (SELECT t FROM t1 WHERE d IS NULL) sq;
|
|||
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-16374: filtered shows 0 for materilization scan for a semi join, which makes optimizer
|
||||
--echo # always pick materialization scan over materialization lookup
|
||||
--echo #
|
||||
|
||||
create table t0(a int);
|
||||
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
|
||||
create table t1 (a int, b int);
|
||||
insert into t1 values (0,0),(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),
|
||||
(11,11),(12,12),(13,13),(14,14),(15,15);
|
||||
set @@optimizer_use_condition_selectivity=2;
|
||||
explain extended select * from t1 where a in (select max(a) from t1 group by b);
|
||||
select * from t1 where a in (select max(a) from t1 group by b);
|
||||
set @@optimizer_use_condition_selectivity=1;
|
||||
explain extended select * from t1 where a in (select max(a) from t1 group by b);
|
||||
select * from t1 where a in (select max(a) from t1 group by b);
|
||||
drop table t1,t0;
|
||||
|
||||
set histogram_size=@save_histogram_size;
|
||||
set optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity;
|
||||
set use_stat_tables=@save_use_stat_tables;
|
||||
|
|
|
@ -359,13 +359,13 @@ and o_orderkey = l_orderkey
|
|||
group by c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice
|
||||
order by o_totalprice desc, o_orderdate;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 6005 0.00 Using temporary; Using filesort
|
||||
1 PRIMARY orders eq_ref PRIMARY,i_o_custkey PRIMARY 4 <subquery2>.l_orderkey 1 100.00 Using where
|
||||
1 PRIMARY orders ALL PRIMARY,i_o_custkey NULL NULL NULL 1500 100.00 Using where; Using temporary; Using filesort
|
||||
1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 dbt3_s001.orders.o_orderkey 1 100.00
|
||||
1 PRIMARY customer eq_ref PRIMARY PRIMARY 4 dbt3_s001.orders.o_custkey 1 100.00
|
||||
1 PRIMARY lineitem ref PRIMARY,i_l_orderkey,i_l_orderkey_quantity PRIMARY 4 <subquery2>.l_orderkey 4 100.00
|
||||
1 PRIMARY lineitem ref PRIMARY,i_l_orderkey,i_l_orderkey_quantity i_l_orderkey_quantity 4 dbt3_s001.orders.o_orderkey 4 100.00 Using index
|
||||
2 MATERIALIZED lineitem index NULL PRIMARY 8 NULL 6005 100.00
|
||||
Warnings:
|
||||
Note 1003 /* select#1 */ select `dbt3_s001`.`customer`.`c_name` AS `c_name`,`dbt3_s001`.`customer`.`c_custkey` AS `c_custkey`,`dbt3_s001`.`orders`.`o_orderkey` AS `o_orderkey`,`dbt3_s001`.`orders`.`o_orderDATE` AS `o_orderdate`,`dbt3_s001`.`orders`.`o_totalprice` AS `o_totalprice`,sum(`dbt3_s001`.`lineitem`.`l_quantity`) AS `sum(l_quantity)` from <materialize> (/* select#2 */ select `dbt3_s001`.`lineitem`.`l_orderkey` from `dbt3_s001`.`lineitem` group by `dbt3_s001`.`lineitem`.`l_orderkey` having sum(`dbt3_s001`.`lineitem`.`l_quantity`) > 250) join `dbt3_s001`.`customer` join `dbt3_s001`.`orders` join `dbt3_s001`.`lineitem` where `dbt3_s001`.`customer`.`c_custkey` = `dbt3_s001`.`orders`.`o_custkey` and `dbt3_s001`.`orders`.`o_orderkey` = `<subquery2>`.`l_orderkey` and `dbt3_s001`.`lineitem`.`l_orderkey` = `<subquery2>`.`l_orderkey` group by `dbt3_s001`.`customer`.`c_name`,`dbt3_s001`.`customer`.`c_custkey`,`dbt3_s001`.`orders`.`o_orderkey`,`dbt3_s001`.`orders`.`o_orderDATE`,`dbt3_s001`.`orders`.`o_totalprice` order by `dbt3_s001`.`orders`.`o_totalprice` desc,`dbt3_s001`.`orders`.`o_orderDATE`
|
||||
Note 1003 /* select#1 */ select `dbt3_s001`.`customer`.`c_name` AS `c_name`,`dbt3_s001`.`customer`.`c_custkey` AS `c_custkey`,`dbt3_s001`.`orders`.`o_orderkey` AS `o_orderkey`,`dbt3_s001`.`orders`.`o_orderDATE` AS `o_orderdate`,`dbt3_s001`.`orders`.`o_totalprice` AS `o_totalprice`,sum(`dbt3_s001`.`lineitem`.`l_quantity`) AS `sum(l_quantity)` from <materialize> (/* select#2 */ select `dbt3_s001`.`lineitem`.`l_orderkey` from `dbt3_s001`.`lineitem` group by `dbt3_s001`.`lineitem`.`l_orderkey` having sum(`dbt3_s001`.`lineitem`.`l_quantity`) > 250) join `dbt3_s001`.`customer` join `dbt3_s001`.`orders` join `dbt3_s001`.`lineitem` where `dbt3_s001`.`customer`.`c_custkey` = `dbt3_s001`.`orders`.`o_custkey` and `<subquery2>`.`l_orderkey` = `dbt3_s001`.`orders`.`o_orderkey` and `dbt3_s001`.`lineitem`.`l_orderkey` = `dbt3_s001`.`orders`.`o_orderkey` group by `dbt3_s001`.`customer`.`c_name`,`dbt3_s001`.`customer`.`c_custkey`,`dbt3_s001`.`orders`.`o_orderkey`,`dbt3_s001`.`orders`.`o_orderDATE`,`dbt3_s001`.`orders`.`o_totalprice` order by `dbt3_s001`.`orders`.`o_totalprice` desc,`dbt3_s001`.`orders`.`o_orderDATE`
|
||||
select
|
||||
c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, sum(l_quantity)
|
||||
from customer, orders, lineitem
|
||||
|
@ -1541,6 +1541,68 @@ t
|
|||
10:00:00
|
||||
11:00:00
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# MDEV-16374: filtered shows 0 for materilization scan for a semi join, which makes optimizer
|
||||
# always pick materialization scan over materialization lookup
|
||||
#
|
||||
create table t0(a int);
|
||||
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
|
||||
create table t1 (a int, b int);
|
||||
insert into t1 values (0,0),(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),
|
||||
(11,11),(12,12),(13,13),(14,14),(15,15);
|
||||
set @@optimizer_use_condition_selectivity=2;
|
||||
explain extended select * from t1 where a in (select max(a) from t1 group by b);
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 PRIMARY t1 ALL NULL NULL NULL NULL 16 100.00 Using where
|
||||
1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 test.t1.a 1 100.00
|
||||
2 MATERIALIZED t1 ALL NULL NULL NULL NULL 16 100.00 Using temporary
|
||||
Warnings:
|
||||
Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from <materialize> (/* select#2 */ select max(`test`.`t1`.`a`) from `test`.`t1` group by `test`.`t1`.`b`) join `test`.`t1` where `<subquery2>`.`max(a)` = `test`.`t1`.`a`
|
||||
select * from t1 where a in (select max(a) from t1 group by b);
|
||||
a b
|
||||
0 0
|
||||
1 1
|
||||
2 2
|
||||
3 3
|
||||
4 4
|
||||
5 5
|
||||
6 6
|
||||
7 7
|
||||
8 8
|
||||
9 9
|
||||
10 10
|
||||
11 11
|
||||
12 12
|
||||
13 13
|
||||
14 14
|
||||
15 15
|
||||
set @@optimizer_use_condition_selectivity=1;
|
||||
explain extended select * from t1 where a in (select max(a) from t1 group by b);
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 PRIMARY t1 ALL NULL NULL NULL NULL 16 100.00 Using where
|
||||
1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 test.t1.a 1 100.00
|
||||
2 MATERIALIZED t1 ALL NULL NULL NULL NULL 16 100.00 Using temporary
|
||||
Warnings:
|
||||
Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from <materialize> (/* select#2 */ select max(`test`.`t1`.`a`) from `test`.`t1` group by `test`.`t1`.`b`) join `test`.`t1` where `<subquery2>`.`max(a)` = `test`.`t1`.`a`
|
||||
select * from t1 where a in (select max(a) from t1 group by b);
|
||||
a b
|
||||
0 0
|
||||
1 1
|
||||
2 2
|
||||
3 3
|
||||
4 4
|
||||
5 5
|
||||
6 6
|
||||
7 7
|
||||
8 8
|
||||
9 9
|
||||
10 10
|
||||
11 11
|
||||
12 12
|
||||
13 13
|
||||
14 14
|
||||
15 15
|
||||
drop table t1,t0;
|
||||
set histogram_size=@save_histogram_size;
|
||||
set optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity;
|
||||
set use_stat_tables=@save_use_stat_tables;
|
||||
|
|
34
mysql-test/main/session_tracker_last_gtid.result
Normal file
34
mysql-test/main/session_tracker_last_gtid.result
Normal file
|
@ -0,0 +1,34 @@
|
|||
#
|
||||
# MDEV-15477: SESSION_SYSVARS_TRACKER does not track last_gtid
|
||||
#
|
||||
SET gtid_seq_no=1000;
|
||||
SET @@session.session_track_system_variables='last_gtid';
|
||||
create table t1 (a int) engine=innodb;
|
||||
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
|
||||
-- last_gtid
|
||||
-- 0-1-1000
|
||||
|
||||
select @@last_gtid;
|
||||
@@last_gtid
|
||||
0-1-1000
|
||||
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
|
||||
-- last_gtid
|
||||
-- 0-1-1000
|
||||
|
||||
insert into t1 values (1);
|
||||
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
|
||||
-- last_gtid
|
||||
-- 0-1-1001
|
||||
|
||||
select @@last_gtid;
|
||||
@@last_gtid
|
||||
0-1-1001
|
||||
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
|
||||
-- last_gtid
|
||||
-- 0-1-1001
|
||||
|
||||
drop table t1;
|
||||
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
|
||||
-- last_gtid
|
||||
-- 0-1-1002
|
||||
|
19
mysql-test/main/session_tracker_last_gtid.test
Normal file
19
mysql-test/main/session_tracker_last_gtid.test
Normal file
|
@ -0,0 +1,19 @@
|
|||
--source include/not_embedded.inc
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_binlog_format_statement.inc
|
||||
|
||||
--enable_session_track_info
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-15477: SESSION_SYSVARS_TRACKER does not track last_gtid
|
||||
--echo #
|
||||
|
||||
SET gtid_seq_no=1000;
|
||||
SET @@session.session_track_system_variables='last_gtid';
|
||||
create table t1 (a int) engine=innodb;
|
||||
select @@last_gtid;
|
||||
insert into t1 values (1);
|
||||
select @@last_gtid;
|
||||
drop table t1;
|
||||
|
||||
--disable_session_track_info
|
|
@ -11,10 +11,10 @@ select user, host, password, plugin, authentication_string from mysql.user where
|
|||
user host password plugin authentication_string
|
||||
natauth localhost *94BDCEBE19083CE2A1F959FD02F964C7AF4CFC29
|
||||
newpass localhost *94BDCEBE19083CE2A1F959FD02F964C7AF4CFC29
|
||||
newpassnat localhost *94BDCEBE19083CE2A1F959FD02F964C7AF4CFC29
|
||||
newpassnat localhost mysql_native_password *94BDCEBE19083CE2A1F959FD02F964C7AF4CFC29
|
||||
oldauth localhost 378b243e220ca493
|
||||
oldpass localhost 378b243e220ca493
|
||||
oldpassold localhost 378b243e220ca493
|
||||
oldpassold localhost mysql_old_password 378b243e220ca493
|
||||
connect con,localhost,natauth,test,;
|
||||
select current_user();
|
||||
current_user()
|
||||
|
@ -86,12 +86,12 @@ set password for oldpass@localhost = PASSWORD('test2');
|
|||
set password for oldpassold@localhost = PASSWORD('test2');
|
||||
select user, host, password, plugin, authentication_string from mysql.user where user != 'root';
|
||||
user host password plugin authentication_string
|
||||
natauth localhost *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
newpass localhost *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
newpassnat localhost *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
oldauth localhost *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
oldpass localhost *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
oldpassold localhost *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
natauth localhost mysql_native_password *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
newpass localhost mysql_native_password *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
newpassnat localhost mysql_native_password *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
oldauth localhost mysql_native_password *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
oldpass localhost mysql_native_password *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
oldpassold localhost mysql_native_password *7CEB3FDE5F7A9C4CE5FBE610D7D8EDA62EBE5F4E
|
||||
connect con,localhost,natauth,test2,;
|
||||
select current_user();
|
||||
current_user()
|
||||
|
@ -158,3 +158,24 @@ connection default;
|
|||
drop user natauth@localhost, newpass@localhost, newpassnat@localhost;
|
||||
drop user oldauth@localhost, oldpass@localhost, oldpassold@localhost;
|
||||
set global secure_auth=default;
|
||||
create user foo@localhost identified with mysql_native_password;
|
||||
update mysql.user set authentication_string=password('foo'), plugin='mysql_native_password' where user='foo' and host='localhost';
|
||||
set password for 'foo'@'localhost' = password('bar');
|
||||
flush privileges;
|
||||
connect foo, localhost, foo, bar;
|
||||
select user(), current_user();
|
||||
user() current_user()
|
||||
foo@localhost foo@localhost
|
||||
show grants;
|
||||
Grants for foo@localhost
|
||||
GRANT USAGE ON *.* TO 'foo'@'localhost' IDENTIFIED BY PASSWORD '*E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB'
|
||||
disconnect foo;
|
||||
connection default;
|
||||
select user,host,password,plugin,authentication_string from mysql.user where user='foo';
|
||||
user host password plugin authentication_string
|
||||
foo localhost mysql_native_password *E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB
|
||||
set password for 'foo'@'localhost' = '';
|
||||
select user,host,password,plugin,authentication_string from mysql.user where user='foo';
|
||||
user host password plugin authentication_string
|
||||
foo localhost mysql_native_password
|
||||
drop user foo@localhost;
|
|
@ -129,3 +129,19 @@ drop user natauth@localhost, newpass@localhost, newpassnat@localhost;
|
|||
drop user oldauth@localhost, oldpass@localhost, oldpassold@localhost;
|
||||
set global secure_auth=default;
|
||||
|
||||
#
|
||||
# MDEV-16238 root/localhost authn prioritizes authentication_string over Password
|
||||
#
|
||||
create user foo@localhost identified with mysql_native_password;
|
||||
update mysql.user set authentication_string=password('foo'), plugin='mysql_native_password' where user='foo' and host='localhost';
|
||||
set password for 'foo'@'localhost' = password('bar');
|
||||
flush privileges;
|
||||
--connect foo, localhost, foo, bar
|
||||
select user(), current_user();
|
||||
show grants;
|
||||
--disconnect foo
|
||||
--connection default
|
||||
select user,host,password,plugin,authentication_string from mysql.user where user='foo';
|
||||
set password for 'foo'@'localhost' = '';
|
||||
select user,host,password,plugin,authentication_string from mysql.user where user='foo';
|
||||
drop user foo@localhost;
|
|
@ -71,7 +71,7 @@ connection default;
|
|||
set password for u1 = PASSWORD('SOMETHINGELSE');
|
||||
select user, host, password, plugin, authentication_string from mysql.user where user = 'u1';
|
||||
user host password plugin authentication_string
|
||||
u1 % *054B7BBD2B9A553DA560520DCD3F76DA2D81B7C6
|
||||
u1 % mysql_native_password *054B7BBD2B9A553DA560520DCD3F76DA2D81B7C6
|
||||
#
|
||||
# Here we should use the password field, as that primes over
|
||||
# the authentication_string field.
|
||||
|
@ -112,7 +112,7 @@ connection default;
|
|||
# Now we remove the authentication plugin password, flush privileges and
|
||||
# try again.
|
||||
#
|
||||
update mysql.user set authentication_string = '' where user='u1';
|
||||
update mysql.user set password=authentication_string, plugin='', authentication_string='' where user='u1';
|
||||
select user, host, password, plugin, authentication_string from mysql.user where user = 'u1';
|
||||
user host password plugin authentication_string
|
||||
u1 % *054B7BBD2B9A553DA560520DCD3F76DA2D81B7C6
|
||||
|
@ -172,7 +172,7 @@ connection default;
|
|||
set password for u1 = '';
|
||||
select user, host, password, plugin, authentication_string from mysql.user where user = 'u1';
|
||||
user host password plugin authentication_string
|
||||
u1 %
|
||||
u1 % mysql_native_password
|
||||
#
|
||||
# Test no password connect.
|
||||
#
|
||||
|
|
|
@ -91,7 +91,7 @@ show grants;
|
|||
--echo # Now we remove the authentication plugin password, flush privileges and
|
||||
--echo # try again.
|
||||
--echo #
|
||||
update mysql.user set authentication_string = '' where user='u1';
|
||||
update mysql.user set password=authentication_string, plugin='', authentication_string='' where user='u1';
|
||||
select user, host, password, plugin, authentication_string from mysql.user where user = 'u1';
|
||||
flush privileges;
|
||||
show grants for u1;
|
||||
|
|
|
@ -755,6 +755,7 @@ GRANT EXECUTE ON PROCEDURE `test`.`sp1` TO 'root'@'localhost'
|
|||
GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION
|
||||
drop procedure sp1;
|
||||
set password='';
|
||||
update mysql.user set plugin='';
|
||||
#
|
||||
# MDEV-13396 Unexpected "alter routine comand defined" during CREATE OR REPLACE PROCEDURE
|
||||
#
|
||||
|
|
|
@ -1023,6 +1023,8 @@ grant execute on procedure sp1 to current_user() identified by 'barfoo';
|
|||
show grants;
|
||||
drop procedure sp1;
|
||||
set password='';
|
||||
#cleanup after MDEV-16238
|
||||
update mysql.user set plugin='';
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-13396 Unexpected "alter routine comand defined" during CREATE OR REPLACE PROCEDURE
|
||||
|
|
|
@ -1692,6 +1692,27 @@ set use_stat_tables=@save_use_stat_tables;
|
|||
set optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity;
|
||||
drop table t1,t2;
|
||||
#
|
||||
# MDEV-16507: statistics for temporary tables should not be used
|
||||
#
|
||||
SET
|
||||
@save_optimizer_use_condition_selectivity= @@optimizer_use_condition_selectivity;
|
||||
SET @@use_stat_tables = preferably ;
|
||||
SET @@optimizer_use_condition_selectivity = 4;
|
||||
CREATE TABLE t1 (
|
||||
TIMESTAMP TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
ON UPDATE CURRENT_TIMESTAMP
|
||||
);
|
||||
SET @had_t1_table= @@warning_count != 0;
|
||||
CREATE TEMPORARY TABLE tmp_t1 LIKE t1;
|
||||
INSERT INTO tmp_t1 VALUES (now());
|
||||
INSERT INTO t1 SELECT * FROM tmp_t1 WHERE @had_t1_table=0;
|
||||
DROP TABLE t1;
|
||||
SET
|
||||
use_stat_tables=@save_use_stat_tables;
|
||||
SET
|
||||
optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity;
|
||||
# End of 10.0 tests
|
||||
#
|
||||
# MDEV-9590: Always print "Engine-independent statistic" warnings and
|
||||
# might be filtering columns unintentionally from engines
|
||||
#
|
||||
|
|
|
@ -818,6 +818,32 @@ set use_stat_tables=@save_use_stat_tables;
|
|||
set optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity;
|
||||
drop table t1,t2;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-16507: statistics for temporary tables should not be used
|
||||
--echo #
|
||||
|
||||
SET
|
||||
@save_optimizer_use_condition_selectivity= @@optimizer_use_condition_selectivity;
|
||||
SET @@use_stat_tables = preferably ;
|
||||
SET @@optimizer_use_condition_selectivity = 4;
|
||||
|
||||
CREATE TABLE t1 (
|
||||
TIMESTAMP TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
ON UPDATE CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
SET @had_t1_table= @@warning_count != 0;
|
||||
CREATE TEMPORARY TABLE tmp_t1 LIKE t1;
|
||||
INSERT INTO tmp_t1 VALUES (now());
|
||||
INSERT INTO t1 SELECT * FROM tmp_t1 WHERE @had_t1_table=0;
|
||||
DROP TABLE t1;
|
||||
|
||||
SET
|
||||
use_stat_tables=@save_use_stat_tables;
|
||||
SET
|
||||
optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity;
|
||||
--echo # End of 10.0 tests
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-9590: Always print "Engine-independent statistic" warnings and
|
||||
--echo # might be filtering columns unintentionally from engines
|
||||
|
|
|
@ -334,7 +334,7 @@ SELECT * FROM t1
|
|||
WHERE (f1) IN (SELECT f1 FROM t2)
|
||||
LIMIT 0;
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
|
||||
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Zero limit
|
||||
2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where
|
||||
SELECT * FROM t1
|
||||
WHERE (f1) IN (SELECT f1 FROM t2)
|
||||
|
|
|
@ -1670,3 +1670,150 @@ id select_type table type possible_keys key key_len ref rows Extra
|
|||
1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 11 func 1
|
||||
2 MATERIALIZED t2 ALL NULL NULL NULL NULL 3 Using where
|
||||
DROP TABLE t1,t2;
|
||||
#
|
||||
# MDEV-16225: wrong resultset from query with semijoin=on
|
||||
#
|
||||
CREATE TABLE t1 (
|
||||
`id` int(10) NOT NULL AUTO_INCREMENT,
|
||||
`local_name` varchar(64) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1;
|
||||
insert into t1(`id`,`local_name`) values
|
||||
(1,'Cash Advance'),
|
||||
(2,'Cash Advance'),
|
||||
(3,'Rollover'),
|
||||
(4,'AL Installment'),
|
||||
(5,'AL Installment'),
|
||||
(6,'AL Installment'),
|
||||
(7,'AL Installment'),
|
||||
(8,'AL Installment'),
|
||||
(9,'AL Installment'),
|
||||
(10,'Internet Payday'),
|
||||
(11,'Rollover - Internet Payday'),
|
||||
(12,'AL Monthly Installment'),
|
||||
(13,'AL Semi-Monthly Installment');
|
||||
explain
|
||||
SELECT SQL_NO_CACHE t.id
|
||||
FROM t1 t
|
||||
WHERE (
|
||||
t.id IN (SELECT A.id FROM t1 AS A WHERE A.local_name IN (SELECT B.local_name FROM t1 AS B WHERE B.id IN (0,4,12,13,1,10,3,11)))
|
||||
OR
|
||||
(t.id IN (0,4,12,13,1,10,3,11))
|
||||
);
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 PRIMARY t index PRIMARY PRIMARY 4 NULL 13 Using where; Using index
|
||||
2 MATERIALIZED <subquery3> ALL distinct_key NULL NULL NULL 8
|
||||
2 MATERIALIZED A ALL PRIMARY NULL NULL NULL 13 Using where; Using join buffer (flat, BNL join)
|
||||
3 MATERIALIZED B ALL PRIMARY NULL NULL NULL 13 Using where
|
||||
SELECT SQL_NO_CACHE t.id
|
||||
FROM t1 t
|
||||
WHERE (
|
||||
t.id IN (SELECT A.id FROM t1 AS A WHERE A.local_name IN (SELECT B.local_name FROM t1 AS B WHERE B.id IN (0,4,12,13,1,10,3,11)))
|
||||
OR
|
||||
(t.id IN (0,4,12,13,1,10,3,11))
|
||||
);
|
||||
id
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
6
|
||||
7
|
||||
8
|
||||
9
|
||||
10
|
||||
11
|
||||
12
|
||||
13
|
||||
drop table t1;
|
||||
#
|
||||
# MDEV-15247: Crash when SET NAMES 'utf8' is set
|
||||
#
|
||||
CREATE TABLE t1 (
|
||||
id_category int unsigned,
|
||||
id_product int unsigned,
|
||||
PRIMARY KEY (id_category,id_product)
|
||||
) ENGINE=MyISAM;
|
||||
INSERT INTO `t1` VALUES (31,216), (31,215), (31,214), (31,213), (31,212), (32,211), (32,210), (32,209), (32,208), (29,207), (30,315372), (2,161), (2,132), (33,315380), (31,315371), (29,315370), (29,315373), (29,315369), (29,315374), (29,315368), (29,315375), (29,315367), (29,183), (29,182), (30,177), (29,315376), (13,315365), (2,167), (2,315357), (2,164), (2,159), (2,131), (2,127), (14,315364), (27,315363), (29,205), (29,204), (29,203), (29,202), (29,201), (29,200), (29,199), (29,198), (29,197), (29,196), (29,195), (29,194), (29,193), (29,192), (29,191), (29,190), (29,189), (14,188), (29,187), (29,186), (29,185), (29,184), (29,315377), (29,315378), (29,181), (33,315379), (29,179), (30,178), (29,180), (30,176), (30,175), (30,174), (30,173), (30,172), (11,171), (27,315357), (23,108), (23,102);
|
||||
CREATE TABLE t2 (
|
||||
id_product int,
|
||||
id_t2 int,
|
||||
KEY id_t2 (id_t2),
|
||||
KEY id_product (id_product)
|
||||
) ENGINE=MyISAM;
|
||||
INSERT INTO `t2` VALUES (11,31), (11,31), (11,31), (11,32), (11,32),
|
||||
(11,32), (10,26), (11,32), (10,28), (11,32), (10,29), (11,33), (10,26),
|
||||
(11,33), (10,27), (9,23), (11,32), (10,26), (8,18), (7,15), (11,32),
|
||||
(10,28), (11,32), (10,28), (11,32), (10,29), (11,32), (10,29), (8,19),
|
||||
(7,16), (8,18), (7,16), (8,20), (7,16), (11,32), (10,28), (8,19),
|
||||
(7,16), (8,20), (7,16), (11,32), (10,29), (8,19), (7,16), (8,20),
|
||||
(7,16), (10,27), (9,23), (10,27), (9,23), (10,27), (9,23), (11,32),
|
||||
(10,27), (11,32), (10,27), (8,18), (7,15), (10,26), (9,24), (8,19),
|
||||
(7,16), (10,26), (9,23), (8,19), (7,16), (8,18), (7,16), (8,18), (7,16),
|
||||
(9,23), (8,18), (9,23), (8,19), (7,16), (7,16), (8,19), (7,16), (11,31),
|
||||
(10,27), (9,24), (11,31), (10,27), (9,23), (8,19), (11,31), (10,26), (9,24),
|
||||
(8,19), (11,31), (10,26), (9,25), (8,18), (11,31), (10,26), (9,23), (8,19),
|
||||
(11,31), (10,26), (9,23), (8,18), (11,31), (10,30), (9,23), (8,18), (11,31),
|
||||
(10,30), (9,23), (8,19), (11,31), (10,26), (9,25), (8,19), (8,21), (11,32),
|
||||
(10,26), (9,22), (8,19), (11,32), (10,26), (9,22), (8,18), (11,32), (10,26),
|
||||
(9,22), (8,20), (11,33), (10,26), (9,22), (8,19), (11,33), (10,26), (9,22),
|
||||
(8,18), (11,33), (10,26), (9,22), (8,20), (11,32), (10,26), (9,24), (8,19),
|
||||
(11,32), (10,26), (9,25), (8,19), (11,32), (10,26), (9,25), (8,18), (11,32),
|
||||
(10,26), (9,23), (8,18), (11,32), (10,30), (9,23), (8,18), (11,32), (10,30),
|
||||
(9,23), (8,19), (11,32), (10,26), (9,23), (8,19), (11,32), (10,27), (9,23),
|
||||
(11,32), (10,27), (9,23), (11,32), (10,27), (9,23), (10,26), (9,22), (8,19),
|
||||
(7,15), (10,26), (9,22), (8,20), (7,15), (10,26), (9,22), (8,18), (7,15),
|
||||
(8,19), (10,26), (10,26), (11,33), (10,26), (11,33), (10,26), (11,33),
|
||||
(10,27), (11,33), (10,27), (11,31), (10,26), (11,31), (10,26), (8,18),
|
||||
(7,15), (9,23), (9,23), (9,24), (8,21), (7,15), (7,15), (7,15), (7,15),
|
||||
(7,15), (7,15), (7,15), (7,15), (7,15), (8,18), (7,17), (8,18), (7,17), (8,19), (8,19);
|
||||
CREATE TABLE t3 (
|
||||
id_product int unsigned,
|
||||
PRIMARY KEY (id_product)
|
||||
) ENGINE=MyISAM;
|
||||
INSERT INTO t3 VALUES
|
||||
(102),(103),(104),(105),(106),(107),(108),(109),(110),
|
||||
(315371),(315373),(315374),(315375),(315376),(315377),
|
||||
(315378),(315379),(315380);
|
||||
CREATE TABLE t4 (
|
||||
id_product int not null,
|
||||
id_shop int,
|
||||
PRIMARY KEY (id_product,id_shop)
|
||||
) ENGINE=MyISAM ;
|
||||
INSERT INTO t4 VALUES
|
||||
(202,1),(201,1),(200,1),(199,1),(198,1),(197,1),(196,1),(195,1),
|
||||
(194,1),(193,1),(192,1),(191,1),(190,1),(189,1),(188,1),(187,1),
|
||||
(186,1),(185,1),(184,1),(183,1),(182,1),(181,1),(179,1),(178,1),
|
||||
(177,1),(176,1),(126,1),(315380,1);
|
||||
CREATE TABLE t5 (id_product int) ENGINE=MyISAM;
|
||||
INSERT INTO `t5` VALUES
|
||||
(652),(668),(669),(670),(671),(673),(674),(675),(676),
|
||||
(677),(679),(680),(681),(682),(683),(684),(685),(686);
|
||||
explain
|
||||
SELECT * FROM t3
|
||||
JOIN t4 ON (t4.id_product = t3.id_product AND t4.id_shop = 1)
|
||||
JOIN t1 ON (t1.id_product = t3.id_product)
|
||||
LEFT JOIN t5 ON (t5.id_product = t3.id_product)
|
||||
WHERE 1=1
|
||||
AND t3.id_product IN (SELECT id_product FROM t2 t2_1 WHERE t2_1.id_t2 = 32)
|
||||
AND t3.id_product IN (SELECT id_product FROM t2 t2_2 WHERE t2_2.id_t2 = 15)
|
||||
AND t3.id_product IN (SELECT id_product FROM t2 t2_3 WHERE t2_3.id_t2 = 18 OR t2_3.id_t2 = 19)
|
||||
AND t3.id_product IN (SELECT id_product FROM t2 t2_4 WHERE t2_4.id_t2 = 34 OR t2_4.id_t2 = 23)
|
||||
AND t3.id_product IN (SELECT id_product FROM t2 t2_5 WHERE t2_5.id_t2 = 29 OR t2_5.id_t2 = 28 OR t2_5.id_t2 = 26);
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 PRIMARY t1 index NULL PRIMARY 8 NULL 73 Using index
|
||||
1 PRIMARY t3 eq_ref PRIMARY PRIMARY 4 test.t1.id_product 1 Using index
|
||||
1 PRIMARY <subquery5> eq_ref distinct_key distinct_key 4 func 1 Using where
|
||||
1 PRIMARY <subquery4> eq_ref distinct_key distinct_key 4 func 1 Using where
|
||||
1 PRIMARY <subquery3> eq_ref distinct_key distinct_key 4 func 1 Using where
|
||||
1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 Using where
|
||||
1 PRIMARY t4 eq_ref PRIMARY PRIMARY 8 test.t1.id_product,const 1 Using where; Using index
|
||||
1 PRIMARY <subquery6> eq_ref distinct_key distinct_key 4 func 1 Using where
|
||||
1 PRIMARY t5 ALL NULL NULL NULL NULL 18 Using where; Using join buffer (flat, BNL join)
|
||||
5 MATERIALIZED t2_4 range id_t2,id_product id_t2 5 NULL 18 Using index condition; Using where
|
||||
4 MATERIALIZED t2_3 range id_t2,id_product id_t2 5 NULL 32 Using index condition; Using where
|
||||
3 MATERIALIZED t2_2 ref id_t2,id_product id_t2 5 const 12
|
||||
2 MATERIALIZED t2_1 ref id_t2,id_product id_t2 5 const 50
|
||||
6 MATERIALIZED t2_5 range id_t2,id_product id_t2 5 NULL 30 Using index condition; Using where
|
||||
drop table t1,t2,t3,t4,t5;
|
||||
|
|
|
@ -303,3 +303,132 @@ eval $q;
|
|||
eval explain $q;
|
||||
|
||||
DROP TABLE t1,t2;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-16225: wrong resultset from query with semijoin=on
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (
|
||||
`id` int(10) NOT NULL AUTO_INCREMENT,
|
||||
`local_name` varchar(64) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1;
|
||||
|
||||
insert into t1(`id`,`local_name`) values
|
||||
(1,'Cash Advance'),
|
||||
(2,'Cash Advance'),
|
||||
(3,'Rollover'),
|
||||
(4,'AL Installment'),
|
||||
(5,'AL Installment'),
|
||||
(6,'AL Installment'),
|
||||
(7,'AL Installment'),
|
||||
(8,'AL Installment'),
|
||||
(9,'AL Installment'),
|
||||
(10,'Internet Payday'),
|
||||
(11,'Rollover - Internet Payday'),
|
||||
(12,'AL Monthly Installment'),
|
||||
(13,'AL Semi-Monthly Installment');
|
||||
|
||||
explain
|
||||
SELECT SQL_NO_CACHE t.id
|
||||
FROM t1 t
|
||||
WHERE (
|
||||
t.id IN (SELECT A.id FROM t1 AS A WHERE A.local_name IN (SELECT B.local_name FROM t1 AS B WHERE B.id IN (0,4,12,13,1,10,3,11)))
|
||||
OR
|
||||
(t.id IN (0,4,12,13,1,10,3,11))
|
||||
);
|
||||
SELECT SQL_NO_CACHE t.id
|
||||
FROM t1 t
|
||||
WHERE (
|
||||
t.id IN (SELECT A.id FROM t1 AS A WHERE A.local_name IN (SELECT B.local_name FROM t1 AS B WHERE B.id IN (0,4,12,13,1,10,3,11)))
|
||||
OR
|
||||
(t.id IN (0,4,12,13,1,10,3,11))
|
||||
);
|
||||
drop table t1;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-15247: Crash when SET NAMES 'utf8' is set
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (
|
||||
id_category int unsigned,
|
||||
id_product int unsigned,
|
||||
PRIMARY KEY (id_category,id_product)
|
||||
) ENGINE=MyISAM;
|
||||
|
||||
INSERT INTO `t1` VALUES (31,216), (31,215), (31,214), (31,213), (31,212), (32,211), (32,210), (32,209), (32,208), (29,207), (30,315372), (2,161), (2,132), (33,315380), (31,315371), (29,315370), (29,315373), (29,315369), (29,315374), (29,315368), (29,315375), (29,315367), (29,183), (29,182), (30,177), (29,315376), (13,315365), (2,167), (2,315357), (2,164), (2,159), (2,131), (2,127), (14,315364), (27,315363), (29,205), (29,204), (29,203), (29,202), (29,201), (29,200), (29,199), (29,198), (29,197), (29,196), (29,195), (29,194), (29,193), (29,192), (29,191), (29,190), (29,189), (14,188), (29,187), (29,186), (29,185), (29,184), (29,315377), (29,315378), (29,181), (33,315379), (29,179), (30,178), (29,180), (30,176), (30,175), (30,174), (30,173), (30,172), (11,171), (27,315357), (23,108), (23,102);
|
||||
|
||||
CREATE TABLE t2 (
|
||||
id_product int,
|
||||
id_t2 int,
|
||||
KEY id_t2 (id_t2),
|
||||
KEY id_product (id_product)
|
||||
) ENGINE=MyISAM;
|
||||
|
||||
INSERT INTO `t2` VALUES (11,31), (11,31), (11,31), (11,32), (11,32),
|
||||
(11,32), (10,26), (11,32), (10,28), (11,32), (10,29), (11,33), (10,26),
|
||||
(11,33), (10,27), (9,23), (11,32), (10,26), (8,18), (7,15), (11,32),
|
||||
(10,28), (11,32), (10,28), (11,32), (10,29), (11,32), (10,29), (8,19),
|
||||
(7,16), (8,18), (7,16), (8,20), (7,16), (11,32), (10,28), (8,19),
|
||||
(7,16), (8,20), (7,16), (11,32), (10,29), (8,19), (7,16), (8,20),
|
||||
(7,16), (10,27), (9,23), (10,27), (9,23), (10,27), (9,23), (11,32),
|
||||
(10,27), (11,32), (10,27), (8,18), (7,15), (10,26), (9,24), (8,19),
|
||||
(7,16), (10,26), (9,23), (8,19), (7,16), (8,18), (7,16), (8,18), (7,16),
|
||||
(9,23), (8,18), (9,23), (8,19), (7,16), (7,16), (8,19), (7,16), (11,31),
|
||||
(10,27), (9,24), (11,31), (10,27), (9,23), (8,19), (11,31), (10,26), (9,24),
|
||||
(8,19), (11,31), (10,26), (9,25), (8,18), (11,31), (10,26), (9,23), (8,19),
|
||||
(11,31), (10,26), (9,23), (8,18), (11,31), (10,30), (9,23), (8,18), (11,31),
|
||||
(10,30), (9,23), (8,19), (11,31), (10,26), (9,25), (8,19), (8,21), (11,32),
|
||||
(10,26), (9,22), (8,19), (11,32), (10,26), (9,22), (8,18), (11,32), (10,26),
|
||||
(9,22), (8,20), (11,33), (10,26), (9,22), (8,19), (11,33), (10,26), (9,22),
|
||||
(8,18), (11,33), (10,26), (9,22), (8,20), (11,32), (10,26), (9,24), (8,19),
|
||||
(11,32), (10,26), (9,25), (8,19), (11,32), (10,26), (9,25), (8,18), (11,32),
|
||||
(10,26), (9,23), (8,18), (11,32), (10,30), (9,23), (8,18), (11,32), (10,30),
|
||||
(9,23), (8,19), (11,32), (10,26), (9,23), (8,19), (11,32), (10,27), (9,23),
|
||||
(11,32), (10,27), (9,23), (11,32), (10,27), (9,23), (10,26), (9,22), (8,19),
|
||||
(7,15), (10,26), (9,22), (8,20), (7,15), (10,26), (9,22), (8,18), (7,15),
|
||||
(8,19), (10,26), (10,26), (11,33), (10,26), (11,33), (10,26), (11,33),
|
||||
(10,27), (11,33), (10,27), (11,31), (10,26), (11,31), (10,26), (8,18),
|
||||
(7,15), (9,23), (9,23), (9,24), (8,21), (7,15), (7,15), (7,15), (7,15),
|
||||
(7,15), (7,15), (7,15), (7,15), (7,15), (8,18), (7,17), (8,18), (7,17), (8,19), (8,19);
|
||||
|
||||
CREATE TABLE t3 (
|
||||
id_product int unsigned,
|
||||
PRIMARY KEY (id_product)
|
||||
) ENGINE=MyISAM;
|
||||
|
||||
INSERT INTO t3 VALUES
|
||||
(102),(103),(104),(105),(106),(107),(108),(109),(110),
|
||||
(315371),(315373),(315374),(315375),(315376),(315377),
|
||||
(315378),(315379),(315380);
|
||||
|
||||
CREATE TABLE t4 (
|
||||
id_product int not null,
|
||||
id_shop int,
|
||||
PRIMARY KEY (id_product,id_shop)
|
||||
) ENGINE=MyISAM ;
|
||||
|
||||
INSERT INTO t4 VALUES
|
||||
(202,1),(201,1),(200,1),(199,1),(198,1),(197,1),(196,1),(195,1),
|
||||
(194,1),(193,1),(192,1),(191,1),(190,1),(189,1),(188,1),(187,1),
|
||||
(186,1),(185,1),(184,1),(183,1),(182,1),(181,1),(179,1),(178,1),
|
||||
(177,1),(176,1),(126,1),(315380,1);
|
||||
|
||||
CREATE TABLE t5 (id_product int) ENGINE=MyISAM;
|
||||
INSERT INTO `t5` VALUES
|
||||
(652),(668),(669),(670),(671),(673),(674),(675),(676),
|
||||
(677),(679),(680),(681),(682),(683),(684),(685),(686);
|
||||
|
||||
explain
|
||||
SELECT * FROM t3
|
||||
JOIN t4 ON (t4.id_product = t3.id_product AND t4.id_shop = 1)
|
||||
JOIN t1 ON (t1.id_product = t3.id_product)
|
||||
LEFT JOIN t5 ON (t5.id_product = t3.id_product)
|
||||
WHERE 1=1
|
||||
AND t3.id_product IN (SELECT id_product FROM t2 t2_1 WHERE t2_1.id_t2 = 32)
|
||||
AND t3.id_product IN (SELECT id_product FROM t2 t2_2 WHERE t2_2.id_t2 = 15)
|
||||
AND t3.id_product IN (SELECT id_product FROM t2 t2_3 WHERE t2_3.id_t2 = 18 OR t2_3.id_t2 = 19)
|
||||
AND t3.id_product IN (SELECT id_product FROM t2 t2_4 WHERE t2_4.id_t2 = 34 OR t2_4.id_t2 = 23)
|
||||
AND t3.id_product IN (SELECT id_product FROM t2 t2_5 WHERE t2_5.id_t2 = 29 OR t2_5.id_t2 = 28 OR t2_5.id_t2 = 26);
|
||||
|
||||
drop table t1,t2,t3,t4,t5;
|
||||
|
|
|
@ -77,9 +77,9 @@ explain select * from t4 where
|
|||
t4.a in (select max(t2.a) from t1, t2 group by t2.b) and
|
||||
t4.b in (select max(t2.a) from t1, t2 group by t2.b);
|
||||
id select_type table type possible_keys key key_len ref rows Extra
|
||||
1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 5
|
||||
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 5 Using join buffer (flat, BNL join)
|
||||
1 PRIMARY t4 ref a a 10 <subquery2>.max(t2.a),<subquery3>.max(t2.a) 12
|
||||
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 5
|
||||
1 PRIMARY t4 ref a a 5 <subquery2>.max(t2.a) 12 Using index condition
|
||||
1 PRIMARY <subquery3> eq_ref distinct_key distinct_key 4 test.t4.b 1
|
||||
3 MATERIALIZED t2 ALL NULL NULL NULL NULL 5 Using temporary
|
||||
3 MATERIALIZED t1 ALL NULL NULL NULL NULL 10 Using join buffer (flat, BNL join)
|
||||
2 MATERIALIZED t2 ALL NULL NULL NULL NULL 5 Using temporary
|
||||
|
|
|
@ -1063,3 +1063,19 @@ DROP TABLE t1;
|
|||
#
|
||||
# End of 5.5 tests
|
||||
#
|
||||
#
|
||||
# Start of 10.2 test
|
||||
#
|
||||
#
|
||||
# MDEV-12809 Bad column type created for TEXT(1431655798) CHARACTER SET utf8
|
||||
#
|
||||
CREATE TABLE t1 (a TEXT(1431655798) CHARACTER SET utf8);
|
||||
SHOW CREATE TABLE t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`a` longtext CHARACTER SET utf8 DEFAULT NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# End of 10.2 test
|
||||
#
|
||||
|
|
|
@ -680,3 +680,21 @@ DROP TABLE t1;
|
|||
--echo #
|
||||
--echo # End of 5.5 tests
|
||||
--echo #
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # Start of 10.2 test
|
||||
--echo #
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-12809 Bad column type created for TEXT(1431655798) CHARACTER SET utf8
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (a TEXT(1431655798) CHARACTER SET utf8);
|
||||
SHOW CREATE TABLE t1;
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.2 test
|
||||
--echo #
|
||||
|
|
|
@ -1033,6 +1033,31 @@ c1 c2
|
|||
0.123456 0.123456
|
||||
SET sql_mode=DEFAULT;
|
||||
#
|
||||
# MDEV-12574 MAX(old_decimal) produces a column of the old DECIMAL type
|
||||
#
|
||||
SHOW CREATE TABLE t1dec102;
|
||||
Table Create Table
|
||||
t1dec102 CREATE TABLE `t1dec102` (
|
||||
`a` decimal(10,2)/*old*/ DEFAULT NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
CREATE TABLE t1 AS SELECT a, MAX(a), COALESCE(a) FROM t1dec102;
|
||||
SHOW CREATE TABLE t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`a` decimal(10,2) DEFAULT NULL,
|
||||
`MAX(a)` decimal(10,2) DEFAULT NULL,
|
||||
`COALESCE(a)` decimal(10,2) DEFAULT NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
DROP TABLE t1;
|
||||
CREATE TABLE t1 AS SELECT a FROM t1dec102 UNION SELECT a FROM t1dec102;
|
||||
SHOW CREATE TABLE t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`a` decimal(10,2) DEFAULT NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t1dec102;
|
||||
#
|
||||
# End of 10.2 tests
|
||||
#
|
||||
#
|
||||
|
@ -1046,7 +1071,7 @@ CREATE TABLE t1 AS SELECT MAX(a) FROM t1dec102;
|
|||
SHOW CREATE TABLE t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`MAX(a)` decimal(10,2)/*old*/ DEFAULT NULL
|
||||
`MAX(a)` decimal(10,2) DEFAULT NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
DROP TABLE t1;
|
||||
CREATE TABLE t1 AS SELECT COALESCE(a) FROM t1dec102;
|
||||
|
|
|
@ -627,6 +627,27 @@ SELECT
|
|||
CAST(TIME'00:00:00.123456' AS DECIMAL(10,6)) AS c2;
|
||||
SET sql_mode=DEFAULT;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-12574 MAX(old_decimal) produces a column of the old DECIMAL type
|
||||
--echo #
|
||||
|
||||
let $MYSQLD_DATADIR= `select @@datadir`;
|
||||
--copy_file std_data/old_decimal/t1dec102.frm $MYSQLD_DATADIR/test/t1dec102.frm
|
||||
--copy_file std_data/old_decimal/t1dec102.MYD $MYSQLD_DATADIR/test/t1dec102.MYD
|
||||
--copy_file std_data/old_decimal/t1dec102.MYI $MYSQLD_DATADIR/test/t1dec102.MYI
|
||||
|
||||
SHOW CREATE TABLE t1dec102;
|
||||
|
||||
CREATE TABLE t1 AS SELECT a, MAX(a), COALESCE(a) FROM t1dec102;
|
||||
SHOW CREATE TABLE t1;
|
||||
DROP TABLE t1;
|
||||
|
||||
CREATE TABLE t1 AS SELECT a FROM t1dec102 UNION SELECT a FROM t1dec102;
|
||||
SHOW CREATE TABLE t1;
|
||||
DROP TABLE t1;
|
||||
|
||||
DROP TABLE t1dec102;
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.2 tests
|
||||
--echo #
|
||||
|
|
|
@ -5727,7 +5727,7 @@ sub lldb_arguments {
|
|||
$input = $input ? "< $input" : "";
|
||||
|
||||
# write init file for mysqld or client
|
||||
mtr_tofile($lldb_init_file, "set args $str $input\n");
|
||||
mtr_tofile($lldb_init_file, "process launch --stop-at-entry -- $str $input\n");
|
||||
|
||||
print "\nTo start lldb for $type, type in another window:\n";
|
||||
print "cd $glob_mysql_test_dir && lldb -s $lldb_init_file $$exe\n";
|
||||
|
|
BIN
mysql-test/std_data/frm/t1.frm
Normal file
BIN
mysql-test/std_data/frm/t1.frm
Normal file
Binary file not shown.
|
@ -12,5 +12,3 @@
|
|||
|
||||
innodb_scrub : MDEV-8139 scrubbing does not work reliably
|
||||
innodb_scrub_background : MDEV-8139 scrubbing does not work reliably
|
||||
innodb-redo-badkey : MDEV-13893 / MDEV-12699 Improve crash recovery of corrupted data pages
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
call mtr.add_suppression("mysqld: File .*");
|
||||
call mtr.add_suppression("Plugin 'file_key_management' .*");
|
||||
call mtr.add_suppression("InnoDB: cannot enable encryption, encryption plugin is not available");
|
||||
call mtr.add_suppression("Plugin 'InnoDB' init function returned error.");
|
||||
call mtr.add_suppression("Plugin 'InnoDB' init function returned error\\.");
|
||||
call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed.");
|
||||
call mtr.add_suppression("InnoDB: The page \\[page id: space=[0-9]+, page number=[0-9]+\\] in file '.*test.t[1-4]\\.ibd' cannot be decrypted\\.");
|
||||
call mtr.add_suppression("failed to read or decrypt \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\]");
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
-- source include/have_innodb.inc
|
||||
-- source include/innodb_page_size_small.inc
|
||||
-- source include/have_file_key_management_plugin.inc
|
||||
# embedded does not support restart
|
||||
-- source include/not_embedded.inc
|
||||
-- source include/not_valgrind.inc
|
||||
# Avoid CrashReporter popup on Mac
|
||||
-- source include/not_crashrep.inc
|
||||
|
||||
#
|
||||
# MDEV-8770: Incorrect error message when importing page compressed tablespace
|
||||
|
@ -28,7 +24,9 @@ create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes en
|
|||
show warnings;
|
||||
create table t2(c1 bigint not null, b char(200)) engine=innodb page_compressed=1 encrypted=yes encryption_key_id=4;
|
||||
show warnings;
|
||||
create table t3(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encrypted=yes encryption_key_id=4;
|
||||
let $kbs= `select floor(@@global.innodb_page_size/1024)`;
|
||||
--replace_regex / key_block_size=\d+//i
|
||||
eval create table t3(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encrypted=yes encryption_key_id=4 key_block_size=$kbs;
|
||||
show warnings;
|
||||
create table t4(c1 bigint not null, b char(200)) engine=innodb page_compressed=1;
|
||||
show warnings;
|
||||
|
@ -89,6 +87,7 @@ ALTER TABLE t2 IMPORT TABLESPACE;
|
|||
SHOW CREATE TABLE t2;
|
||||
SELECT COUNT(*) FROM t2;
|
||||
ALTER TABLE t3 IMPORT TABLESPACE;
|
||||
--replace_regex / key_block_size=\d+//i
|
||||
SHOW CREATE TABLE t3;
|
||||
SELECT COUNT(*) FROM t3;
|
||||
ALTER TABLE t4 IMPORT TABLESPACE;
|
||||
|
@ -118,5 +117,5 @@ DROP TABLE t1,t2,t3,t4;
|
|||
|
||||
# reset system
|
||||
--disable_query_log
|
||||
EVAL SET GLOBAL innodb_compression_algorithm = $innodb_compression_algo;
|
||||
eval SET GLOBAL innodb_compression_algorithm = $innodb_compression_algo;
|
||||
--enable_query_log
|
||||
|
|
|
@ -61,5 +61,3 @@ SELECT COUNT(1) FROM t2;
|
|||
SELECT COUNT(1) FROM t3;
|
||||
|
||||
DROP TABLE t1, t2, t3;
|
||||
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
call mtr.add_suppression("mysqld: File .*");
|
||||
call mtr.add_suppression("Plugin 'file_key_management' .*");
|
||||
call mtr.add_suppression("InnoDB: cannot enable encryption, encryption plugin is not available");
|
||||
call mtr.add_suppression("Plugin 'InnoDB' init function returned error.");
|
||||
call mtr.add_suppression("Plugin 'InnoDB' init function returned error\\.");
|
||||
call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed.");
|
||||
call mtr.add_suppression("InnoDB: The page \\[page id: space=[0-9]+, page number=[0-9]+\\] in file '.*test.t[1-4]\\.ibd' cannot be decrypted\\.");
|
||||
call mtr.add_suppression("failed to read or decrypt \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\]");
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
if (!`SELECT count(*) FROM information_schema.plugins WHERE
|
||||
plugin_name = 'federated' AND plugin_status = 'active' AND
|
||||
plugin_description LIKE '%FederatedX%'`){
|
||||
plugin_description LIKE '%transactions%'`){
|
||||
skip Need FederatedX engine;
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
|
|||
WHERE ENGINE = 'ARCHIVE';
|
||||
ENGINE ARCHIVE
|
||||
SUPPORT YES
|
||||
COMMENT Archive storage engine
|
||||
COMMENT gzip-compresses tables for a low storage footprint
|
||||
TRANSACTIONS NO
|
||||
XA NO
|
||||
SAVEPOINTS NO
|
||||
|
|
|
@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
|
|||
WHERE ENGINE = 'CSV';
|
||||
ENGINE CSV
|
||||
SUPPORT YES
|
||||
COMMENT CSV storage engine
|
||||
COMMENT Stores tables as CSV files
|
||||
TRANSACTIONS NO
|
||||
XA NO
|
||||
SAVEPOINTS NO
|
||||
|
|
|
@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
|
|||
WHERE ENGINE = 'FEDERATED';
|
||||
ENGINE FEDERATED
|
||||
SUPPORT YES
|
||||
COMMENT FederatedX pluggable storage engine
|
||||
COMMENT Allows to access tables on other MariaDB servers, supports transactions and more
|
||||
TRANSACTIONS YES
|
||||
XA NO
|
||||
SAVEPOINTS YES
|
||||
|
|
|
@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
|
|||
WHERE ENGINE = 'MyISAM';
|
||||
ENGINE MyISAM
|
||||
SUPPORT DEFAULT
|
||||
COMMENT MyISAM storage engine
|
||||
COMMENT Non-transactional engine with good performance and small data footprint
|
||||
TRANSACTIONS NO
|
||||
XA NO
|
||||
SAVEPOINTS NO
|
||||
|
|
|
@ -27,6 +27,9 @@ galera_ssl_upgrade : MDEV-13549 Galera test failures
|
|||
galera.MW-329 : wsrep_local_replays not stable
|
||||
galera.MW-328A : have_deadlocks test not stable
|
||||
query_cache : MDEV-15805 Test failure on galera.query_cache
|
||||
MW-416 : MDEV-13549 Galera test failures
|
||||
galera_wan : MDEV-13549 Galera test failures
|
||||
MW-388 : MDEV-13549 Galera test failures
|
||||
galera.MW-44 : MDEV-15809 Test failure on galera.MW-44
|
||||
galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb
|
||||
galera_kill_applier : race condition at the start of the test
|
||||
|
|
|
@ -1,83 +0,0 @@
|
|||
|
||||
#
|
||||
# Let's understand the topology.
|
||||
# * Independent Master with server-id = 1
|
||||
# * Galera cluster with 2 nodes: node#1 and node#2 with server-id = 2, 3
|
||||
# node#1 act as slave to Independent Master with server-id = 1
|
||||
# * Independent Slave with server-id = 4 replicating from galera node#2
|
||||
#
|
||||
|
||||
# Use default setting for mysqld processes
|
||||
!include include/default_mysqld.cnf
|
||||
|
||||
[mysqld]
|
||||
log-slave-updates
|
||||
log-bin=mysqld-bin
|
||||
binlog-format=row
|
||||
gtid-mode=on
|
||||
enforce-gtid-consistency=true
|
||||
|
||||
[mysqld.1]
|
||||
server-id=1
|
||||
|
||||
[mysqld.2]
|
||||
server-id=2
|
||||
|
||||
wsrep_provider=@ENV.WSREP_PROVIDER
|
||||
wsrep_cluster_address='gcomm://'
|
||||
wsrep_provider_options='base_port=@mysqld.2.#galera_port;evs.install_timeout = PT15S; evs.max_install_timeouts=1;'
|
||||
|
||||
# enforce read-committed characteristics across the cluster
|
||||
wsrep_causal_reads=ON
|
||||
wsrep_sync_wait = 15
|
||||
|
||||
wsrep_node_address=127.0.0.1
|
||||
wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port
|
||||
wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port
|
||||
|
||||
# Required for Galera
|
||||
innodb_autoinc_lock_mode=2
|
||||
|
||||
innodb_flush_log_at_trx_commit=2
|
||||
|
||||
[mysqld.3]
|
||||
server-id=3
|
||||
|
||||
wsrep_provider=@ENV.WSREP_PROVIDER
|
||||
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.2.#galera_port'
|
||||
wsrep_provider_options='base_port=@mysqld.3.#galera_port;evs.install_timeout = PT15S; evs.max_install_timeouts = 1;'
|
||||
|
||||
# enforce read-committed characteristics across the cluster
|
||||
wsrep_causal_reads=ON
|
||||
wsrep_sync_wait = 15
|
||||
|
||||
wsrep_node_address=127.0.0.1
|
||||
wsrep_sst_receive_address=127.0.0.2:@mysqld.3.#sst_port
|
||||
wsrep_node_incoming_address=127.0.0.1:@mysqld.3.port
|
||||
|
||||
# Required for Galera
|
||||
innodb_autoinc_lock_mode=2
|
||||
|
||||
innodb_flush_log_at_trx_commit=2
|
||||
|
||||
[mysqld.4]
|
||||
server-id=4
|
||||
|
||||
[ENV]
|
||||
NODE_MYPORT_1= @mysqld.1.port
|
||||
NODE_MYSOCK_1= @mysqld.1.socket
|
||||
|
||||
NODE_MYPORT_2= @mysqld.2.port
|
||||
NODE_MYSOCK_2= @mysqld.2.socket
|
||||
|
||||
NODE_MYPORT_3= @mysqld.3.port
|
||||
NODE_MYSOCK_3= @mysqld.3.socket
|
||||
|
||||
NODE_MYPORT_4= @mysqld.4.port
|
||||
NODE_MYSOCK_4= @mysqld.4.socket
|
||||
|
||||
NODE_GALERAPORT_2= @mysqld.2.#galera_port
|
||||
NODE_GALERAPORT_3= @mysqld.3.#galera_port
|
||||
|
||||
NODE_SSTPORT_2= @mysqld.2.#sst_port
|
||||
NODE_SSTPORT_3= @mysqld.3.#sst_port
|
|
@ -1,87 +0,0 @@
|
|||
#
|
||||
# This .cnf file creates a setup with a 2-node Galera cluster and one stand-alone MySQL server, to be used as a slave
|
||||
#
|
||||
|
||||
# Use default setting for mysqld processes
|
||||
!include include/default_mysqld.cnf
|
||||
|
||||
[mysqld]
|
||||
default-storage-engine=InnoDB
|
||||
|
||||
[mysqld.1]
|
||||
server-id=1
|
||||
binlog-format=row
|
||||
log-bin=mysqld-bin
|
||||
log_slave_updates
|
||||
gtid-mode=on
|
||||
enforce-gtid-consistency=true
|
||||
event-scheduler=1
|
||||
|
||||
wsrep_provider=@ENV.WSREP_PROVIDER
|
||||
wsrep_cluster_address='gcomm://'
|
||||
wsrep_provider_options='base_port=@mysqld.1.#galera_port'
|
||||
|
||||
# enforce read-committed characteristics across the cluster
|
||||
wsrep_causal_reads=ON
|
||||
wsrep_sync_wait = 15
|
||||
|
||||
wsrep_node_address=127.0.0.1
|
||||
wsrep_sst_receive_address=127.0.0.2:@mysqld.1.#sst_port
|
||||
wsrep_node_incoming_address=127.0.0.1:@mysqld.1.port
|
||||
|
||||
# Required for Galera
|
||||
innodb_autoinc_lock_mode=2
|
||||
|
||||
innodb_flush_log_at_trx_commit=2
|
||||
|
||||
[mysqld.2]
|
||||
server-id=2
|
||||
binlog-format=row
|
||||
log-bin=mysqld-bin
|
||||
log_slave_updates
|
||||
gtid-mode=on
|
||||
enforce-gtid-consistency=true
|
||||
event-scheduler=1
|
||||
|
||||
wsrep_provider=@ENV.WSREP_PROVIDER
|
||||
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port'
|
||||
wsrep_provider_options='base_port=@mysqld.2.#galera_port'
|
||||
|
||||
# enforce read-committed characteristics across the cluster
|
||||
wsrep_causal_reads=ON
|
||||
wsrep_sync_wait = 15
|
||||
|
||||
wsrep_node_address=127.0.0.1
|
||||
wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port
|
||||
wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port
|
||||
|
||||
# Required for Galera
|
||||
innodb_autoinc_lock_mode=2
|
||||
|
||||
innodb_flush_log_at_trx_commit=2
|
||||
|
||||
[mysqld.3]
|
||||
server-id=3
|
||||
replicate-ignore-db=test
|
||||
replicate-wild-ignore-table=test.%
|
||||
log-bin=mysqld-bin
|
||||
log_slave_updates
|
||||
gtid-mode=on
|
||||
enforce-gtid-consistency=true
|
||||
event-scheduler=1
|
||||
|
||||
[ENV]
|
||||
NODE_MYPORT_1= @mysqld.1.port
|
||||
NODE_MYSOCK_1= @mysqld.1.socket
|
||||
|
||||
NODE_MYPORT_2= @mysqld.2.port
|
||||
NODE_MYSOCK_2= @mysqld.2.socket
|
||||
|
||||
NODE_MYPORT_3= @mysqld.3.port
|
||||
NODE_MYSOCK_3= @mysqld.3.socket
|
||||
|
||||
NODE_GALERAPORT_1= @mysqld.1.#galera_port
|
||||
NODE_GALERAPORT_2= @mysqld.2.#galera_port
|
||||
|
||||
NODE_SSTPORT_1= @mysqld.1.#sst_port
|
||||
NODE_SSTPORT_2= @mysqld.2.#sst_port
|
114
mysql-test/suite/galera/r/MW-416.result
Normal file
114
mysql-test/suite/galera/r/MW-416.result
Normal file
|
@ -0,0 +1,114 @@
|
|||
CREATE USER 'userMW416'@'localhost';
|
||||
GRANT SELECT, INSERT, UPDATE ON test.* TO 'userMW416'@'localhost';
|
||||
SHOW GLOBAL STATUS LIKE 'wsrep_replicated';
|
||||
Variable_name Value
|
||||
wsrep_replicated 2
|
||||
ALTER DATABASE db CHARACTER SET = utf8;
|
||||
ERROR 42000: Access denied for user 'userMW416'@'localhost' to database 'db'
|
||||
ALTER EVENT ev1 RENAME TO ev2;
|
||||
ERROR 42000: Access denied for user 'userMW416'@'localhost' to database 'test'
|
||||
ALTER FUNCTION fun1 COMMENT 'foo';
|
||||
ERROR 42000: alter routine command denied to user 'userMW416'@'localhost' for routine 'test.fun1'
|
||||
ALTER LOGFILE GROUP lfg ADD UNDOFILE 'file' ENGINE=InnoDB;
|
||||
Got one of the listed errors
|
||||
ALTER PROCEDURE proc1 COMMENT 'foo';
|
||||
Got one of the listed errors
|
||||
ALTER SERVER srv OPTIONS (USER 'sally');
|
||||
Got one of the listed errors
|
||||
ALTER TABLE tbl DROP COLUMN col;
|
||||
Got one of the listed errors
|
||||
ALTER TABLESPACE tblspc DROP DATAFILE 'file' ENGINE=innodb;
|
||||
Got one of the listed errors
|
||||
ALTER VIEW vw AS SELECT 1;
|
||||
Got one of the listed errors
|
||||
CREATE DATABASE db;
|
||||
Got one of the listed errors
|
||||
CREATE EVENT ev1 ON SCHEDULE AT CURRENT_TIMESTAMP DO SELECT 1;
|
||||
Got one of the listed errors
|
||||
CREATE FUNCTION fun1() RETURNS int RETURN(1);
|
||||
Got one of the listed errors
|
||||
CREATE FUNCTION fun1 RETURNS STRING SONAME 'funlib.so';
|
||||
Got one of the listed errors
|
||||
CREATE PROCEDURE proc1() BEGIN END;
|
||||
Got one of the listed errors
|
||||
CREATE INDEX idx ON tbl(id);
|
||||
Got one of the listed errors
|
||||
CREATE LOGFILE GROUP lfg ADD UNDOFILE 'undofile' ENGINE innodb;
|
||||
Got one of the listed errors
|
||||
CREATE SERVER srv FOREIGN DATA WRAPPER 'fdw' OPTIONS (USER 'user');
|
||||
Got one of the listed errors
|
||||
CREATE TABLE t (i int);
|
||||
Got one of the listed errors
|
||||
CREATE TABLESPACE tblspc ADD DATAFILE 'file' ENGINE=innodb;
|
||||
Got one of the listed errors
|
||||
CREATE TRIGGER trg BEFORE UPDATE ON t FOR EACH ROW BEGIN END;
|
||||
Got one of the listed errors
|
||||
CREATE VIEW vw AS SELECT 1;
|
||||
Got one of the listed errors
|
||||
DROP DATABASE db;
|
||||
Got one of the listed errors
|
||||
DROP EVENT ev;
|
||||
Got one of the listed errors
|
||||
DROP FUNCTION fun1;
|
||||
Got one of the listed errors
|
||||
DROP INDEX idx ON t0;
|
||||
Got one of the listed errors
|
||||
DROP LOGFILE GROUP lfg;
|
||||
Got one of the listed errors
|
||||
DROP PROCEDURE proc1;
|
||||
Got one of the listed errors
|
||||
DROP SERVEr srv;
|
||||
Got one of the listed errors
|
||||
DROP TABLE t0;
|
||||
Got one of the listed errors
|
||||
DROP TABLESPACE tblspc;
|
||||
Got one of the listed errors
|
||||
DROP TRIGGER trg;
|
||||
Got one of the listed errors
|
||||
DROP VIEW vw;
|
||||
Got one of the listed errors
|
||||
RENAME TABLE t0 TO t1;
|
||||
Got one of the listed errors
|
||||
TRUNCATE TABLE t0;
|
||||
Got one of the listed errors
|
||||
ALTER USER myuser PASSWORD EXPIRE;
|
||||
Got one of the listed errors
|
||||
CREATE USER myuser IDENTIFIED BY 'pass';
|
||||
Got one of the listed errors
|
||||
DROP USER myuser;
|
||||
Got one of the listed errors
|
||||
GRANT ALL ON *.* TO 'myuser';
|
||||
Got one of the listed errors
|
||||
RENAME USER myuser TO mariauser;
|
||||
Got one of the listed errors
|
||||
REVOKE SELECT ON test FROM myuser;
|
||||
Got one of the listed errors
|
||||
REVOKE ALL, GRANT OPTION FROM myuser;
|
||||
Got one of the listed errors
|
||||
REVOKE PROXY ON myuser FROM myuser;
|
||||
Got one of the listed errors
|
||||
ANALYZE TABLE db.tbl;
|
||||
Got one of the listed errors
|
||||
CHECK TABLE db.tbl;
|
||||
Got one of the listed errors
|
||||
CHECKSUM TABLE db.tbl;
|
||||
Got one of the listed errors
|
||||
OPTIMIZE TABLE db.tbl;
|
||||
Got one of the listed errors
|
||||
REPAIR TABLE db.tbl;
|
||||
Got one of the listed errors
|
||||
INSTALL PLUGIN plg SONAME 'plg.so';
|
||||
Got one of the listed errors
|
||||
UNINSTALL PLUGIN plg;
|
||||
Got one of the listed errors
|
||||
DROP USER 'userMW416'@'localhost';
|
||||
SHOW DATABASES;
|
||||
Database
|
||||
information_schema
|
||||
mtr
|
||||
mysql
|
||||
performance_schema
|
||||
test
|
||||
SHOW GLOBAL STATUS LIKE 'wsrep_replicated';
|
||||
Variable_name Value
|
||||
wsrep_replicated 3
|
10
mysql-test/suite/galera/r/galera#500.result
Normal file
10
mysql-test/suite/galera/r/galera#500.result
Normal file
|
@ -0,0 +1,10 @@
|
|||
SET SESSION wsrep_sync_wait = 0;
|
||||
SET GLOBAL wsrep_provider_options="gmcast.isolate=2";
|
||||
SET SESSION wsrep_sync_wait = 0;
|
||||
SHOW STATUS LIKE 'wsrep_cluster_status';
|
||||
Variable_name Value
|
||||
wsrep_cluster_status non-Primary
|
||||
SET SESSION wsrep_sync_wait = default;
|
||||
SET GLOBAL wsrep_provider_options="pc.bootstrap=1";
|
||||
SET SESSION wsrep_on=0;
|
||||
CALL mtr.add_suppression("WSREP: exception from gcomm, backend must be restarted: Gcomm backend termination was requested by setting gmcast.isolate=2.");
|
|
@ -1,13 +1,21 @@
|
|||
Setting SST method to mysqldump ...
|
||||
call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127.0.0.1'");
|
||||
call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");
|
||||
connection node_1;
|
||||
CREATE USER 'sst';
|
||||
GRANT ALL PRIVILEGES ON *.* TO 'sst';
|
||||
SET GLOBAL wsrep_sst_auth = 'sst:';
|
||||
connection node_2;
|
||||
SET GLOBAL wsrep_sst_method = 'mysqldump';
|
||||
connection node_1;
|
||||
connection node_2;
|
||||
connection node_1;
|
||||
CREATE USER sslsst;
|
||||
GRANT ALL PRIVILEGES ON *.* TO sslsst;
|
||||
GRANT USAGE ON *.* TO sslsst REQUIRE SSL;
|
||||
SET GLOBAL wsrep_sst_auth = 'sslsst:';
|
||||
Performing State Transfer on a server that has been temporarily disconnected
|
||||
connection node_1;
|
||||
CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB;
|
||||
SET AUTOCOMMIT=OFF;
|
||||
START TRANSACTION;
|
||||
|
@ -17,6 +25,7 @@ INSERT INTO t1 VALUES ('node1_committed_before');
|
|||
INSERT INTO t1 VALUES ('node1_committed_before');
|
||||
INSERT INTO t1 VALUES ('node1_committed_before');
|
||||
COMMIT;
|
||||
connection node_2;
|
||||
SET AUTOCOMMIT=OFF;
|
||||
START TRANSACTION;
|
||||
INSERT INTO t1 VALUES ('node2_committed_before');
|
||||
|
@ -27,6 +36,7 @@ INSERT INTO t1 VALUES ('node2_committed_before');
|
|||
COMMIT;
|
||||
Unloading wsrep provider ...
|
||||
SET GLOBAL wsrep_provider = 'none';
|
||||
connection node_1;
|
||||
SET AUTOCOMMIT=OFF;
|
||||
START TRANSACTION;
|
||||
INSERT INTO t1 VALUES ('node1_committed_during');
|
||||
|
@ -41,6 +51,7 @@ INSERT INTO t1 VALUES ('node1_to_be_committed_after');
|
|||
INSERT INTO t1 VALUES ('node1_to_be_committed_after');
|
||||
INSERT INTO t1 VALUES ('node1_to_be_committed_after');
|
||||
INSERT INTO t1 VALUES ('node1_to_be_committed_after');
|
||||
connect node_1a_galera_st_disconnect_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1;
|
||||
SET AUTOCOMMIT=OFF;
|
||||
START TRANSACTION;
|
||||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
|
||||
|
@ -48,6 +59,7 @@ INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
|
|||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
|
||||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
|
||||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
|
||||
connection node_2;
|
||||
Loading wsrep provider ...
|
||||
SET AUTOCOMMIT=OFF;
|
||||
START TRANSACTION;
|
||||
|
@ -57,6 +69,7 @@ INSERT INTO t1 VALUES ('node2_committed_after');
|
|||
INSERT INTO t1 VALUES ('node2_committed_after');
|
||||
INSERT INTO t1 VALUES ('node2_committed_after');
|
||||
COMMIT;
|
||||
connection node_1;
|
||||
INSERT INTO t1 VALUES ('node1_to_be_committed_after');
|
||||
INSERT INTO t1 VALUES ('node1_to_be_committed_after');
|
||||
INSERT INTO t1 VALUES ('node1_to_be_committed_after');
|
||||
|
@ -71,6 +84,7 @@ INSERT INTO t1 VALUES ('node1_committed_after');
|
|||
INSERT INTO t1 VALUES ('node1_committed_after');
|
||||
INSERT INTO t1 VALUES ('node1_committed_after');
|
||||
COMMIT;
|
||||
connection node_1a_galera_st_disconnect_slave;
|
||||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
|
||||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
|
||||
INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
|
||||
|
@ -85,6 +99,7 @@ COUNT(*) = 0
|
|||
1
|
||||
COMMIT;
|
||||
SET AUTOCOMMIT=ON;
|
||||
connection node_1;
|
||||
SELECT COUNT(*) = 35 FROM t1;
|
||||
COUNT(*) = 35
|
||||
1
|
||||
|
@ -94,8 +109,10 @@ COUNT(*) = 0
|
|||
DROP TABLE t1;
|
||||
COMMIT;
|
||||
SET AUTOCOMMIT=ON;
|
||||
connection node_1;
|
||||
CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query");
|
||||
DROP USER sst;
|
||||
connection node_2;
|
||||
CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query");
|
||||
CALL mtr.add_suppression("InnoDB: Error: Table \"mysql\"\\.\"innodb_index_stats\" not found");
|
||||
CALL mtr.add_suppression("Can't open and lock time zone table");
|
||||
|
@ -103,5 +120,3 @@ CALL mtr.add_suppression("Can't open and lock privilege tables");
|
|||
CALL mtr.add_suppression("Info table is not ready to be used");
|
||||
CALL mtr.add_suppression("Native table .* has the wrong structure");
|
||||
DROP USER sslsst;
|
||||
SET GLOBAL general_log = ON;
|
||||
SET GLOBAL slow_query_log = ON;
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
connection node_1;
|
||||
connection node_2;
|
||||
connection node_1;
|
||||
connection node_2;
|
||||
connection node_2;
|
||||
CREATE TABLE t1(i INT) ENGINE=INNODB;
|
||||
INSERT INTO t1 VALUES(1);
|
||||
|
|
134
mysql-test/suite/galera/t/MW-416.test
Normal file
134
mysql-test/suite/galera/t/MW-416.test
Normal file
|
@ -0,0 +1,134 @@
|
|||
--source include/galera_cluster.inc
|
||||
--source include/have_innodb.inc
|
||||
|
||||
--source include/wait_until_ready.inc
|
||||
|
||||
CREATE USER 'userMW416'@'localhost';
|
||||
GRANT SELECT, INSERT, UPDATE ON test.* TO 'userMW416'@'localhost';
|
||||
|
||||
SHOW GLOBAL STATUS LIKE 'wsrep_replicated';
|
||||
|
||||
--connect userMW416, localhost, userMW416,, test, $NODE_MYPORT_1
|
||||
--connection userMW416
|
||||
|
||||
# DDL
|
||||
|
||||
--error 1044
|
||||
ALTER DATABASE db CHARACTER SET = utf8;
|
||||
--error 1044
|
||||
ALTER EVENT ev1 RENAME TO ev2;
|
||||
--error 1370
|
||||
ALTER FUNCTION fun1 COMMENT 'foo';
|
||||
#--error 1044,1227
|
||||
#ALTER INSTANCE ROTATE INNODB MASTER KEY;
|
||||
--error 1044,1227
|
||||
ALTER LOGFILE GROUP lfg ADD UNDOFILE 'file' ENGINE=InnoDB;
|
||||
--error 1044,1227,1370
|
||||
ALTER PROCEDURE proc1 COMMENT 'foo';
|
||||
--error 1044,1227,1370
|
||||
ALTER SERVER srv OPTIONS (USER 'sally');
|
||||
--error 1044,1142,1227,1370
|
||||
ALTER TABLE tbl DROP COLUMN col;
|
||||
--error 1044,1227,1370
|
||||
ALTER TABLESPACE tblspc DROP DATAFILE 'file' ENGINE=innodb;
|
||||
--error 1044,1142,1227,1370
|
||||
ALTER VIEW vw AS SELECT 1;
|
||||
|
||||
--error 1044,1227,1370
|
||||
CREATE DATABASE db;
|
||||
--error 1044,1227,1370
|
||||
CREATE EVENT ev1 ON SCHEDULE AT CURRENT_TIMESTAMP DO SELECT 1;
|
||||
--error 1044,1227,1370
|
||||
CREATE FUNCTION fun1() RETURNS int RETURN(1);
|
||||
--error 1044,1227,1370
|
||||
CREATE FUNCTION fun1 RETURNS STRING SONAME 'funlib.so';
|
||||
--error 1044,1227,1370
|
||||
CREATE PROCEDURE proc1() BEGIN END;
|
||||
--error 1044,1142,1227,1370
|
||||
CREATE INDEX idx ON tbl(id);
|
||||
--error 1044,1142,1227,1370
|
||||
CREATE LOGFILE GROUP lfg ADD UNDOFILE 'undofile' ENGINE innodb;
|
||||
--error 1044,1142,1227,1370
|
||||
CREATE SERVER srv FOREIGN DATA WRAPPER 'fdw' OPTIONS (USER 'user');
|
||||
--error 1044,1142,1227,1370
|
||||
CREATE TABLE t (i int);
|
||||
--error 1044,1142,1227,1370
|
||||
CREATE TABLESPACE tblspc ADD DATAFILE 'file' ENGINE=innodb;
|
||||
--error 1044,1142,1227,1370
|
||||
CREATE TRIGGER trg BEFORE UPDATE ON t FOR EACH ROW BEGIN END;
|
||||
--error 1044,1142,1227,1370
|
||||
CREATE VIEW vw AS SELECT 1;
|
||||
|
||||
|
||||
|
||||
--error 1044,1142,1227,1370
|
||||
DROP DATABASE db;
|
||||
--error 1044,1142,1227,1370
|
||||
DROP EVENT ev;
|
||||
--error 1044,1142,1227,1370
|
||||
DROP FUNCTION fun1;
|
||||
--error 1044,1142,1227,1370
|
||||
DROP INDEX idx ON t0;
|
||||
--error 1044,1142,1227,1370,1064
|
||||
DROP LOGFILE GROUP lfg;
|
||||
--error 1044,1142,1227,1370
|
||||
DROP PROCEDURE proc1;
|
||||
--error 1044,1142,1227,1370
|
||||
DROP SERVEr srv;
|
||||
--error 1044,1142,1227,1370
|
||||
DROP TABLE t0;
|
||||
--error 1044,1142,1227,1370,1064
|
||||
DROP TABLESPACE tblspc;
|
||||
--error 1044,1142,1227,1360,1370
|
||||
DROP TRIGGER trg;
|
||||
--error 1044,1142,1227,1370
|
||||
DROP VIEW vw;
|
||||
|
||||
--error 1044,1142,1227,1370
|
||||
RENAME TABLE t0 TO t1;
|
||||
|
||||
--error 1044,1142,1227,1370
|
||||
TRUNCATE TABLE t0;
|
||||
|
||||
# DCL
|
||||
|
||||
# account management
|
||||
--error 1044,1142,1227,1370,1064
|
||||
ALTER USER myuser PASSWORD EXPIRE;
|
||||
--error 1044,1142,1227,1370
|
||||
CREATE USER myuser IDENTIFIED BY 'pass';
|
||||
--error 1044,1142,1227,1370
|
||||
DROP USER myuser;
|
||||
--error 1044,1045,1142,1227,1370
|
||||
GRANT ALL ON *.* TO 'myuser';
|
||||
--error 1044,1142,1227,1370
|
||||
RENAME USER myuser TO mariauser;
|
||||
--error 1044,1142,1227,1370
|
||||
REVOKE SELECT ON test FROM myuser;
|
||||
--error 1044,1142,1227,1370,1698
|
||||
REVOKE ALL, GRANT OPTION FROM myuser;
|
||||
--error 1044,1142,1227,1370,1698
|
||||
REVOKE PROXY ON myuser FROM myuser;
|
||||
|
||||
# table maintenance
|
||||
--error 1044,1142,1227,1370
|
||||
ANALYZE TABLE db.tbl;
|
||||
--error 1044,1142,1227,1370
|
||||
CHECK TABLE db.tbl;
|
||||
--error 1044,1142,1227,1370
|
||||
CHECKSUM TABLE db.tbl;
|
||||
--error 1044,1142,1227,1370
|
||||
OPTIMIZE TABLE db.tbl;
|
||||
--error 1044,1142,1227,1370
|
||||
REPAIR TABLE db.tbl;
|
||||
|
||||
# plugin and user defined functions
|
||||
--error 1044,1142,1227,1370
|
||||
INSTALL PLUGIN plg SONAME 'plg.so';
|
||||
--error 1044,1142,1227,1370
|
||||
UNINSTALL PLUGIN plg;
|
||||
|
||||
--connection node_1
|
||||
DROP USER 'userMW416'@'localhost';
|
||||
SHOW DATABASES;
|
||||
SHOW GLOBAL STATUS LIKE 'wsrep_replicated';
|
38
mysql-test/suite/galera/t/galera#500.test
Normal file
38
mysql-test/suite/galera/t/galera#500.test
Normal file
|
@ -0,0 +1,38 @@
|
|||
#
|
||||
# The purpose of this test is to verify that if an exception is
|
||||
# thrown from gcomm background thread, the provider terminates properly
|
||||
# and wsrep_ready becomes 0.
|
||||
#
|
||||
|
||||
--source include/have_innodb.inc
|
||||
--source include/galera_cluster.inc
|
||||
--source include/galera_have_debug_sync.inc
|
||||
|
||||
# Force node_2 gcomm background thread to terminate via exception.
|
||||
--connection node_2
|
||||
--let $wsrep_cluster_address = `SELECT @@wsrep_cluster_address`
|
||||
# Setting gmcast.isolate=2 will force gcomm background thread to
|
||||
# throw exception.
|
||||
SET SESSION wsrep_sync_wait = 0;
|
||||
SET GLOBAL wsrep_provider_options="gmcast.isolate=2";
|
||||
|
||||
# Wait until wsrep_ready becomes 0.
|
||||
--let $wait_condition = SELECT VARIABLE_VALUE = 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME ='wsrep_ready'
|
||||
--source include/wait_condition.inc
|
||||
|
||||
# Wait until node_1 ends up in non-prim and rebootstrap the cluster.
|
||||
--connection node_1
|
||||
SET SESSION wsrep_sync_wait = 0;
|
||||
--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME ='wsrep_cluster_size'
|
||||
--source include/wait_condition.inc
|
||||
SHOW STATUS LIKE 'wsrep_cluster_status';
|
||||
SET SESSION wsrep_sync_wait = default;
|
||||
SET GLOBAL wsrep_provider_options="pc.bootstrap=1";
|
||||
|
||||
# Restart node_2
|
||||
--connection node_2
|
||||
SET SESSION wsrep_on=0;
|
||||
--source include/restart_mysqld.inc
|
||||
|
||||
--connection node_2
|
||||
CALL mtr.add_suppression("WSREP: exception from gcomm, backend must be restarted: Gcomm backend termination was requested by setting gmcast.isolate=2.");
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
--source include/galera_cluster.inc
|
||||
--source include/big_test.inc
|
||||
--source include/have_log_bin.inc
|
||||
|
||||
SET SESSION wsrep_sync_wait = 0;
|
||||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT, f2 LONGBLOB) ENGINE=InnoDB;
|
||||
|
@ -93,6 +94,8 @@ END|
|
|||
|
||||
DELIMITER ;|
|
||||
|
||||
--let $wsrep_last_committed_before = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'`
|
||||
|
||||
--connect node_1_insert_simple, 127.0.0.1, root, , test, $NODE_MYPORT_1
|
||||
--connect node_1_insert_multi, 127.0.0.1, root, , test, $NODE_MYPORT_1
|
||||
--connect node_1_insert_transaction, 127.0.0.1, root, , test, $NODE_MYPORT_1
|
||||
|
@ -124,6 +127,13 @@ DELIMITER ;|
|
|||
|
||||
--connection node_2
|
||||
SET SESSION wsrep_sync_wait = 0;
|
||||
|
||||
# Make sure that node_2 is not killed while TOIs are applied.
|
||||
# Otherwhise we risk that grastate file is marked unsafe, and
|
||||
# as a consequence the node cannot rejoin with IST.
|
||||
--let $wait_condition = SELECT VARIABLE_VALUE > $wsrep_last_committed_before FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'
|
||||
--source include/wait_condition.inc
|
||||
|
||||
--source include/kill_galera.inc
|
||||
|
||||
--sleep 10
|
||||
|
@ -172,9 +182,8 @@ SET SESSION wsrep_sync_wait = 0;
|
|||
--source include/start_mysqld.inc
|
||||
|
||||
--connection node_1
|
||||
--source include/wait_until_connected_again.inc
|
||||
--source include/galera_wait_ready.inc
|
||||
--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
|
||||
--source include/wait_condition.inc
|
||||
|
||||
--let $diff_servers = 1 2
|
||||
--source include/diff_servers.inc
|
||||
|
|
|
@ -16,7 +16,7 @@ if (!`SELECT @@open_files_limit >= 1024`){
|
|||
while ($count)
|
||||
{
|
||||
--disable_query_log
|
||||
--let $ddl_var = `SELECT CONCAT("CREATE TABLE t", $count, " (f1 INTEGER AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB")`
|
||||
--let $ddl_var = `SELECT CONCAT("CREATE TABLE t", $count, " (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB")`
|
||||
--eval $ddl_var
|
||||
--enable_query_log
|
||||
--dec $count
|
||||
|
@ -37,7 +37,7 @@ START TRANSACTION;
|
|||
while ($count)
|
||||
{
|
||||
--disable_query_log
|
||||
--let $ddl_var = `SELECT CONCAT("INSERT INTO t", $count, " VALUES (DEFAULT)")`
|
||||
--let $ddl_var = `SELECT CONCAT("INSERT INTO t", $count, " VALUES (1)")`
|
||||
--eval $ddl_var
|
||||
--enable_query_log
|
||||
--dec $count
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
--source include/big_test.inc
|
||||
--source include/galera_cluster.inc
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_mariabackup.inc
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue