Skip to content

M
MariaDB
Commit 36ebd704 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

5.7.28

parent 15f60c1a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5077 additions and 2340 deletions
include/mysql/psi/mysql_file.h
View file @ 36ebd704
/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......@@ -1306,12 +1313,12 @@ inline_mysql_file_rename(
struct PSI_file_locker *locker;
PSI_file_locker_state state;
locker= PSI_FILE_CALL(get_thread_file_name_locker)
(&state, key, PSI_FILE_RENAME, to, &locker);
(&state, key, PSI_FILE_RENAME, from, &locker);
if (likely(locker != NULL))
{
PSI_FILE_CALL(start_file_wait)(locker, (size_t) 0, src_file, src_line);
result= my_rename(from, to, flags);
PSI_FILE_CALL(end_file_wait)(locker, (size_t) 0);
PSI_FILE_CALL(end_file_rename_wait)(locker, from, to, result);
return result;
}
#endif
......@@ -1387,12 +1394,12 @@ inline_mysql_file_rename_with_symlink(
struct PSI_file_locker *locker;
PSI_file_locker_state state;
locker= PSI_FILE_CALL(get_thread_file_name_locker)
(&state, key, PSI_FILE_RENAME, to, &locker);
(&state, key, PSI_FILE_RENAME, from, &locker);
if (likely(locker != NULL))
{
PSI_FILE_CALL(start_file_wait)(locker, (size_t) 0, src_file, src_line);
result= my_rename_with_symlink(from, to, flags);
PSI_FILE_CALL(end_file_wait)(locker, (size_t) 0);
PSI_FILE_CALL(end_file_rename_wait)(locker, from, to, result);
return result;
}
#endif
......
include/mysql/psi/mysql_idle.h
View file @ 36ebd704
/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......
include/mysql/psi/mysql_mdl.h
View file @ 36ebd704
/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......
include/mysql/psi/mysql_memory.h
View file @ 36ebd704
/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......
include/mysql/psi/mysql_ps.h
View file @ 36ebd704
/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
......@@ -36,6 +43,8 @@
inline_mysql_destroy_prepared_stmt(PREPARED_STMT)
#define MYSQL_REPREPARE_PS(PREPARED_STMT) \
inline_mysql_reprepare_prepared_stmt(PREPARED_STMT)
#define MYSQL_SET_PS_TEXT(PREPARED_STMT, SQLTEXT, SQLTEXT_LENGTH) \
inline_mysql_set_prepared_stmt_text(PREPARED_STMT, SQLTEXT, SQLTEXT_LENGTH)
#else
#define MYSQL_CREATE_PS(IDENTITY, ID, LOCKER, NAME, NAME_LENGTH, SQLTEXT, SQLTEXT_LENGTH) \
NULL
......@@ -45,6 +54,8 @@
do {} while (0)
#define MYSQL_REPREPARE_PS(PREPARED_STMT) \
do {} while (0)
#define MYSQL_SET_PS_TEXT(PREPARED_STMT, SQLTEXT, SQLTEXT_LENGTH) \
do {} while (0)
#endif
#ifdef HAVE_PSI_PS_INTERFACE
......@@ -83,6 +94,17 @@ inline_mysql_reprepare_prepared_stmt(PSI_prepared_stmt *prepared_stmt)
if (prepared_stmt != NULL)
PSI_PS_CALL(reprepare_prepared_stmt)(prepared_stmt);
}
static inline void
inline_mysql_set_prepared_stmt_text(PSI_prepared_stmt *prepared_stmt,
const char *text,
uint text_len)
{
if (prepared_stmt != NULL)
{
PSI_PS_CALL(set_prepared_stmt_text)(prepared_stmt, text, text_len);
}
}
#endif
#endif
include/mysql/psi/mysql_socket.h
View file @ 36ebd704
/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; version 2 of the
License.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
......
include/mysql/psi/mysql_sp.h
View file @ 36ebd704
/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
......
include/mysql/psi/mysql_stage.h
View file @ 36ebd704
/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
......
include/mysql/psi/mysql_statement.h
View file @ 36ebd704
/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
......
include/mysql/psi/mysql_table.h
View file @ 36ebd704
/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......
include/mysql/psi/mysql_thread.h
View file @ 36ebd704
/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......
include/mysql/psi/mysql_transaction.h
View file @ 36ebd704
/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
......
include/mysql/psi/psi.h
View file @ 36ebd704
/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......@@ -1964,6 +1971,17 @@ typedef void (*start_file_close_wait_v1_t)
typedef void (*end_file_close_wait_v1_t)
(struct PSI_file_locker *locker, int rc);
/**
Rename a file instrumentation close operation.
@param locker the file locker.
@param old_name name of the file to be renamed.
@param new_name name of the file after rename.
@param rc the rename operation return code (0 for success).
*/
typedef void (*end_file_rename_wait_v1_t)
(struct PSI_file_locker *locker, const char *old_name,
const char *new_name, int rc);
/**
Start a new stage, and implicitly end the previous stage.
@param key the key of the new stage
......@@ -2343,6 +2361,15 @@ typedef void (*reprepare_prepared_stmt_v1_t)
typedef void (*execute_prepared_stmt_v1_t)
(PSI_statement_locker *locker, PSI_prepared_stmt* prepared_stmt);
/**
Set the statement text for a prepared statment event.
@param prepared_stmt prepared statement.
@param text the prepared statement text
@param text_len the prepared statement text length
*/
typedef void (*set_prepared_stmt_text_v1_t)(PSI_prepared_stmt *prepared_stmt,
const char *text,
uint text_len);
/**
Get a digest locker for the current statement.
@param locker a statement locker for the running thread
......@@ -2572,6 +2599,8 @@ struct PSI_v1
start_file_close_wait_v1_t start_file_close_wait;
/** @sa end_file_close_wait_v1_t. */
end_file_close_wait_v1_t end_file_close_wait;
/** @sa rename_file_close_wait_v1_t. */
end_file_rename_wait_v1_t end_file_rename_wait;
/** @sa start_stage_v1_t. */
start_stage_v1_t start_stage;
/** @sa get_current_stage_progress_v1_t. */
......@@ -2658,6 +2687,8 @@ struct PSI_v1
reprepare_prepared_stmt_v1_t reprepare_prepared_stmt;
/** @sa execute_prepared_stmt_v1_t. */
execute_prepared_stmt_v1_t execute_prepared_stmt;
/** @sa set_prepared_stmt_text_v1_t. */
set_prepared_stmt_text_v1_t set_prepared_stmt_text;
/** @sa digest_start_v1_t. */
digest_start_v1_t digest_start;
/** @sa digest_end_v1_t. */
......
include/mysql/psi/psi_abi_v0.h
View file @ 36ebd704
/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......
include/mysql/psi/psi_abi_v1.h
View file @ 36ebd704
/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......
include/mysql/psi/psi_abi_v1.h.pp
View file @ 36ebd704
......@@ -550,6 +550,9 @@ typedef void (*start_file_close_wait_v1_t)
(struct PSI_file_locker *locker, const char *src_file, uint src_line);
typedef void (*end_file_close_wait_v1_t)
(struct PSI_file_locker *locker, int rc);
typedef void (*end_file_rename_wait_v1_t)
(struct PSI_file_locker *locker, const char *old_name,
const char *new_name, int rc);
typedef PSI_stage_progress* (*start_stage_v1_t)
(PSI_stage_key key, const char *src_file, int src_line);
typedef PSI_stage_progress* (*get_current_stage_progress_v1_t)(void);
......@@ -654,6 +657,9 @@ typedef void (*reprepare_prepared_stmt_v1_t)
(PSI_prepared_stmt *prepared_stmt);
typedef void (*execute_prepared_stmt_v1_t)
(PSI_statement_locker *locker, PSI_prepared_stmt* prepared_stmt);
typedef void (*set_prepared_stmt_text_v1_t)(PSI_prepared_stmt *prepared_stmt,
const char *text,
uint text_len);
typedef struct PSI_digest_locker * (*digest_start_v1_t)
(struct PSI_statement_locker *locker);
typedef void (*digest_end_v1_t)
......@@ -764,6 +770,7 @@ struct PSI_v1
end_file_wait_v1_t end_file_wait;
start_file_close_wait_v1_t start_file_close_wait;
end_file_close_wait_v1_t end_file_close_wait;
end_file_rename_wait_v1_t end_file_rename_wait;
start_stage_v1_t start_stage;
get_current_stage_progress_v1_t get_current_stage_progress;
end_stage_v1_t end_stage;
......@@ -807,6 +814,7 @@ struct PSI_v1
destroy_prepared_stmt_v1_t destroy_prepared_stmt;
reprepare_prepared_stmt_v1_t reprepare_prepared_stmt;
execute_prepared_stmt_v1_t execute_prepared_stmt;
set_prepared_stmt_text_v1_t set_prepared_stmt_text;
digest_start_v1_t digest_start;
digest_end_v1_t digest_end;
set_thread_connect_attrs_v1_t set_thread_connect_attrs;
......
include/mysql/psi/psi_abi_v2.h
View file @ 36ebd704
/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......
include/mysql/psi/psi_base.h
View file @ 36ebd704
/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
Without limiting anything contained in the foregoing, this file,
which is part of C Driver for MySQL (Connector/C), is also subject to the
Universal FOSS Exception, version 1.0, a copy of which can be found at
http://oss.oracle.com/licenses/universal-foss-exception.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......
include/mysql/psi/psi_memory.h
View file @ 36ebd704
/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
Without limiting anything contained in the foregoing, this file,
which is part of C Driver for MySQL (Connector/C), is also subject to the
Universal FOSS Exception, version 1.0, a copy of which can be found at
http://oss.oracle.com/licenses/universal-foss-exception.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
......
mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc
View file @ 36ebd704
......@@ -13,8 +13,7 @@ let $wait_timeout= 10;
let $wait_condition=
SELECT COUNT(*) > 0 FROM performance_schema.threads
WHERE THREAD_ID = @con1_thread_id
AND (PROCESSLIST_STATE = 'Sleep' OR PROCESSLIST_STATE IS NULL)
AND PROCESSLIST_INFO IS NULL;
AND (PROCESSLIST_STATE = 'Sleep' OR PROCESSLIST_STATE IS NULL);
--source include/wait_condition.inc
if(!$success)
{
......
mysql-test/suite/perfschema/r/aggregate.result deleted 100644 → 0
View file @ 15f60c1a
"General cleanup"
drop table if exists t1;
update performance_schema.setup_instruments set enabled = 'NO';
update performance_schema.setup_consumers set enabled = 'NO';
truncate table performance_schema.file_summary_by_event_name;
truncate table performance_schema.file_summary_by_instance;
truncate table performance_schema.socket_summary_by_event_name;
truncate table performance_schema.socket_summary_by_instance;
truncate table performance_schema.events_waits_summary_global_by_event_name;
truncate table performance_schema.events_waits_summary_by_instance;
truncate table performance_schema.events_waits_summary_by_thread_by_event_name;
update performance_schema.setup_consumers set enabled = 'YES';
update performance_schema.setup_instruments
set enabled = 'YES', timed = 'YES';
create table t1 (
id INT PRIMARY KEY,
b CHAR(100) DEFAULT 'initial value')
ENGINE=MyISAM;
insert into t1 (id) values (1), (2), (3), (4), (5), (6), (7), (8);
update performance_schema.setup_instruments SET enabled = 'NO';
update performance_schema.setup_consumers set enabled = 'NO';
set @dump_all=FALSE;
"Verifying file aggregate consistency"
SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ)
FROM performance_schema.file_summary_by_event_name AS e
JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.COUNT_READ <> SUM(i.COUNT_READ))
OR @dump_all;
EVENT_NAME COUNT_READ SUM(i.COUNT_READ)
SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE)
FROM performance_schema.file_summary_by_event_name AS e
JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE))
OR @dump_all;
EVENT_NAME COUNT_WRITE SUM(i.COUNT_WRITE)
SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ)
FROM performance_schema.socket_summary_by_event_name AS e
JOIN performance_schema.socket_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.COUNT_READ <> SUM(i.COUNT_READ))
OR @dump_all;
EVENT_NAME COUNT_READ SUM(i.COUNT_READ)
SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE)
FROM performance_schema.socket_summary_by_event_name AS e
JOIN performance_schema.socket_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE))
OR @dump_all;
EVENT_NAME COUNT_WRITE SUM(i.COUNT_WRITE)
SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_READ, SUM(i.SUM_NUMBER_OF_BYTES_READ)
FROM performance_schema.file_summary_by_event_name AS e
JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.SUM_NUMBER_OF_BYTES_READ <> SUM(i.SUM_NUMBER_OF_BYTES_READ))
OR @dump_all;
EVENT_NAME SUM_NUMBER_OF_BYTES_READ SUM(i.SUM_NUMBER_OF_BYTES_READ)
SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_WRITE, SUM(i.SUM_NUMBER_OF_BYTES_WRITE)
FROM performance_schema.file_summary_by_event_name AS e
JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.SUM_NUMBER_OF_BYTES_WRITE <> SUM(i.SUM_NUMBER_OF_BYTES_WRITE))
OR @dump_all;
EVENT_NAME SUM_NUMBER_OF_BYTES_WRITE SUM(i.SUM_NUMBER_OF_BYTES_WRITE)
"Verifying waits aggregate consistency (instance)"
SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT)
FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT))
OR @dump_all;
EVENT_NAME SUM_TIMER_WAIT SUM(i.SUM_TIMER_WAIT)
SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(i.MIN_TIMER_WAIT)
FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.MIN_TIMER_WAIT > MIN(i.MIN_TIMER_WAIT))
AND (MIN(i.MIN_TIMER_WAIT) != 0)
OR @dump_all;
EVENT_NAME MIN_TIMER_WAIT MIN(i.MIN_TIMER_WAIT)
SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT)
FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT))
OR @dump_all;
EVENT_NAME MAX_TIMER_WAIT MAX(i.MAX_TIMER_WAIT)
"Verifying waits aggregate consistency (thread)"
SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(t.SUM_TIMER_WAIT)
FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t
USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT))
OR @dump_all;
EVENT_NAME SUM_TIMER_WAIT SUM(t.SUM_TIMER_WAIT)
SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(t.MIN_TIMER_WAIT)
FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t
USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT))
AND (MIN(t.MIN_TIMER_WAIT) != 0)
OR @dump_all;
EVENT_NAME MIN_TIMER_WAIT MIN(t.MIN_TIMER_WAIT)
SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(t.MAX_TIMER_WAIT)
FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t
USING (EVENT_NAME)
GROUP BY EVENT_NAME
HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT))
OR @dump_all;
EVENT_NAME MAX_TIMER_WAIT MAX(t.MAX_TIMER_WAIT)
update performance_schema.setup_consumers set enabled = 'YES';
update performance_schema.setup_instruments
set enabled = 'YES', timed = 'YES';
drop table test.t1;
mysql-test/suite/perfschema/r/csv_table_io.result
View file @ 36ebd704
......@@ -70,39 +70,39 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
Variable_name Value
Performance_schema_accounts_lost 0
......
mysql-test/suite/perfschema/r/digest_table_full.result
View file @ 36ebd704
......@@ -113,7 +113,7 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARN
SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS
NULL NULL NULL 55 32 1 2
statements_digest 21b6affb55f3e69c598b47257f4d0ec6 TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0
statements_digest d24da32343f2b799f8a7ba1bdc45f83b TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0
SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size";
Variable_name Value
performance_schema_digests_size 2
......
mysql-test/suite/perfschema/r/dml_file_instances.result
View file @ 36ebd704
......@@ -18,3 +18,62 @@ UNLOCK TABLES;
LOCK TABLES performance_schema.file_instances WRITE;
ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
UNLOCK TABLES;
###
### Bug#26152751: INNODB LEAKS MEMORY, PERFORMANCE_SCHEMA FILE_INSTANCES
### #SQL-IB3129987-252773.IBD
###
CREATE DATABASE db_26152751;
USE db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
CREATE TABLE t_db_26152751 (a INT) ENGINE=MYISAM;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
t_db_26152751.frm
t_db_26152751.MYI
t_db_26152751.MYD
RENAME TABLE t_db_26152751 to t_db_26152751_new;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
t_db_26152751_new.frm
t_db_26152751_new.MYI
t_db_26152751_new.MYD
RENAME TABLE t_db_26152751_new to t_db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
t_db_26152751.frm
t_db_26152751.MYI
t_db_26152751.MYD
ALTER TABLE t_db_26152751 ADD COLUMN b INT;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
t_db_26152751.frm
t_db_26152751.MYI
t_db_26152751.MYD
DROP TABLE t_db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
CREATE TABLE t_db_26152751 (a INT) ENGINE=INNODB;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
t_db_26152751.frm
t_db_26152751.ibd
RENAME TABLE t_db_26152751 to t_db_26152751_new;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
t_db_26152751_new.frm
t_db_26152751_new.ibd
RENAME TABLE t_db_26152751_new to t_db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
t_db_26152751.frm
t_db_26152751.ibd
ALTER TABLE t_db_26152751 ADD COLUMN b INT;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
t_db_26152751.frm
t_db_26152751.ibd
DROP TABLE t_db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
FILE_NAME
DROP DATABASE db_26152751;
mysql-test/suite/perfschema/r/dml_replication_group_member_stats.result
View file @ 36ebd704
SELECT * FROM performance_schema.replication_group_member_stats
LIMIT 1;
CHANNEL_NAME VIEW_ID MEMBER_ID COUNT_TRANSACTIONS_IN_QUEUE COUNT_TRANSACTIONS_CHECKED COUNT_CONFLICTS_DETECTED COUNT_TRANSACTIONS_VALIDATING TRANSACTIONS_COMMITTED_ALL_MEMBERS LAST_CONFLICT_FREE_TRANSACTION
CHANNEL_NAME VIEW_ID MEMBER_ID COUNT_TRANSACTIONS_IN_QUEUE COUNT_TRANSACTIONS_CHECKED COUNT_CONFLICTS_DETECTED COUNT_TRANSACTIONS_ROWS_VALIDATING TRANSACTIONS_COMMITTED_ALL_MEMBERS LAST_CONFLICT_FREE_TRANSACTION
SELECT * FROM performance_schema.replication_group_member_stats
WHERE channel_name='FOO';
CHANNEL_NAME VIEW_ID MEMBER_ID COUNT_TRANSACTIONS_IN_QUEUE COUNT_TRANSACTIONS_CHECKED COUNT_CONFLICTS_DETECTED COUNT_TRANSACTIONS_VALIDATING TRANSACTIONS_COMMITTED_ALL_MEMBERS LAST_CONFLICT_FREE_TRANSACTION
CHANNEL_NAME VIEW_ID MEMBER_ID COUNT_TRANSACTIONS_IN_QUEUE COUNT_TRANSACTIONS_CHECKED COUNT_CONFLICTS_DETECTED COUNT_TRANSACTIONS_ROWS_VALIDATING TRANSACTIONS_COMMITTED_ALL_MEMBERS LAST_CONFLICT_FREE_TRANSACTION
INSERT INTO performance_schema.replication_group_member_stats
SET channel_name='FOO', node_id=1;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_group_member_stats'
......
mysql-test/suite/perfschema/r/dml_setup_instruments.result
View file @ 36ebd704
......@@ -16,7 +16,9 @@ wait/synch/mutex/sql/LOCK_audit_mask YES YES
wait/synch/mutex/sql/LOCK_compress_gtid_table YES YES
select * from performance_schema.setup_instruments
where name like 'Wait/Synch/Rwlock/sql/%'
and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock')
and name not in (
'wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock',
'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group')
order by name limit 10;
NAME ENABLED TIMED
wait/synch/rwlock/sql/Binlog_relay_IO_delegate::lock YES YES
......
mysql-test/suite/perfschema/r/dml_setup_timers.result
View file @ 36ebd704
update performance_schema.setup_timers
set timer_name='CYCLE' where name="wait";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
update performance_schema.setup_timers
set timer_name='NANOSECOND' where name="stage";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
update performance_schema.setup_timers
set timer_name='NANOSECOND' where name="statement";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
update performance_schema.setup_timers
set timer_name='MICROSECOND' where name="transaction";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
update performance_schema.setup_timers
set timer_name='MICROSECOND' where name="idle";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.setup_timers;
NAME TIMER_NAME
idle MICROSECOND
......@@ -15,14 +25,20 @@ wait CYCLE
stage NANOSECOND
statement NANOSECOND
transaction MICROSECOND
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.setup_timers
where name='Wait';
NAME TIMER_NAME
wait CYCLE
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.setup_timers
where timer_name='CYCLE';
NAME TIMER_NAME
wait CYCLE
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
insert into performance_schema.setup_timers
set name='FOO', timer_name='CYCLE';
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_timers'
......@@ -31,6 +47,8 @@ set name='FOO';
ERROR HY000: Invalid performance_schema usage.
update performance_schema.setup_timers
set timer_name='MILLISECOND';
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.setup_timers;
NAME TIMER_NAME
idle MILLISECOND
......@@ -38,8 +56,12 @@ wait MILLISECOND
stage MILLISECOND
statement MILLISECOND
transaction MILLISECOND
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
update performance_schema.setup_timers
set timer_name='CYCLE';
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
delete from performance_schema.setup_timers;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers'
delete from performance_schema.setup_timers
......@@ -51,14 +73,24 @@ LOCK TABLES performance_schema.setup_timers WRITE;
UNLOCK TABLES;
update performance_schema.setup_timers
set timer_name='CYCLE' where name="wait";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
update performance_schema.setup_timers
set timer_name='NANOSECOND' where name="stage";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
update performance_schema.setup_timers
set timer_name='NANOSECOND' where name="statement";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
update performance_schema.setup_timers
set timer_name='MICROSECOND' where name="transaction";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
update performance_schema.setup_timers
set timer_name='MICROSECOND' where name="idle";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.setup_timers;
NAME TIMER_NAME
idle MICROSECOND
......@@ -66,3 +98,5 @@ wait CYCLE
stage NANOSECOND
statement NANOSECOND
transaction MICROSECOND
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/global_read_lock.result
View file @ 36ebd704
......@@ -35,7 +35,7 @@ operation
from performance_schema.events_waits_current
where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status";
event_name short_source timer_end timer_wait operation
wait/synch/cond/sql/MDL_context::COND_wait_status mdl.cc: SET SET timed_wait
wait/synch/cond/sql/MDL_context::COND_wait_status SET SET timed_wait
unlock tables;
update performance_schema.setup_instruments set enabled='NO';
update performance_schema.setup_instruments set enabled='YES';
......
mysql-test/suite/perfschema/r/innodb_table_io.result
View file @ 36ebd704
......@@ -71,39 +71,39 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
Variable_name Value
Performance_schema_accounts_lost 0
......
mysql-test/suite/perfschema/r/max_program_zero.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 0
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/memory_aggregate.result
View file @ 36ebd704
......@@ -249,6 +249,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 2 2
set GLOBAL query_cache_size=1000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_1", 10);
get_lock("marker_1", 10)
1
......@@ -643,6 +645,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 3 3
set GLOBAL query_cache_size=2000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_2", 10);
get_lock("marker_2", 10)
1
......@@ -1415,6 +1419,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 4 4
set GLOBAL query_cache_size=500*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_3", 10);
get_lock("marker_3", 10)
1
......@@ -2105,6 +2111,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 6 6
set GLOBAL query_cache_size=4000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_4", 10);
get_lock("marker_4", 10)
1
......@@ -5584,3 +5592,5 @@ root 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 1 1
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/memory_aggregate_32bit.result
View file @ 36ebd704
......@@ -249,6 +249,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 2 2
set GLOBAL query_cache_size=1000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_1", 10);
get_lock("marker_1", 10)
1
......@@ -643,6 +645,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 3 3
set GLOBAL query_cache_size=2000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_2", 10);
get_lock("marker_2", 10)
1
......@@ -1415,6 +1419,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 4 4
set GLOBAL query_cache_size=500*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_3", 10);
get_lock("marker_3", 10)
1
......@@ -2105,6 +2111,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 6 6
set GLOBAL query_cache_size=4000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_4", 10);
get_lock("marker_4", 10)
1
......@@ -5584,3 +5592,5 @@ root 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 1 1
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/memory_aggregate_no_a.result
View file @ 36ebd704
......@@ -220,6 +220,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 2 2
set GLOBAL query_cache_size=1000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_1", 10);
get_lock("marker_1", 10)
1
......@@ -531,6 +533,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 3 3
set GLOBAL query_cache_size=2000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_2", 10);
get_lock("marker_2", 10)
1
......@@ -1111,6 +1115,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 4 4
set GLOBAL query_cache_size=500*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_3", 10);
get_lock("marker_3", 10)
1
......@@ -1610,6 +1616,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 6 6
set GLOBAL query_cache_size=4000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_4", 10);
get_lock("marker_4", 10)
1
......@@ -3996,3 +4004,5 @@ root 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 1 1
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_h.result
View file @ 36ebd704
......@@ -170,6 +170,8 @@ user1 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=1000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_1", 10);
get_lock("marker_1", 10)
1
......@@ -431,6 +433,8 @@ user2 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=2000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_2", 10);
get_lock("marker_2", 10)
1
......@@ -936,6 +940,8 @@ user3 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=500*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_3", 10);
get_lock("marker_3", 10)
1
......@@ -1385,6 +1391,8 @@ user4 2 2
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=4000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_4", 10);
get_lock("marker_4", 10)
1
......@@ -3446,3 +3454,5 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
root 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u.result
View file @ 36ebd704
......@@ -193,6 +193,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 2 2
set GLOBAL query_cache_size=1000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_1", 10);
get_lock("marker_1", 10)
1
......@@ -427,6 +429,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 3 3
set GLOBAL query_cache_size=2000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_2", 10);
get_lock("marker_2", 10)
1
......@@ -829,6 +833,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 4 4
set GLOBAL query_cache_size=500*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_3", 10);
get_lock("marker_3", 10)
1
......@@ -1151,6 +1157,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 6 6
set GLOBAL query_cache_size=4000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_4", 10);
get_lock("marker_4", 10)
1
......@@ -2424,3 +2432,5 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 1 1
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u_no_h.result
View file @ 36ebd704
......@@ -143,6 +143,8 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=1000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_1", 10);
get_lock("marker_1", 10)
1
......@@ -327,6 +329,8 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=2000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_2", 10);
get_lock("marker_2", 10)
1
......@@ -654,6 +658,8 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=500*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_3", 10);
get_lock("marker_3", 10)
1
......@@ -926,6 +932,8 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=4000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_4", 10);
get_lock("marker_4", 10)
1
......@@ -1874,3 +1882,5 @@ execute dump_users;
USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/memory_aggregate_no_h.result
View file @ 36ebd704
......@@ -199,6 +199,8 @@ user1 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=1000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_1", 10);
get_lock("marker_1", 10)
1
......@@ -543,6 +545,8 @@ user2 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=2000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_2", 10);
get_lock("marker_2", 10)
1
......@@ -1240,6 +1244,8 @@ user3 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=500*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_3", 10);
get_lock("marker_3", 10)
1
......@@ -1880,6 +1886,8 @@ user4 2 2
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=4000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_4", 10);
get_lock("marker_4", 10)
1
......@@ -5034,3 +5042,5 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
root 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/memory_aggregate_no_u.result
View file @ 36ebd704
......@@ -222,6 +222,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 2 2
set GLOBAL query_cache_size=1000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_1", 10);
get_lock("marker_1", 10)
1
......@@ -539,6 +541,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 3 3
set GLOBAL query_cache_size=2000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_2", 10);
get_lock("marker_2", 10)
1
......@@ -1133,6 +1137,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 4 4
set GLOBAL query_cache_size=500*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_3", 10);
get_lock("marker_3", 10)
1
......@@ -1646,6 +1652,8 @@ execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 6 6
set GLOBAL query_cache_size=4000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_4", 10);
get_lock("marker_4", 10)
1
......@@ -4012,3 +4020,5 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 1 1
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/memory_aggregate_no_u_no_h.result
View file @ 36ebd704
......@@ -172,6 +172,8 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=1000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_1", 10);
get_lock("marker_1", 10)
1
......@@ -439,6 +441,8 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=2000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_2", 10);
get_lock("marker_2", 10)
1
......@@ -958,6 +962,8 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=500*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_3", 10);
get_lock("marker_3", 10)
1
......@@ -1421,6 +1427,8 @@ USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
set GLOBAL query_cache_size=4000*1024;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
select get_lock("marker_4", 10);
get_lock("marker_4", 10)
1
......@@ -3462,3 +3470,5 @@ execute dump_users;
USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/memory_table_io.result
View file @ 36ebd704
......@@ -70,39 +70,39 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
Variable_name Value
Performance_schema_accounts_lost 0
......
mysql-test/suite/perfschema/r/merge_table_io.result
View file @ 36ebd704
......@@ -96,45 +96,45 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
Variable_name Value
Performance_schema_accounts_lost 0
......
mysql-test/suite/perfschema/r/multi_table_io.result
View file @ 36ebd704
......@@ -52,25 +52,25 @@ where event_name like 'wait/io/table/%'
and object_schema in ('test','test1')
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test t1 update 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 update 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test t1 delete 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 delete 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test1 t2 insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test t1 update 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test1 t2 update 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test t1 delete 1
wait/io/table/sql/handler TABLE test1 t2 delete 1
show global status like 'performance_schema_%';
Variable_name Value
Performance_schema_accounts_lost 0
......
mysql-test/suite/perfschema/r/myisam_file_io.result
View file @ 36ebd704
......@@ -20,28 +20,28 @@ where operation not like "tell"
and event_name like "wait/io/file/myisam/%"
order by thread_id, event_id;
event_name short_source operation number_of_bytes short_name
wait/io/file/myisam/kfile mi_create.c: create NULL no_index_tab.MYI
wait/io/file/myisam/dfile mi_create.c: create NULL no_index_tab.MYD
wait/io/file/myisam/kfile mi_open.c: write 176 no_index_tab.MYI
wait/io/file/myisam/kfile mi_open.c: write 100 no_index_tab.MYI
wait/io/file/myisam/kfile mi_open.c: write 7 no_index_tab.MYI
wait/io/file/myisam/kfile mi_open.c: write 7 no_index_tab.MYI
wait/io/file/myisam/kfile mi_open.c: write 7 no_index_tab.MYI
wait/io/file/myisam/kfile mi_create.c: chsize 1024 no_index_tab.MYI
wait/io/file/myisam/dfile mi_create.c: close NULL no_index_tab.MYD
wait/io/file/myisam/kfile mi_create.c: close NULL no_index_tab.MYI
wait/io/file/myisam/kfile mi_open.c: open NULL no_index_tab.MYI
wait/io/file/myisam/kfile mi_open.c: read 24 no_index_tab.MYI
wait/io/file/myisam/kfile mi_open.c: seek NULL no_index_tab.MYI
wait/io/file/myisam/kfile mi_open.c: read 297 no_index_tab.MYI
wait/io/file/myisam/dfile mi_open.c: open NULL no_index_tab.MYD
wait/io/file/myisam/kfile mi_locking.c: write 3 no_index_tab.MYI
wait/io/file/myisam/dfile mi_dynrec.c: write 20 no_index_tab.MYD
wait/io/file/myisam/kfile mi_open.c: write 124 no_index_tab.MYI
wait/io/file/myisam/dfile mi_dynrec.c: write 20 no_index_tab.MYD
wait/io/file/myisam/kfile mi_open.c: write 124 no_index_tab.MYI
wait/io/file/myisam/dfile mi_dynrec.c: write 20 no_index_tab.MYD
wait/io/file/myisam/kfile mi_open.c: write 124 no_index_tab.MYI
wait/io/file/myisam/kfile create NULL no_index_tab.MYI
wait/io/file/myisam/dfile create NULL no_index_tab.MYD
wait/io/file/myisam/kfile write 176 no_index_tab.MYI
wait/io/file/myisam/kfile write 100 no_index_tab.MYI
wait/io/file/myisam/kfile write 7 no_index_tab.MYI
wait/io/file/myisam/kfile write 7 no_index_tab.MYI
wait/io/file/myisam/kfile write 7 no_index_tab.MYI
wait/io/file/myisam/kfile chsize 1024 no_index_tab.MYI
wait/io/file/myisam/dfile close NULL no_index_tab.MYD
wait/io/file/myisam/kfile close NULL no_index_tab.MYI
wait/io/file/myisam/kfile open NULL no_index_tab.MYI
wait/io/file/myisam/kfile read 24 no_index_tab.MYI
wait/io/file/myisam/kfile seek NULL no_index_tab.MYI
wait/io/file/myisam/kfile read 297 no_index_tab.MYI
wait/io/file/myisam/dfile open NULL no_index_tab.MYD
wait/io/file/myisam/kfile write 3 no_index_tab.MYI
wait/io/file/myisam/dfile write 20 no_index_tab.MYD
wait/io/file/myisam/kfile write 124 no_index_tab.MYI
wait/io/file/myisam/dfile write 20 no_index_tab.MYD
wait/io/file/myisam/kfile write 124 no_index_tab.MYI
wait/io/file/myisam/dfile write 20 no_index_tab.MYD
wait/io/file/myisam/kfile write 124 no_index_tab.MYI
show global status like 'performance_schema_%';
Variable_name Value
Performance_schema_accounts_lost 0
......
mysql-test/suite/perfschema/r/myisam_table_io.result
View file @ 36ebd704
......@@ -70,39 +70,39 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
Variable_name Value
Performance_schema_accounts_lost 0
......
mysql-test/suite/perfschema/r/no_threads.result
View file @ 36ebd704
......@@ -32,16 +32,16 @@ select event_name, operation,
left(source, locate(":", source)) as short_source
from performance_schema.events_waits_current;
event_name operation short_source
wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c:
wait/synch/mutex/mysys/THR_LOCK_myisam lock
select event_name, operation,
left(source, locate(":", source)) as short_source
from performance_schema.events_waits_history;
event_name operation short_source
wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c:
wait/synch/mutex/mysys/THR_LOCK_myisam lock
select event_name, operation,
left(source, locate(":", source)) as short_source
from performance_schema.events_waits_history_long;
event_name operation short_source
wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c:
wait/synch/mutex/mysys/THR_LOCK_myisam lock
update performance_schema.setup_instruments set enabled='YES';
drop table test.t1;
mysql-test/suite/perfschema/r/one_thread_per_con.result
View file @ 36ebd704
......@@ -16,19 +16,19 @@ create table test.t3(a int) engine=MYISAM;
"----------------- Connection default"
execute stmt_dump_events using @tid;
event_name short_source operation number_of_bytes
wait/synch/mutex/mysys/THR_LOCK_myisam mi_create.c: lock NULL
wait/synch/mutex/mysys/THR_LOCK_myisam lock NULL
execute stmt_dump_thread using @tid;
name
thread/sql/one_connection
execute stmt_dump_events using @tid;
event_name short_source operation number_of_bytes
wait/synch/mutex/mysys/THR_LOCK_myisam mi_create.c: lock NULL
wait/synch/mutex/mysys/THR_LOCK_myisam lock NULL
execute stmt_dump_thread using @tid;
name
thread/sql/one_connection
execute stmt_dump_events using @tid;
event_name short_source operation number_of_bytes
wait/synch/mutex/mysys/THR_LOCK_myisam mi_create.c: lock NULL
wait/synch/mutex/mysys/THR_LOCK_myisam lock NULL
execute stmt_dump_thread using @tid;
name
thread/sql/one_connection
......
mysql-test/suite/perfschema/r/ortho_iter.result
View file @ 36ebd704
......@@ -238,11 +238,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/part_table_io.result
View file @ 36ebd704
......@@ -13,6 +13,8 @@ insert into marker set a = 1;
create table test.no_index_tab
( a varchar(255) not null, b int not null) engine = MyISAM
PARTITION BY KEY (b) PARTITIONS 2;
Warnings:
Warning 1287 The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
insert into marker set a = 1;
show create table test.no_index_tab;
Table Create Table
......@@ -22,6 +24,8 @@ no_index_tab CREATE TABLE `no_index_tab` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50100 PARTITION BY KEY (b)
PARTITIONS 2 */
Warnings:
Warning 1287 The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
insert into marker set a = 1;
insert into test.no_index_tab set a = 'foo', b = 1;
insert into marker set a = 1;
......@@ -52,13 +56,18 @@ insert into marker set a = 1;
optimize table test.no_index_tab;
Table Op Msg_type Msg_text
test.no_index_tab optimize status OK
test.no_index_tab optimize warning The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
insert into marker set a = 1;
select * from test.no_index_tab;
a b
bar 1
bar 2
Warnings:
Warning 1287 The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
insert into marker set a = 1;
truncate table test.no_index_tab;
Warnings:
Warning 1287 The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
insert into marker set a = 1;
drop table test.no_index_tab;
update performance_schema.setup_consumers set enabled='NO';
......@@ -73,38 +82,38 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
Variable_name Value
Performance_schema_accounts_lost 0
......
mysql-test/suite/perfschema/r/prepared_statements.result
View file @ 36ebd704
......@@ -57,7 +57,7 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
SQL_TEXT PREPARE st1 FROM ...
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
......@@ -77,13 +77,12 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?'
SQL_TEXT PREPARE st3 FROM ...
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st4 FROM
'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
SQL_TEXT PREPARE st4 FROM ...
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
......@@ -164,7 +163,7 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
SQL_TEXT PREPARE st1 FROM ...
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
......@@ -184,13 +183,12 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?'
SQL_TEXT PREPARE st3 FROM ...
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st4 FROM
'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
SQL_TEXT PREPARE st4 FROM ...
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
......@@ -297,7 +295,7 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
SQL_TEXT PREPARE st1 FROM ...
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
......@@ -317,13 +315,12 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?'
SQL_TEXT PREPARE st3 FROM ...
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st4 FROM
'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
SQL_TEXT PREPARE st4 FROM ...
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
......
mysql-test/suite/perfschema/r/privilege.result
View file @ 36ebd704
......@@ -576,6 +576,8 @@ WHERE name LIKE 'wait/synch/mutex/%'
OR name LIKE 'wait/synch/rwlock/%';
UPDATE performance_schema.setup_consumers SET enabled = 'YES';
UPDATE performance_schema.setup_timers SET timer_name = 'TICK';
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
......@@ -586,9 +588,17 @@ flush privileges;
UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
UPDATE performance_schema.setup_consumers SET enabled = 'YES';
UPDATE performance_schema.setup_timers SET timer_name = 'MICROSECOND' where name="idle";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
UPDATE performance_schema.setup_timers SET timer_name = 'CYCLE' where name="wait";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND' where name="stage";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND' where name="statement";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
......
mysql-test/suite/perfschema/r/privilege_table_io.result
View file @ 36ebd704
......@@ -45,11 +45,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......@@ -110,26 +110,29 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test", "mysql")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql tables_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql tables_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql procs_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql servers fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE mysql user fetch 1
wait/io/table/sql/handler TABLE mysql user fetch 1
wait/io/table/sql/handler TABLE mysql user fetch 1
wait/io/table/sql/handler TABLE mysql user fetch 1
wait/io/table/sql/handler TABLE mysql user fetch 1
wait/io/table/sql/handler TABLE mysql user fetch 1
wait/io/table/sql/handler TABLE mysql user fetch 1
wait/io/table/sql/handler TABLE mysql db fetch 1
wait/io/table/sql/handler TABLE mysql db fetch 1
wait/io/table/sql/handler TABLE mysql db fetch 1
wait/io/table/sql/handler TABLE mysql db fetch 1
wait/io/table/sql/handler TABLE mysql db fetch 1
wait/io/table/sql/handler TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler TABLE mysql tables_priv fetch 1
wait/io/table/sql/handler TABLE mysql tables_priv fetch 1
wait/io/table/sql/handler TABLE mysql tables_priv fetch 1
wait/io/table/sql/handler TABLE mysql procs_priv fetch 1
wait/io/table/sql/handler TABLE mysql servers fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
Variable_name Value
Performance_schema_accounts_lost 0
......
mysql-test/suite/perfschema/r/query_cache.result
View file @ 36ebd704
......@@ -2,8 +2,14 @@ drop table if exists t1;
create table t1 (a int not null);
insert into t1 values (1), (2), (3);
SET GLOBAL query_cache_size=1355776;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
flush query cache;
Warnings:
Warning 1681 'FLUSH QUERY CACHE' is deprecated and will be removed in a future release.
reset query cache;
Warnings:
Warning 1681 'RESET QUERY CACHE' is deprecated and will be removed in a future release.
flush status;
select * from t1;
a
......@@ -39,6 +45,8 @@ NULL
select * from performance_schema.setup_timers where name='wait';
NAME TIMER_NAME
wait {CYCLE_OR_NANOSECOND}
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
show global status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 1
......@@ -54,6 +62,8 @@ NULL
select * from performance_schema.setup_timers where name='wait';
NAME TIMER_NAME
wait {CYCLE_OR_NANOSECOND}
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
show global status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 1
......@@ -64,5 +74,7 @@ show global status like "Qcache_hits";
Variable_name Value
Qcache_hits 1
SET GLOBAL query_cache_size= default;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
drop table t1;
flush status;
mysql-test/suite/perfschema/r/read_only.result
View file @ 36ebd704
use performance_schema;
set @start_read_only= @@global.read_only;
set @start_super_read_only= @@global.super_read_only;
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
......@@ -11,7 +12,7 @@ set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
flush privileges;
connect (con1, localhost, pfsuser, , test);
connect con1, localhost, pfsuser, , test;
connection default;
set global read_only=0;
connection con1;
......@@ -35,13 +36,15 @@ show grants;
Grants for pfsuser@localhost
GRANT USAGE ON *.* TO 'pfsuser'@'localhost'
GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost'
# Update on perf_schema is allowed in read_only mode.
select * from performance_schema.setup_instruments;
update performance_schema.setup_instruments set enabled='NO';
update performance_schema.setup_instruments set enabled='YES';
connection default;
grant super on *.* to pfsuser@localhost;
flush privileges;
connect (con1, localhost, pfsuser, , test);
disconnect con1;
connect con1, localhost, pfsuser, , test;
select @@global.read_only;
@@global.read_only
1
......@@ -53,6 +56,23 @@ select * from performance_schema.setup_instruments;
update performance_schema.setup_instruments set enabled='NO';
update performance_schema.setup_instruments set enabled='YES';
connection default;
set global super_read_only=1;
connection con1;
select @@global.super_read_only;
@@global.super_read_only
1
show grants;
Grants for pfsuser@localhost
GRANT SUPER ON *.* TO 'pfsuser'@'localhost'
GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost'
select * from performance_schema.setup_instruments;
# Update is allowed in super_read_only on perf schema for
# super user.
update performance_schema.setup_instruments set enabled='NO';
update performance_schema.setup_instruments set enabled='YES';
disconnect con1;
connection default;
set global read_only= @start_read_only;
set global super_read_only= @start_super_read_only;
drop user pfsuser@localhost;
flush privileges;
mysql-test/suite/perfschema/r/relaylog.result
View file @ 36ebd704
......@@ -23,7 +23,7 @@ from performance_schema.file_summary_by_instance
where file_name like "%master-%" order by file_name;
FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE
master-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY
master-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE
master-bin.index wait/io/file/sql/binlog_index MANY NONE MANY NONE
select * from performance_schema.file_summary_by_instance
where file_name like "%slave-%" order by file_name;
FILE_NAME EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT COUNT_READ SUM_TIMER_READ MIN_TIMER_READ AVG_TIMER_READ MAX_TIMER_READ SUM_NUMBER_OF_BYTES_READ COUNT_WRITE SUM_TIMER_WRITE MIN_TIMER_WRITE AVG_TIMER_WRITE MAX_TIMER_WRITE SUM_NUMBER_OF_BYTES_WRITE COUNT_MISC SUM_TIMER_MISC MIN_TIMER_MISC AVG_TIMER_MISC MAX_TIMER_MISC
......@@ -39,7 +39,7 @@ from performance_schema.file_summary_by_instance
where event_name like "%binlog%" order by file_name;
FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE
master-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY
master-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE
master-bin.index wait/io/file/sql/binlog_index MANY NONE MANY NONE
select
EVENT_NAME,
if (count_read > 0, "MANY", "NONE") as COUNT_READ,
......@@ -51,7 +51,7 @@ where event_name like "%binlog%" order by event_name;
EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE
wait/io/file/sql/binlog MANY MANY MANY MANY
wait/io/file/sql/binlog_cache NONE NONE NONE NONE
wait/io/file/sql/binlog_index MANY NONE NONE NONE
wait/io/file/sql/binlog_index MANY NONE MANY NONE
wait/io/file/sql/binlog_index_cache NONE NONE NONE NONE
select
EVENT_NAME,
......@@ -119,10 +119,10 @@ where file_name like "%slave-%"
order by file_name;
FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE
slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY
slave-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE
slave-bin.index wait/io/file/sql/binlog_index MANY NONE MANY NONE
slave-relay-bin.000001 wait/io/file/sql/relaylog MANY MANY MANY MANY
slave-relay-bin.000002 wait/io/file/sql/relaylog MANY MANY MANY MANY
slave-relay-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE
slave-relay-bin.index wait/io/file/sql/binlog_index MANY NONE MANY NONE
"Expect a slave binlog + binlog_index"
select
substring(file_name, locate("slave-", file_name)) as FILE_NAME,
......@@ -135,8 +135,8 @@ from performance_schema.file_summary_by_instance
where event_name like "%binlog%" order by file_name;
FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE
slave-bin.000001 wait/io/file/sql/binlog MANY MANY MANY MANY
slave-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE
slave-relay-bin.index wait/io/file/sql/binlog_index NONE NONE NONE NONE
slave-bin.index wait/io/file/sql/binlog_index MANY NONE MANY NONE
slave-relay-bin.index wait/io/file/sql/binlog_index MANY NONE MANY NONE
select
EVENT_NAME,
if (count_read > 0, "MANY", "NONE") as COUNT_READ,
......
mysql-test/suite/perfschema/r/rollback_table_io.result
View file @ 36ebd704
......@@ -41,18 +41,18 @@ where event_name like 'wait/io/table/%'
and object_schema in ('test')
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test t1 delete 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test t1 update 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test t1 insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test t1 delete 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test t1 update 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
Variable_name Value
Performance_schema_accounts_lost 0
......
mysql-test/suite/perfschema/r/rpl_group_member_stats.result
View file @ 36ebd704
......@@ -3,6 +3,6 @@ include/assert.inc [The value of view_id should not be present]
include/assert.inc [The value of Count_Transactions_in_queue should be 0]
include/assert.inc [The value of Count_Transactions_checked should be 0]
include/assert.inc [The value of Count_conflicts_detected should be 0]
include/assert.inc [The value of Count_Transactions_validating should be 0]
include/assert.inc [The value of Count_Transactions_rows_validating should be 0]
include/assert.inc [The value of Transactions_Committed_all_members should be 0]
include/assert.inc [The value of Last_conflict_free_transaction should not be present]
mysql-test/suite/perfschema/r/rpl_gtid_func.result
View file @ 36ebd704
......@@ -56,7 +56,7 @@ select digest, digest_text, count_star
from performance_schema.events_statements_summary_by_digest
where digest_text like "%in_%_digest%";
digest digest_text count_star
dc3177eb15d923e08c09eef29cecd9a4 SELECT ? AS `in_master_digest` 1
43677368d37ba0831ecd2322086c9cf5 SELECT ? AS `in_master_digest` 1
insert into test.marker values (2);
**** On Slave ****
select * from test.marker;
......@@ -99,7 +99,7 @@ select digest, digest_text, count_star
from performance_schema.events_statements_summary_by_digest
where digest_text like "%in_%_digest%";
digest digest_text count_star
d506c623d393ce3079467945b10cc01e SELECT ? AS `in_slave_digest` 1
01f5f7c4c65eb61bb9a6afb7172c4a54 SELECT ? AS `in_slave_digest` 1
**** On Master ****
delete from performance_schema.setup_objects
where object_schema='master';
......
mysql-test/suite/perfschema/r/show_aggregate.result
View file @ 36ebd704
......@@ -510,6 +510,27 @@ variable_name h1 h2 h3 delta host Expected
Handler_delete 6 0 0 6 6 OK
Handler_rollback 6 0 0 6 6 OK
================================================================================
TEST 8: FLUSH STATUS should clear account, host and user status
================================================================================
FLUSH STATUS;
SELECT * FROM status_by_account WHERE user LIKE 'user%' AND variable_name IN ('handler_delete');
USER HOST VARIABLE_NAME VARIABLE_VALUE
user1 localhost Handler_delete 0
user2 localhost Handler_delete 0
user3 localhost Handler_delete 0
SELECT * FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
HOST VARIABLE_NAME VARIABLE_VALUE
localhost Handler_delete 0
SELECT * FROM status_by_user WHERE user LIKE 'user%' AND variable_name IN ('handler_delete');
USER VARIABLE_NAME VARIABLE_VALUE
user1 Handler_delete 0
user2 Handler_delete 0
user3 Handler_delete 0
================================================================================
CLEANUP
================================================================================
DROP TABLE test.t1;
......
mysql-test/suite/perfschema/r/show_coverage.result
View file @ 36ebd704
......@@ -102,14 +102,43 @@ SELECT variable_value FROM status_by_thread
WHERE variable_name = "bytes_received" and thread_id = @thread_id INTO @bytes_after;
# Expect bytes_before > bytes_after
SELECT @bytes_before > @bytes_after;
@bytes_before > @bytes_after
SELECT @bytes_before > @bytes_after AS 'Expect 1';
Expect 1
1
# Expect bytes_after is zero
SELECT @bytes_after;
@bytes_after
SELECT @bytes_after AS 'Expect 0';
Expect 0
0
# TEST 6
#
# Bug#28291258 FLUSH STATUS ADDS TWICE TO GLOBAL VALUES
#
# Default connection
# First connection
include/assert.inc [Global value requested from the first session must not change]
# Generate a slow query
SET long_query_time = 2;
SELECT SLEEP(4);
SLEEP(4)
0
SET long_query_time = @@global.long_query_time;
include/assert.inc [Global value requested from the first session after SLEEP() must increase by 1]
include/assert.inc [First session value must increase by 1]
# Default connection
include/assert.inc [Global value requested from the default session after DISCONNECT must remain the same]
include/assert.inc [Default session value must remain zero]
FLUSH STATUS;
include/assert.inc [Global value requested from the default session after FLUSH must remain the same]
include/assert.inc [Default session value after FLUSH must remain zero]
# CLEANUP
set @@global.show_compatibility_56 = @show_compatibility_56_save;
mysql-test/suite/perfschema/r/show_misc.result
View file @ 36ebd704
......@@ -88,6 +88,22 @@ Variable_name Value
UNLOCK TABLES;
DROP TABLE test.t1;
================================================================================
Bug#28515475 BOGUS DATA WHEN ORDERING RESULTS FROM VARIABLES_BY_THREAD
================================================================================
Verify the results from "WHERE variable_name IN(...)", particularly for those
variables that are listed after the deprecated variable gtid_executed.
The ORDER BY also forces an additional code path through rnd_pos().
SELECT variable_name FROM performance_schema.variables_by_thread
WHERE variable_name IN ('interactive_timeout','net_read_timeout','net_write_timeout','wait_timeout')
ORDER BY variable_name;
variable_name
interactive_timeout
net_read_timeout
net_write_timeout
wait_timeout
================================================================================
CLEAN UP
================================================================================
......
mysql-test/suite/perfschema/r/show_sanity.result
View file @ 36ebd704
......@@ -407,7 +407,12 @@ where show_mode = "JUNK: GLOBAL-ONLY"
and source = "I_S.SESSION_VARIABLES")
order by show_mode, source, variable_name;
SHOW_MODE SOURCE VARIABLE_NAME
5.6 I_S.SESSION_VARIABLES BINLOG_TRANSACTION_DEPENDENCY_HISTORY_SIZE
5.6 I_S.SESSION_VARIABLES BINLOG_TRANSACTION_DEPENDENCY_TRACKING
5.6 I_S.SESSION_VARIABLES GTID_EXECUTED
5.6 I_S.SESSION_VARIABLES INNODB_DEADLOCK_DETECT
5.6 I_S.SESSION_VARIABLES INNODB_STATS_INCLUDE_DELETE_MARKED
5.6 I_S.SESSION_VARIABLES KEYRING_OPERATIONS
5.6 I_S.SESSION_VARIABLES LOG_STATEMENTS_UNSAFE_FOR_BINLOG
5.6 I_S.SESSION_VARIABLES TLS_VERSION
......@@ -430,7 +435,12 @@ where show_mode = "JUNK: GLOBAL-ONLY"
and source = "I_S.SESSION_VARIABLES")
order by show_mode, source, variable_name;
SHOW_MODE SOURCE VARIABLE_NAME
5.6 I_S.SESSION_VARIABLES BINLOG_TRANSACTION_DEPENDENCY_HISTORY_SIZE
5.6 I_S.SESSION_VARIABLES BINLOG_TRANSACTION_DEPENDENCY_TRACKING
5.6 I_S.SESSION_VARIABLES GTID_EXECUTED
5.6 I_S.SESSION_VARIABLES INNODB_DEADLOCK_DETECT
5.6 I_S.SESSION_VARIABLES INNODB_STATS_INCLUDE_DELETE_MARKED
5.6 I_S.SESSION_VARIABLES KEYRING_OPERATIONS
5.6 I_S.SESSION_VARIABLES LOG_STATEMENTS_UNSAFE_FOR_BINLOG
5.6 I_S.SESSION_VARIABLES TLS_VERSION
......
mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
View file @ 36ebd704
......@@ -7,6 +7,8 @@
# - the test might abort
#
# 0. Check, build or set prequisites
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
UPDATE performance_schema.threads
SET INSTRUMENTED='NO' WHERE PROCESSLIST_ID = CONNECTION_ID();
# 1. Basic checks
......@@ -223,3 +225,5 @@ col2
# It must reset all counters.
TRUNCATE TABLE performance_schema.socket_summary_by_instance;
# 6. Cleanup
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result
View file @ 36ebd704
......@@ -7,6 +7,8 @@
# - the test might abort
#
# 0. Check, build or set prequisites
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
UPDATE performance_schema.threads
SET INSTRUMENTED='NO' WHERE PROCESSLIST_ID = CONNECTION_ID();
# 1. Basic checks
......@@ -226,3 +228,5 @@ col2
# It must reset all counters.
TRUNCATE TABLE performance_schema.socket_summary_by_instance;
# 6. Cleanup
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
mysql-test/suite/perfschema/r/start_server_1_digest.result 0 → 100644
View file @ 36ebd704
SELECT "Digest table has a size 1 and is full already." as use_case;
use_case
Digest table has a size 1 and is full already.
select SCHEMA_NAME, DIGEST, DIGEST_TEXT
from performance_schema.events_statements_summary_by_digest;
SCHEMA_NAME DIGEST DIGEST_TEXT
NULL NULL NULL
mysql-test/suite/perfschema/r/start_server_disable_idle.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_disable_stages.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_disable_statements.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_disable_transactions.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_disable_waits.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_innodb.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_low_digest.result
View file @ 36ebd704
......@@ -9,4 +9,4 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
event_name digest digest_text sql_text
statement/sql/truncate de142fd9a2507cb67f197230081a2682 TRUNCATE TABLE truncate table events_statements_history_long
statement/sql/select 9c2f57893fb6bcec2ace71ddb389b46f SELECT ? + ? + SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
statement/sql/select 4eaf50b33b47c3d02ab230606f197063 SELECT ? + ? + SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result
View file @ 36ebd704
......@@ -9,4 +9,4 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
event_name digest digest_text sql_text
statement/sql/truncate de142fd9a2507cb67f197230081a2682 TRUNCATE TABLE truncat...
statement/sql/select 9c2f57893fb6bcec2ace71ddb389b46f SELECT ? + ? + SELECT ...
statement/sql/select 4eaf50b33b47c3d02ab230606f197063 SELECT ? + ? + SELECT ...
mysql-test/suite/perfschema/r/start_server_low_index.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 38
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_low_table_lock.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_account.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_cond_class.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_file_class.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_file_inst.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 0
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_host.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_index.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 0
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_mdl.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 0
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_memory_class.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 0
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -132,7 +134,7 @@ performance_schema_max_mutex_classes 0
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 0
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......@@ -153,7 +155,7 @@ show engine PERFORMANCE_SCHEMA status;
show global status like "performance_schema%";
show global variables like "performance_schema_max_mutex_classes";
Variable_name Value
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
select count(*) > 0 from performance_schema.setup_instruments
where name like "wait/synch/mutex/%";
count(*) > 0
......
mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 0
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,7 +130,7 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
......
mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 0
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......@@ -153,7 +155,7 @@ show engine PERFORMANCE_SCHEMA status;
show global status like "performance_schema%";
show global variables like "performance_schema_max_rwlock_classes";
Variable_name Value
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
select count(*) > 0 from performance_schema.setup_instruments
where name like "wait/synch/rwlock/%";
count(*) > 0
......
mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_socket_class.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 0
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 0
......
mysql-test/suite/perfschema/r/start_server_no_stage_class.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_stages_history.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_statement_class.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_statements_history.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 5000
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/r/start_server_no_table_inst.result
View file @ 36ebd704
......@@ -18,6 +18,8 @@ count(*) > 4
select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
......@@ -128,11 +130,11 @@ performance_schema_max_file_instances 10000
performance_schema_max_index_stat 0
performance_schema_max_memory_classes 320
performance_schema_max_metadata_locks 10000
performance_schema_max_mutex_classes 200
performance_schema_max_mutex_classes 210
performance_schema_max_mutex_instances 5000
performance_schema_max_prepared_statements_instances 100
performance_schema_max_program_instances 5000
performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
......
mysql-test/suite/perfschema/t/aggregate.test deleted 100644 → 0
View file @ 15f60c1a
This diff is collapsed.
mysql-test/suite/perfschema/t/start_server_1_digest-master.opt 0 → 100644
View file @ 36ebd704
This diff is collapsed.
mysql-test/suite/perfschema/t/start_server_1_digest.test 0 → 100644
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/CMakeLists.txt
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/cursor_by_account.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/cursor_by_account.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/cursor_by_host.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/cursor_by_host.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/cursor_by_thread.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/cursor_by_thread.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/cursor_by_user.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/cursor_by_user.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/ha_perfschema.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/ha_perfschema.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_account.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_account.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_atomic.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_autosize.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_buffer_container.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_buffer_container.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_builtin_memory.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_builtin_memory.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_check.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_column_types.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_column_values.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_column_values.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_con_slice.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_con_slice.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_defaults.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_defaults.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_digest.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_digest.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_engine_table.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_engine_table.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_events.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_events_stages.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_events_stages.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_events_statements.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_events_statements.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_events_waits.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_events_waits.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_global.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_global.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_host.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_host.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_instr.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_instr.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_instr_class.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_instr_class.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_lock.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_memory.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_memory.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_prepared_stmt.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_prepared_stmt.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_program.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_program.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_server.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_server.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_setup_actor.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_setup_actor.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_setup_object.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_setup_object.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_stat.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_status.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_status.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_timer.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_timer.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_user.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_user.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_variable.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_variable.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_visitor.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/pfs_visitor.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_accounts.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_accounts.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_all_instr.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_all_instr.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_esms_by_digest.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_esms_by_digest.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_esms_by_program.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_esms_by_program.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_events_stages.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_events_stages.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_events_waits.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_events_waits.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_file_instances.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_file_instances.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_global_status.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_global_status.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_global_variables.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_helper.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_helper.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_host_cache.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_host_cache.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_hosts.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_hosts.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_md_locks.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_md_locks.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_session_connect.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_session_connect.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_session_status.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_session_status.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_setup_actors.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_setup_actors.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_setup_consumers.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_setup_consumers.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_setup_objects.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_setup_objects.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_setup_timers.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_setup_timers.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_socket_instances.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_status_by_host.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_status_by_host.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_status_by_thread.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_status_by_user.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_status_by_user.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_sync_instances.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_sync_instances.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_table_handles.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_table_handles.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_threads.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_threads.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_tiws_by_table.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_tiws_by_table.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_tlws_by_table.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_tlws_by_table.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_users.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_users.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_uvar_by_thread.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/table_uvar_by_thread.h
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/unittest/CMakeLists.txt
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/unittest/conf.txt
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/unittest/pfs-t.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/unittest/pfs_instr-t.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/unittest/pfs_misc-t.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/unittest/pfs_noop-t.cc
View file @ 36ebd704
This diff is collapsed.
storage/perfschema/unittest/pfs_timer-t.cc
View file @ 36ebd704
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7