mirror of
https://github.com/MariaDB/server.git
synced 2026-05-05 22:55:32 +02:00
Merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
This commit is contained in:
Jon Olav Hauglid
commit
a51a4b104c
12 changed files with 190 additions and 34 deletions
|
|
@ -18,7 +18,7 @@
|
|||
#
|
||||
|
||||
--error 1
|
||||
--exec $MYSQL_UPGRADE --skip-verbose > $out_file 2> $err_file
|
||||
--exec $MYSQL_UPGRADE --skip-verbose --force > $out_file 2> $err_file
|
||||
|
||||
# Verify that mysql_upgrade complained about the performance_schema
|
||||
--cat_file $err_file
|
||||
|
|
|
|||
34
mysql-test/suite/perfschema/r/checksum.result
Normal file
34
mysql-test/suite/perfschema/r/checksum.result
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
checksum table performance_schema.COND_INSTANCES;
|
||||
checksum table performance_schema.EVENTS_WAITS_CURRENT;
|
||||
checksum table performance_schema.EVENTS_WAITS_HISTORY;
|
||||
checksum table performance_schema.EVENTS_WAITS_HISTORY_LONG;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME;
|
||||
checksum table performance_schema.FILE_INSTANCES;
|
||||
checksum table performance_schema.FILE_SUMMARY_BY_EVENT_NAME;
|
||||
checksum table performance_schema.FILE_SUMMARY_BY_INSTANCE;
|
||||
checksum table performance_schema.MUTEX_INSTANCES;
|
||||
checksum table performance_schema.PERFORMANCE_TIMERS;
|
||||
checksum table performance_schema.RWLOCK_INSTANCES;
|
||||
checksum table performance_schema.SETUP_CONSUMERS;
|
||||
checksum table performance_schema.SETUP_INSTRUMENTS;
|
||||
checksum table performance_schema.SETUP_TIMERS;
|
||||
checksum table performance_schema.THREADS;
|
||||
checksum table performance_schema.COND_INSTANCES extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_CURRENT extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_HISTORY extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_HISTORY_LONG extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME extended;
|
||||
checksum table performance_schema.FILE_INSTANCES extended;
|
||||
checksum table performance_schema.FILE_SUMMARY_BY_EVENT_NAME extended;
|
||||
checksum table performance_schema.FILE_SUMMARY_BY_INSTANCE extended;
|
||||
checksum table performance_schema.MUTEX_INSTANCES extended;
|
||||
checksum table performance_schema.PERFORMANCE_TIMERS extended;
|
||||
checksum table performance_schema.RWLOCK_INSTANCES extended;
|
||||
checksum table performance_schema.SETUP_CONSUMERS extended;
|
||||
checksum table performance_schema.SETUP_INSTRUMENTS extended;
|
||||
checksum table performance_schema.SETUP_TIMERS extended;
|
||||
checksum table performance_schema.THREADS extended;
|
||||
64
mysql-test/suite/perfschema/t/checksum.test
Normal file
64
mysql-test/suite/perfschema/t/checksum.test
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
# Copyright (c) 2010, 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 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.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
|
||||
|
||||
# Tests for PERFORMANCE_SCHEMA
|
||||
|
||||
--source include/not_embedded.inc
|
||||
--source include/have_perfschema.inc
|
||||
|
||||
#
|
||||
# The checksum value itself is random (data is volatile),
|
||||
# just testing that this does not crash
|
||||
#
|
||||
--disable_result_log
|
||||
|
||||
checksum table performance_schema.COND_INSTANCES;
|
||||
checksum table performance_schema.EVENTS_WAITS_CURRENT;
|
||||
checksum table performance_schema.EVENTS_WAITS_HISTORY;
|
||||
checksum table performance_schema.EVENTS_WAITS_HISTORY_LONG;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME;
|
||||
checksum table performance_schema.FILE_INSTANCES;
|
||||
checksum table performance_schema.FILE_SUMMARY_BY_EVENT_NAME;
|
||||
checksum table performance_schema.FILE_SUMMARY_BY_INSTANCE;
|
||||
checksum table performance_schema.MUTEX_INSTANCES;
|
||||
checksum table performance_schema.PERFORMANCE_TIMERS;
|
||||
checksum table performance_schema.RWLOCK_INSTANCES;
|
||||
checksum table performance_schema.SETUP_CONSUMERS;
|
||||
checksum table performance_schema.SETUP_INSTRUMENTS;
|
||||
checksum table performance_schema.SETUP_TIMERS;
|
||||
checksum table performance_schema.THREADS;
|
||||
|
||||
checksum table performance_schema.COND_INSTANCES extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_CURRENT extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_HISTORY extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_HISTORY_LONG extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME extended;
|
||||
checksum table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME extended;
|
||||
checksum table performance_schema.FILE_INSTANCES extended;
|
||||
checksum table performance_schema.FILE_SUMMARY_BY_EVENT_NAME extended;
|
||||
checksum table performance_schema.FILE_SUMMARY_BY_INSTANCE extended;
|
||||
checksum table performance_schema.MUTEX_INSTANCES extended;
|
||||
checksum table performance_schema.PERFORMANCE_TIMERS extended;
|
||||
checksum table performance_schema.RWLOCK_INSTANCES extended;
|
||||
checksum table performance_schema.SETUP_CONSUMERS extended;
|
||||
checksum table performance_schema.SETUP_INSTRUMENTS extended;
|
||||
checksum table performance_schema.SETUP_TIMERS extended;
|
||||
checksum table performance_schema.THREADS extended;
|
||||
|
||||
--enable_result_log
|
||||
|
||||
|
|
@ -745,3 +745,28 @@
|
|||
Memcheck:Addr1
|
||||
fun:buf_buddy_relocate
|
||||
}
|
||||
|
||||
#
|
||||
# See related Bug#56666
|
||||
# Race condition between the server main thread and the kill server thread.
|
||||
#
|
||||
# Because of this race condition, the call to shutdown_performance_schema()
|
||||
# was commented in sql/mysqld.cc, causing the reported leaks.
|
||||
#
|
||||
|
||||
{
|
||||
missing shutdown_performance_schema 1
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:_Z10pfs_mallocmi
|
||||
}
|
||||
|
||||
{
|
||||
missing shutdown_performance_schema 2
|
||||
Memcheck:Leak
|
||||
fun:malloc
|
||||
fun:my_malloc
|
||||
fun:_lf_alloc_new
|
||||
fun:lf_hash_insert
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue