mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 07:05:33 +02:00
Merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
This commit is contained in:
Jon Olav Hauglid
commit
bf1d4487fb
10 changed files with 72 additions and 84 deletions
|
|
@ -1908,4 +1908,16 @@ group by PAY.id + 1;
|
|||
mult v_net_with_discount v_total
|
||||
1.0000 27.18 27.180000
|
||||
DROP TABLE currencies, payments, sub_tasks;
|
||||
#
|
||||
# BUG#52171: distinct aggregates on unsigned decimal fields trigger assertions
|
||||
#
|
||||
CREATE TABLE t1 (a DECIMAL(4,4) UNSIGNED);
|
||||
INSERT INTO t1 VALUES (0);
|
||||
SELECT AVG(DISTINCT a) FROM t1;
|
||||
AVG(DISTINCT a)
|
||||
0.00000000
|
||||
SELECT SUM(DISTINCT a) FROM t1;
|
||||
SUM(DISTINCT a)
|
||||
0.0000
|
||||
DROP TABLE t1;
|
||||
End of 5.1 tests
|
||||
|
|
|
|||
|
|
@ -116,18 +116,10 @@ where name like "wait/synch/mutex/sql/LOCK_rpl_status";
|
|||
count(name)
|
||||
1
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOG_INFO::lock";
|
||||
count(name)
|
||||
1
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex";
|
||||
count(name)
|
||||
1
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state";
|
||||
count(name)
|
||||
1
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_event_metadata";
|
||||
count(name)
|
||||
1
|
||||
|
|
@ -144,6 +136,10 @@ where name like "wait/synch/mutex/sql/Cversion_lock";
|
|||
count(name)
|
||||
1
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_audit_mask";
|
||||
count(name)
|
||||
1
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_xid_cache";
|
||||
count(name)
|
||||
1
|
||||
|
|
@ -152,10 +148,6 @@ where name like "wait/synch/mutex/sql/LOCK_plugin";
|
|||
count(name)
|
||||
1
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_gdl";
|
||||
count(name)
|
||||
1
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/tz_LOCK";
|
||||
count(name)
|
||||
1
|
||||
|
|
@ -212,10 +204,6 @@ where name like "wait/synch/cond/sql/Query_cache::COND_cache_status_changed";
|
|||
count(name)
|
||||
1
|
||||
select count(name) from COND_INSTANCES
|
||||
where name like "wait/synch/cond/sql/Event_scheduler::COND_state";
|
||||
count(name)
|
||||
1
|
||||
select count(name) from COND_INSTANCES
|
||||
where name like "wait/synch/cond/sql/COND_queue_state";
|
||||
count(name)
|
||||
1
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (C) 2009 Sun Microsystems, Inc
|
||||
# Copyright (c) 2009, 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
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
# 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, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
# 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
|
||||
|
||||
|
|
@ -43,10 +43,6 @@ select count(name) from MUTEX_INSTANCES
|
|||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/mysys/THR_LOCK_myisam_log";
|
||||
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/mysys/THR_LOCK_heap";
|
||||
|
||||
|
|
@ -83,11 +79,6 @@ select count(name) from MUTEX_INSTANCES
|
|||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_delayed_insert";
|
||||
|
||||
# Named LOCK_uuid_short in 6.0 only
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/sql/LOCK_uuid_short";
|
||||
|
||||
# Named LOCK_uuid_generator in 5.5, LOCK_uuid_short in 6.0
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_uuid_generator";
|
||||
|
||||
|
|
@ -130,14 +121,16 @@ select count(name) from MUTEX_INSTANCES
|
|||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_rpl_status";
|
||||
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOG_INFO::lock";
|
||||
# LOG_INFO object are created on demand, and are not global.
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/sql/LOG_INFO::lock";
|
||||
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex";
|
||||
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state";
|
||||
# The event scheduler may be disabled
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state";
|
||||
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_event_metadata";
|
||||
|
|
@ -148,16 +141,11 @@ select count(name) from MUTEX_INSTANCES
|
|||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_user_locks";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/sql/LOCK_mdl";
|
||||
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/Cversion_lock";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/sql/LOCK_audit_mask";
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_audit_mask";
|
||||
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_xid_cache";
|
||||
|
|
@ -165,28 +153,13 @@ select count(name) from MUTEX_INSTANCES
|
|||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_plugin";
|
||||
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/LOCK_gdl";
|
||||
# Not a global variable, may be destroyed already.
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/sql/LOCK_gdl";
|
||||
|
||||
select count(name) from MUTEX_INSTANCES
|
||||
where name like "wait/synch/mutex/sql/tz_LOCK";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/sql/slave_start";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/sql/BML_class::THR_LOCK_BML";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/sql/BML_class::THR_LOCK_BML_active";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from MUTEX_INSTANCES
|
||||
# where name like "wait/synch/mutex/sql/BML_class::THR_LOCK_BML_get";
|
||||
|
||||
# Verify that these global rwlocks have been properly initilized in sql
|
||||
|
||||
select count(name) from RWLOCK_INSTANCES
|
||||
|
|
@ -230,25 +203,10 @@ select count(name) from COND_INSTANCES
|
|||
select count(name) from COND_INSTANCES
|
||||
where name like "wait/synch/cond/sql/Query_cache::COND_cache_status_changed";
|
||||
|
||||
select count(name) from COND_INSTANCES
|
||||
where name like "wait/synch/cond/sql/Event_scheduler::COND_state";
|
||||
# The event scheduler may be disabled
|
||||
# select count(name) from COND_INSTANCES
|
||||
# where name like "wait/synch/cond/sql/Event_scheduler::COND_state";
|
||||
|
||||
select count(name) from COND_INSTANCES
|
||||
where name like "wait/synch/cond/sql/COND_queue_state";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from COND_INSTANCES
|
||||
# where name like "wait/synch/cond/sql/COND_mdl";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from COND_INSTANCES
|
||||
# where name like "wait/synch/cond/sql/BML_class::COND_BML";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from COND_INSTANCES
|
||||
# where name like "wait/synch/cond/sql/BML_class::COND_BML_registered";
|
||||
|
||||
# Does not exist in mysql 5.5, 6.0 only
|
||||
# select count(name) from COND_INSTANCES
|
||||
# where name like "wait/synch/cond/sql/BML_class::COND_BML_release";
|
||||
|
||||
|
|
|
|||
|
|
@ -1509,5 +1509,14 @@ group by PAY.id + 1;
|
|||
|
||||
DROP TABLE currencies, payments, sub_tasks;
|
||||
|
||||
--echo #
|
||||
--echo # BUG#52171: distinct aggregates on unsigned decimal fields trigger assertions
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (a DECIMAL(4,4) UNSIGNED);
|
||||
INSERT INTO t1 VALUES (0);
|
||||
SELECT AVG(DISTINCT a) FROM t1;
|
||||
SELECT SUM(DISTINCT a) FROM t1;
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo End of 5.1 tests
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue