mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 08:44:33 +01:00
Merge branch '5.5' into 10.0
This commit is contained in:
commit
77ce4ead81
39 changed files with 335 additions and 464 deletions
include
mysql-test
lib/My
r
suite
innodb
perfschema
plugins/r
t
mysys
plugin/server_audit
sql
field.ccitem.cclog.ccmysqld.ccnet_serv.ccparse_file.hsql_admin.ccsql_class.ccsql_class.hsql_plugin.ccsql_select.cc
strings
support-files
tests
win/packaging
|
@ -882,8 +882,7 @@ typedef long long my_ptrdiff_t;
|
|||
and related routines are refactored.
|
||||
*/
|
||||
|
||||
#define my_offsetof(TYPE, MEMBER) \
|
||||
((size_t)((char *)&(((TYPE *)0x10)->MEMBER) - (char*)0x10))
|
||||
#define my_offsetof(TYPE, MEMBER) PTR_BYTE_DIFF(&((TYPE *)0x10)->MEMBER, 0x10)
|
||||
|
||||
#define NullS (char *) 0
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
|
||||
Copyright (c) 2010, 2013, Monty Program Ab.
|
||||
Copyright (c) 2010, 2016, Monty Program Ab.
|
||||
|
||||
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
|
||||
|
@ -271,7 +271,7 @@ extern my_bool my_use_symdir;
|
|||
extern ulong my_default_record_cache_size;
|
||||
extern my_bool my_disable_locking, my_disable_async_io,
|
||||
my_disable_flush_key_blocks, my_disable_symlinks;
|
||||
extern my_bool my_disable_sync;
|
||||
extern my_bool my_disable_sync, my_disable_copystat_in_redel;
|
||||
extern char wild_many,wild_one,wild_prefix;
|
||||
extern const char *charsets_dir;
|
||||
extern my_bool timed_mutexes;
|
||||
|
|
|
@ -261,11 +261,7 @@ sub show {
|
|||
# On Windows, rely on cdb to be there...
|
||||
if (IS_WINDOWS)
|
||||
{
|
||||
# Starting cdb is unsafe when used with --parallel > 1 option
|
||||
if ( $parallel < 2 )
|
||||
{
|
||||
_cdb($core_name);
|
||||
}
|
||||
_cdb($core_name);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -1658,6 +1658,9 @@ CHAR_LENGTH(TRIM(BOTH 0x61 FROM _utf32 0x00000061))
|
|||
SELECT CHAR_LENGTH(TRIM(BOTH 0x00 FROM _utf32 0x00000061));
|
||||
CHAR_LENGTH(TRIM(BOTH 0x00 FROM _utf32 0x00000061))
|
||||
1
|
||||
select hex(lower(cast(0xffff0000 as char character set utf32))) as c;
|
||||
c
|
||||
FFFF0000
|
||||
#
|
||||
# End of 5.5 tests
|
||||
#
|
||||
|
|
|
@ -286,3 +286,19 @@ F 28 28
|
|||
F 29 29
|
||||
F 30 30
|
||||
DROP TABLE t0,t1,t2;
|
||||
#
|
||||
# MDEV-MariaDB daemon leaks memory with specific query
|
||||
#
|
||||
CREATE TABLE t1 (`voter_id` int(11) unsigned NOT NULL,
|
||||
`language_id` int(11) unsigned NOT NULL DEFAULT '1'
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE t2 (`voter_id` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`serialized_c` mediumblob) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
insert into t2 values (1,repeat("a",1000)),(2,repeat("a",1000)),(3,repeat("b",1000)),(4,repeat("c",1000)),(4,repeat("b",1000));
|
||||
SELECT GROUP_CONCAT(t1.language_id SEPARATOR ',') AS `translation_resources`, `d`.`serialized_c` FROM t2 AS `d` LEFT JOIN t1 ON `d`.`voter_id` = t1.`voter_id` GROUP BY `d`.`voter_id` ORDER BY 10-d.voter_id+RAND()*0;
|
||||
translation_resources serialized_c
|
||||
NULL cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
|
||||
NULL bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
||||
NULL aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
NULL aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
drop table t1,t2;
|
||||
|
|
|
@ -3832,6 +3832,23 @@ test.m1 repair error Corrupt
|
|||
# Clean-up.
|
||||
drop tables m1, t1, t4;
|
||||
drop view t3;
|
||||
#
|
||||
# MDEV-10424 - Assertion `ticket == __null' failed in
|
||||
# MDL_request::set_type
|
||||
#
|
||||
CREATE TABLE t1 (f1 INT) ENGINE=MyISAM;
|
||||
CREATE TABLE tmerge (f1 INT) ENGINE=MERGE UNION=(t1);
|
||||
PREPARE stmt FROM "ANALYZE TABLE tmerge, t1";
|
||||
EXECUTE stmt;
|
||||
Table Op Msg_type Msg_text
|
||||
test.tmerge analyze note The storage engine for the table doesn't support analyze
|
||||
test.t1 analyze status Table is already up to date
|
||||
EXECUTE stmt;
|
||||
Table Op Msg_type Msg_text
|
||||
test.tmerge analyze note The storage engine for the table doesn't support analyze
|
||||
test.t1 analyze status Table is already up to date
|
||||
DEALLOCATE PREPARE stmt;
|
||||
DROP TABLE t1, tmerge;
|
||||
End of 5.5 tests
|
||||
#
|
||||
# Additional coverage for refactoring which is made as part
|
||||
|
|
|
@ -4076,4 +4076,35 @@ id value
|
|||
deallocate prepare stmt;
|
||||
SET SESSION sql_mode = @save_sql_mode;
|
||||
DROP TABLE t1,t2;
|
||||
# End of 10.0 tests
|
||||
#
|
||||
# MDEV-8833: Crash of server on prepared statement with
|
||||
# conversion to semi-join
|
||||
#
|
||||
CREATE TABLE t1 (column1 INT);
|
||||
INSERT INTO t1 VALUES (3),(9);
|
||||
CREATE TABLE t2 (column2 INT);
|
||||
INSERT INTO t2 VALUES (1),(4);
|
||||
CREATE TABLE t3 (column3 INT);
|
||||
INSERT INTO t3 VALUES (6),(8);
|
||||
CREATE TABLE t4 (column4 INT);
|
||||
INSERT INTO t4 VALUES (2),(5);
|
||||
PREPARE stmt FROM "SELECT ( SELECT MAX( table1.column1 ) AS field1
|
||||
FROM t1 AS table1
|
||||
WHERE table3.column3 IN ( SELECT table2.column2 AS field2 FROM t2 AS table2 )
|
||||
) AS sq
|
||||
FROM t3 AS table3, t4 AS table4";
|
||||
EXECUTE stmt;
|
||||
sq
|
||||
NULL
|
||||
NULL
|
||||
NULL
|
||||
NULL
|
||||
EXECUTE stmt;
|
||||
sq
|
||||
NULL
|
||||
NULL
|
||||
NULL
|
||||
NULL
|
||||
deallocate prepare stmt;
|
||||
drop table t1,t2,t3,t4;
|
||||
# End of 5.5 tests
|
||||
|
|
|
@ -14,6 +14,25 @@ this
|
|||
0
|
||||
4294967295
|
||||
drop table t1;
|
||||
create table t1 (a bigint unsigned, b mediumint unsigned);
|
||||
insert t1 values (1,2),(0xffffffffffffffff,0xffffff);
|
||||
select coalesce(a,b), coalesce(b,a) from t1;
|
||||
coalesce(a,b) coalesce(b,a)
|
||||
1 2
|
||||
18446744073709551615 16777215
|
||||
create table t2 as select a from t1 union select b from t1;
|
||||
show create table t2;
|
||||
Table Create Table
|
||||
t2 CREATE TABLE `t2` (
|
||||
`a` bigint(20) unsigned DEFAULT NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
||||
select * from t2;
|
||||
a
|
||||
1
|
||||
18446744073709551615
|
||||
2
|
||||
16777215
|
||||
drop table t1, t2;
|
||||
#
|
||||
# Start of 10.0 tests
|
||||
#
|
||||
|
|
|
@ -6,7 +6,8 @@ table_54044 CREATE TEMPORARY TABLE `table_54044` (
|
|||
`IF(NULL IS NOT NULL, NULL, NULL)` binary(0) DEFAULT NULL
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
||||
DROP TABLE table_54044;
|
||||
CREATE TABLE tmp ENGINE = INNODB AS SELECT COALESCE(NULL, NULL, NULL), GREATEST(NULL, NULL), NULL;
|
||||
CREATE TABLE tmp ENGINE = INNODB
|
||||
AS SELECT COALESCE(NULL, NULL, NULL), GREATEST(NULL, NULL), NULL;
|
||||
SHOW CREATE TABLE tmp;
|
||||
Table Create Table
|
||||
tmp CREATE TABLE `tmp` (
|
||||
|
|
|
@ -10,7 +10,10 @@ CREATE TEMPORARY TABLE table_54044 ENGINE = INNODB
|
|||
SHOW CREATE TABLE table_54044;
|
||||
DROP TABLE table_54044;
|
||||
|
||||
CREATE TABLE tmp ENGINE = INNODB AS SELECT COALESCE(NULL, NULL, NULL), GREATEST(NULL, NULL), NULL;
|
||||
# This 'create table' should pass since it uses a Field_string of size 0.
|
||||
|
||||
CREATE TABLE tmp ENGINE = INNODB
|
||||
AS SELECT COALESCE(NULL, NULL, NULL), GREATEST(NULL, NULL), NULL;
|
||||
SHOW CREATE TABLE tmp;
|
||||
DROP TABLE tmp;
|
||||
|
||||
|
@ -23,4 +26,3 @@ FLUSH TABLES;
|
|||
--error 1005
|
||||
CREATE TEMPORARY TABLE tmp ENGINE=InnoDB AS SELECT VALUES(a) FROM t1;
|
||||
DROP TABLE t1;
|
||||
|
||||
|
|
|
@ -1,121 +0,0 @@
|
|||
"General cleanup"
|
||||
set @aria_checkpoint_interval_save= @@global.aria_checkpoint_interval;
|
||||
set @@global.aria_checkpoint_interval= 0;
|
||||
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;
|
||||
set @@global.aria_checkpoint_interval= @aria_checkpoint_interval_save;
|
|
@ -1,197 +0,0 @@
|
|||
# Tests for PERFORMANCE_SCHEMA
|
||||
# Verify that statistics aggregated by different criteria are consistent.
|
||||
|
||||
--source include/not_embedded.inc
|
||||
--source include/have_perfschema.inc
|
||||
|
||||
--echo "General cleanup"
|
||||
|
||||
# MDEV-7187 - test fails sporadically in buildbot
|
||||
set @aria_checkpoint_interval_save= @@global.aria_checkpoint_interval;
|
||||
set @@global.aria_checkpoint_interval= 0;
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1;
|
||||
--enable_warnings
|
||||
|
||||
update performance_schema.setup_instruments set enabled = 'NO';
|
||||
update performance_schema.setup_consumers set enabled = 'NO';
|
||||
|
||||
# Cleanup statistics
|
||||
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;
|
||||
|
||||
# Start recording data
|
||||
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);
|
||||
|
||||
# Stop recording data, so the select below don't add noise.
|
||||
update performance_schema.setup_instruments SET enabled = 'NO';
|
||||
# Disable all consumers, for long standing waits
|
||||
update performance_schema.setup_consumers set enabled = 'NO';
|
||||
|
||||
# Helper to debug
|
||||
set @dump_all=FALSE;
|
||||
|
||||
# Note that in general:
|
||||
# - COUNT/SUM/MAX(file_summary_by_event_name) >=
|
||||
# COUNT/SUM/MAX(file_summary_by_instance).
|
||||
# - MIN(file_summary_by_event_name) <=
|
||||
# MIN(file_summary_by_instance).
|
||||
# There will be equality only when file instances are not removed,
|
||||
# aka when a file is not deleted from the file system,
|
||||
# because doing so removes a row in file_summary_by_instance.
|
||||
|
||||
# Likewise:
|
||||
# - COUNT/SUM/MAX(events_waits_summary_global_by_event_name) >=
|
||||
# COUNT/SUM/MAX(events_waits_summary_by_instance)
|
||||
# - MIN(events_waits_summary_global_by_event_name) <=
|
||||
# MIN(events_waits_summary_by_instance)
|
||||
# There will be equality only when an instrument instance
|
||||
# is not removed, which is next to impossible to predictably guarantee
|
||||
# in the server.
|
||||
# For example, a MyISAM table removed from the table cache
|
||||
# will cause a mysql_mutex_destroy on myisam/MYISAM_SHARE::intern_lock.
|
||||
# Another example, a thread terminating will cause a mysql_mutex_destroy
|
||||
# on sql/LOCK_delete
|
||||
# Both cause a row to be deleted from events_waits_summary_by_instance.
|
||||
|
||||
# Likewise:
|
||||
# - COUNT/SUM/MAX(events_waits_summary_global_by_event_name) >=
|
||||
# COUNT/SUM/MAX(events_waits_summary_by_thread_by_event_name)
|
||||
# - MIN(events_waits_summary_global_by_event_name) <=
|
||||
# MIN(events_waits_summary_by_thread_by_event_name)
|
||||
# There will be equality only when no thread is removed,
|
||||
# that is if no thread disconnects, or no sub thread (for example insert
|
||||
# delayed) ever completes.
|
||||
# A thread completing will cause rows in
|
||||
# events_waits_summary_by_thread_by_event_name to be removed.
|
||||
|
||||
--echo "Verifying file aggregate consistency"
|
||||
|
||||
# Since the code generating the load in this test does:
|
||||
# - create table
|
||||
# - insert
|
||||
# - does not cause temporary tables to be used
|
||||
# we can test for equality here for file aggregates.
|
||||
|
||||
# If any of these queries returns data, the test failed.
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
--echo "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;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
--echo "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;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
|
||||
# Cleanup
|
||||
|
||||
update performance_schema.setup_consumers set enabled = 'YES';
|
||||
update performance_schema.setup_instruments
|
||||
set enabled = 'YES', timed = 'YES';
|
||||
|
||||
drop table test.t1;
|
||||
|
||||
set @@global.aria_checkpoint_interval= @aria_checkpoint_interval_save;
|
||||
|
|
@ -8,7 +8,6 @@ server_audit_file_rotate_now OFF
|
|||
server_audit_file_rotate_size 1000000
|
||||
server_audit_file_rotations 9
|
||||
server_audit_incl_users
|
||||
server_audit_loc_info
|
||||
server_audit_logging OFF
|
||||
server_audit_mode 0
|
||||
server_audit_output_type file
|
||||
|
@ -72,7 +71,6 @@ server_audit_file_rotate_now OFF
|
|||
server_audit_file_rotate_size 1000000
|
||||
server_audit_file_rotations 9
|
||||
server_audit_incl_users odin, root, dva, tri
|
||||
server_audit_loc_info
|
||||
server_audit_logging ON
|
||||
server_audit_mode 0
|
||||
server_audit_output_type file
|
||||
|
@ -218,7 +216,6 @@ server_audit_file_rotate_now OFF
|
|||
server_audit_file_rotate_size 1000000
|
||||
server_audit_file_rotations 9
|
||||
server_audit_incl_users odin, root, dva, tri
|
||||
server_audit_loc_info
|
||||
server_audit_logging ON
|
||||
server_audit_mode 1
|
||||
server_audit_output_type file
|
||||
|
|
|
@ -8,7 +8,6 @@ server_audit_file_rotate_now OFF
|
|||
server_audit_file_rotate_size 1000000
|
||||
server_audit_file_rotations 9
|
||||
server_audit_incl_users
|
||||
server_audit_loc_info
|
||||
server_audit_logging OFF
|
||||
server_audit_mode 0
|
||||
server_audit_output_type file
|
||||
|
@ -72,7 +71,6 @@ server_audit_file_rotate_now OFF
|
|||
server_audit_file_rotate_size 1000000
|
||||
server_audit_file_rotations 9
|
||||
server_audit_incl_users odin, root, dva, tri
|
||||
server_audit_loc_info
|
||||
server_audit_logging ON
|
||||
server_audit_mode 0
|
||||
server_audit_output_type file
|
||||
|
@ -218,7 +216,6 @@ server_audit_file_rotate_now OFF
|
|||
server_audit_file_rotate_size 1000000
|
||||
server_audit_file_rotations 9
|
||||
server_audit_incl_users odin, root, dva, tri
|
||||
server_audit_loc_info
|
||||
server_audit_logging ON
|
||||
server_audit_mode 1
|
||||
server_audit_output_type file
|
||||
|
|
|
@ -889,6 +889,11 @@ SELECT CHAR_LENGTH(TRIM(BOTH 0x0001 FROM _utf32 0x00000061));
|
|||
SELECT CHAR_LENGTH(TRIM(BOTH 0x61 FROM _utf32 0x00000061));
|
||||
SELECT CHAR_LENGTH(TRIM(BOTH 0x00 FROM _utf32 0x00000061));
|
||||
|
||||
#
|
||||
# potential signedness issue
|
||||
#
|
||||
select hex(lower(cast(0xffff0000 as char character set utf32))) as c;
|
||||
|
||||
--echo #
|
||||
--echo # End of 5.5 tests
|
||||
--echo #
|
||||
|
|
|
@ -230,3 +230,16 @@ eval EXPLAIN $query;
|
|||
eval $query;
|
||||
|
||||
DROP TABLE t0,t1,t2;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-MariaDB daemon leaks memory with specific query
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (`voter_id` int(11) unsigned NOT NULL,
|
||||
`language_id` int(11) unsigned NOT NULL DEFAULT '1'
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE t2 (`voter_id` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`serialized_c` mediumblob) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
insert into t2 values (1,repeat("a",1000)),(2,repeat("a",1000)),(3,repeat("b",1000)),(4,repeat("c",1000)),(4,repeat("b",1000));
|
||||
SELECT GROUP_CONCAT(t1.language_id SEPARATOR ',') AS `translation_resources`, `d`.`serialized_c` FROM t2 AS `d` LEFT JOIN t1 ON `d`.`voter_id` = t1.`voter_id` GROUP BY `d`.`voter_id` ORDER BY 10-d.voter_id+RAND()*0;
|
||||
drop table t1,t2;
|
||||
|
|
|
@ -2880,6 +2880,19 @@ drop tables m1, t1, t4;
|
|||
drop view t3;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-10424 - Assertion `ticket == __null' failed in
|
||||
--echo # MDL_request::set_type
|
||||
--echo #
|
||||
CREATE TABLE t1 (f1 INT) ENGINE=MyISAM;
|
||||
CREATE TABLE tmerge (f1 INT) ENGINE=MERGE UNION=(t1);
|
||||
PREPARE stmt FROM "ANALYZE TABLE tmerge, t1";
|
||||
EXECUTE stmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
DROP TABLE t1, tmerge;
|
||||
|
||||
|
||||
--echo End of 5.5 tests
|
||||
|
||||
|
||||
|
|
|
@ -3653,5 +3653,32 @@ deallocate prepare stmt;
|
|||
SET SESSION sql_mode = @save_sql_mode;
|
||||
DROP TABLE t1,t2;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-8833: Crash of server on prepared statement with
|
||||
--echo # conversion to semi-join
|
||||
--echo #
|
||||
|
||||
--echo # End of 10.0 tests
|
||||
CREATE TABLE t1 (column1 INT);
|
||||
INSERT INTO t1 VALUES (3),(9);
|
||||
|
||||
CREATE TABLE t2 (column2 INT);
|
||||
INSERT INTO t2 VALUES (1),(4);
|
||||
|
||||
CREATE TABLE t3 (column3 INT);
|
||||
INSERT INTO t3 VALUES (6),(8);
|
||||
|
||||
CREATE TABLE t4 (column4 INT);
|
||||
INSERT INTO t4 VALUES (2),(5);
|
||||
|
||||
PREPARE stmt FROM "SELECT ( SELECT MAX( table1.column1 ) AS field1
|
||||
FROM t1 AS table1
|
||||
WHERE table3.column3 IN ( SELECT table2.column2 AS field2 FROM t2 AS table2 )
|
||||
) AS sq
|
||||
FROM t3 AS table3, t4 AS table4";
|
||||
EXECUTE stmt;
|
||||
EXECUTE stmt;
|
||||
deallocate prepare stmt;
|
||||
drop table t1,t2,t3,t4;
|
||||
|
||||
|
||||
--echo # End of 5.5 tests
|
||||
|
|
|
@ -16,6 +16,13 @@ drop table t1;
|
|||
|
||||
# End of 4.1 tests
|
||||
|
||||
create table t1 (a bigint unsigned, b mediumint unsigned);
|
||||
insert t1 values (1,2),(0xffffffffffffffff,0xffffff);
|
||||
select coalesce(a,b), coalesce(b,a) from t1;
|
||||
create table t2 as select a from t1 union select b from t1;
|
||||
show create table t2;
|
||||
select * from t2;
|
||||
drop table t1, t2;
|
||||
|
||||
--echo #
|
||||
--echo # Start of 10.0 tests
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (c) 2000, 2010, Oracle and/or its affiliates
|
||||
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates
|
||||
Copyright (c) 2009, 2016, MariaDB
|
||||
|
||||
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
|
||||
|
@ -49,7 +49,8 @@ int my_redel(const char *org_name, const char *tmp_name,
|
|||
DBUG_PRINT("my",("org_name: '%s' tmp_name: '%s' MyFlags: %lu",
|
||||
org_name,tmp_name,MyFlags));
|
||||
|
||||
if (my_copystat(org_name,tmp_name,MyFlags) < 0)
|
||||
if (!my_disable_copystat_in_redel &&
|
||||
my_copystat(org_name,tmp_name,MyFlags) < 0)
|
||||
goto end;
|
||||
if (MyFlags & MY_REDEL_MAKE_BACKUP)
|
||||
{
|
||||
|
|
|
@ -98,3 +98,4 @@ my_bool my_disable_sync=0;
|
|||
my_bool my_disable_async_io=0;
|
||||
my_bool my_disable_flush_key_blocks=0;
|
||||
my_bool my_disable_symlinks=0;
|
||||
my_bool my_disable_copystat_in_redel=0;
|
||||
|
|
|
@ -427,9 +427,8 @@ static MYSQL_SYSVAR_UINT(query_log_limit, query_log_limit,
|
|||
char locinfo_ini_value[sizeof(struct connection_info)+4];
|
||||
|
||||
static MYSQL_THDVAR_STR(loc_info,
|
||||
PLUGIN_VAR_READONLY | PLUGIN_VAR_MEMALLOC,
|
||||
"Auxiliary info.", NULL, NULL,
|
||||
locinfo_ini_value);
|
||||
PLUGIN_VAR_NOSYSVAR | PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_MEMALLOC,
|
||||
"Internal info", NULL, NULL, locinfo_ini_value);
|
||||
|
||||
static const char *syslog_facility_names[]=
|
||||
{
|
||||
|
|
|
@ -355,7 +355,7 @@ static enum_field_types field_types_merge_rules [FIELDTYPE_NUM][FIELDTYPE_NUM]=
|
|||
//MYSQL_TYPE_NULL MYSQL_TYPE_TIMESTAMP
|
||||
MYSQL_TYPE_LONGLONG, MYSQL_TYPE_VARCHAR,
|
||||
//MYSQL_TYPE_LONGLONG MYSQL_TYPE_INT24
|
||||
MYSQL_TYPE_LONGLONG, MYSQL_TYPE_LONG,
|
||||
MYSQL_TYPE_LONGLONG, MYSQL_TYPE_LONGLONG,
|
||||
//MYSQL_TYPE_DATE MYSQL_TYPE_TIME
|
||||
MYSQL_TYPE_VARCHAR, MYSQL_TYPE_VARCHAR,
|
||||
//MYSQL_TYPE_DATETIME MYSQL_TYPE_YEAR
|
||||
|
|
23
sql/item.cc
23
sql/item.cc
|
@ -2743,9 +2743,28 @@ void Item_field::fix_after_pullout(st_select_lex *new_parent, Item **ref)
|
|||
if (context)
|
||||
{
|
||||
Name_resolution_context *ctx= new Name_resolution_context();
|
||||
ctx->outer_context= NULL; // We don't build a complete name resolver
|
||||
ctx->table_list= NULL; // We rely on first_name_resolution_table instead
|
||||
if (context->select_lex == new_parent)
|
||||
{
|
||||
/*
|
||||
This field was pushed in then pulled out
|
||||
(for example left part of IN)
|
||||
*/
|
||||
ctx->outer_context= context->outer_context;
|
||||
}
|
||||
else if (context->outer_context)
|
||||
{
|
||||
/* just pull to the upper context */
|
||||
ctx->outer_context= context->outer_context->outer_context;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* No upper context (merging Derived/VIEW where context chain ends) */
|
||||
ctx->outer_context= NULL;
|
||||
}
|
||||
ctx->table_list= context->first_name_resolution_table;
|
||||
ctx->select_lex= new_parent;
|
||||
if (context->select_lex == NULL)
|
||||
ctx->select_lex= NULL;
|
||||
ctx->first_name_resolution_table= context->first_name_resolution_table;
|
||||
ctx->last_name_resolution_table= context->last_name_resolution_table;
|
||||
ctx->error_processor= context->error_processor;
|
||||
|
|
|
@ -3011,7 +3011,7 @@ bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
|
|||
if (! write_error)
|
||||
{
|
||||
write_error= 1;
|
||||
sql_print_error(ER(ER_ERROR_ON_WRITE), name, error);
|
||||
sql_print_error(ER(ER_ERROR_ON_WRITE), name, tmp_errno);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3916,6 +3916,7 @@ static int init_common_variables()
|
|||
|
||||
max_system_variables.pseudo_thread_id= (ulong)~0;
|
||||
server_start_time= flush_status_time= my_time(0);
|
||||
my_disable_copystat_in_redel= 1;
|
||||
|
||||
global_rpl_filter= new Rpl_filter;
|
||||
binlog_filter= new Rpl_filter;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
|
||||
Copyright (c) 2010, 2014, SkySQL Ab.
|
||||
/* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
|
||||
Copyright (c) 2012, 2016, MariaDB
|
||||
|
||||
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
|
||||
|
|
|
@ -42,9 +42,9 @@ enum file_opt_type {
|
|||
|
||||
struct File_option
|
||||
{
|
||||
LEX_STRING name; /**< Name of the option */
|
||||
int offset; /**< offset to base address of value */
|
||||
file_opt_type type; /**< Option type */
|
||||
LEX_STRING name; /**< Name of the option */
|
||||
my_ptrdiff_t offset; /**< offset to base address of value */
|
||||
file_opt_type type; /**< Option type */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -455,7 +455,19 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
|
|||
}
|
||||
thd->prepare_derived_at_open= FALSE;
|
||||
|
||||
table->next_global= save_next_global;
|
||||
/*
|
||||
MERGE engine may adjust table->next_global chain, thus we have to
|
||||
append save_next_global after merge children.
|
||||
*/
|
||||
if (save_next_global)
|
||||
{
|
||||
TABLE_LIST *table_list_iterator= table;
|
||||
while (table_list_iterator->next_global)
|
||||
table_list_iterator= table_list_iterator->next_global;
|
||||
table_list_iterator->next_global= save_next_global;
|
||||
save_next_global->prev_global= &table_list_iterator->next_global;
|
||||
}
|
||||
|
||||
table->next_local= save_next_local;
|
||||
thd->open_options&= ~extra_open_options;
|
||||
|
||||
|
|
|
@ -5371,9 +5371,11 @@ int THD::decide_logging_format(TABLE_LIST *tables)
|
|||
{
|
||||
static const char *prelocked_mode_name[] = {
|
||||
"NON_PRELOCKED",
|
||||
"LOCK_TABLES",
|
||||
"PRELOCKED",
|
||||
"PRELOCKED_UNDER_LOCK_TABLES",
|
||||
};
|
||||
compile_time_assert(array_elements(prelocked_mode_name) == LTM_always_last);
|
||||
DBUG_PRINT("debug", ("prelocked_mode: %s",
|
||||
prelocked_mode_name[locked_tables_mode]));
|
||||
}
|
||||
|
|
|
@ -1182,7 +1182,8 @@ enum enum_locked_tables_mode
|
|||
LTM_NONE= 0,
|
||||
LTM_LOCK_TABLES,
|
||||
LTM_PRELOCKED,
|
||||
LTM_PRELOCKED_UNDER_LOCK_TABLES
|
||||
LTM_PRELOCKED_UNDER_LOCK_TABLES,
|
||||
LTM_always_last
|
||||
};
|
||||
|
||||
|
||||
|
@ -4302,6 +4303,11 @@ public:
|
|||
save_copy_field_end= copy_field_end= NULL;
|
||||
}
|
||||
}
|
||||
void free_copy_field_data()
|
||||
{
|
||||
for (Copy_field *ptr= copy_field ; ptr != copy_field_end ; ptr++)
|
||||
ptr->tmp.free();
|
||||
}
|
||||
};
|
||||
|
||||
class select_union :public select_result_interceptor
|
||||
|
|
|
@ -2810,6 +2810,22 @@ static st_bookmark *find_bookmark(const char *plugin, const char *name,
|
|||
}
|
||||
|
||||
|
||||
static size_t var_storage_size(int flags)
|
||||
{
|
||||
switch (flags & PLUGIN_VAR_TYPEMASK) {
|
||||
case PLUGIN_VAR_BOOL: return sizeof(my_bool);
|
||||
case PLUGIN_VAR_INT: return sizeof(int);
|
||||
case PLUGIN_VAR_LONG: return sizeof(long);
|
||||
case PLUGIN_VAR_ENUM: return sizeof(long);
|
||||
case PLUGIN_VAR_LONGLONG: return sizeof(ulonglong);
|
||||
case PLUGIN_VAR_SET: return sizeof(ulonglong);
|
||||
case PLUGIN_VAR_STR: return sizeof(char*);
|
||||
case PLUGIN_VAR_DOUBLE: return sizeof(double);
|
||||
default: DBUG_ASSERT(0); return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
returns a bookmark for thd-local variables, creating if neccessary.
|
||||
returns null for non thd-local variables.
|
||||
|
@ -2818,39 +2834,13 @@ static st_bookmark *find_bookmark(const char *plugin, const char *name,
|
|||
static st_bookmark *register_var(const char *plugin, const char *name,
|
||||
int flags)
|
||||
{
|
||||
uint length= strlen(plugin) + strlen(name) + 3, size= 0, offset, new_size;
|
||||
uint length= strlen(plugin) + strlen(name) + 3, size, offset, new_size;
|
||||
st_bookmark *result;
|
||||
char *varname, *p;
|
||||
|
||||
if (!(flags & PLUGIN_VAR_THDLOCAL))
|
||||
return NULL;
|
||||
|
||||
switch (flags & PLUGIN_VAR_TYPEMASK) {
|
||||
case PLUGIN_VAR_BOOL:
|
||||
size= sizeof(my_bool);
|
||||
break;
|
||||
case PLUGIN_VAR_INT:
|
||||
size= sizeof(int);
|
||||
break;
|
||||
case PLUGIN_VAR_LONG:
|
||||
case PLUGIN_VAR_ENUM:
|
||||
size= sizeof(long);
|
||||
break;
|
||||
case PLUGIN_VAR_LONGLONG:
|
||||
case PLUGIN_VAR_SET:
|
||||
size= sizeof(ulonglong);
|
||||
break;
|
||||
case PLUGIN_VAR_STR:
|
||||
size= sizeof(char*);
|
||||
break;
|
||||
case PLUGIN_VAR_DOUBLE:
|
||||
size= sizeof(double);
|
||||
break;
|
||||
default:
|
||||
DBUG_ASSERT(0);
|
||||
return NULL;
|
||||
};
|
||||
DBUG_ASSERT(flags & PLUGIN_VAR_THDLOCAL);
|
||||
|
||||
size= var_storage_size(flags);
|
||||
varname= ((char*) my_alloca(length));
|
||||
strxmov(varname + 1, plugin, "_", name, NullS);
|
||||
for (p= varname + 1; *p; p++)
|
||||
|
@ -3046,25 +3036,17 @@ void sync_dynamic_session_variables(THD* thd, bool global_lock)
|
|||
*/
|
||||
for (idx= 0; idx < bookmark_hash.records; idx++)
|
||||
{
|
||||
sys_var_pluginvar *pi;
|
||||
sys_var *var;
|
||||
st_bookmark *v= (st_bookmark*) my_hash_element(&bookmark_hash,idx);
|
||||
|
||||
if (v->version <= thd->variables.dynamic_variables_version)
|
||||
continue; /* already in thd->variables */
|
||||
|
||||
if (!(var= intern_find_sys_var(v->key + 1, v->name_len)) ||
|
||||
!(pi= var->cast_pluginvar()) ||
|
||||
v->key[0] != plugin_var_bookmark_key(pi->plugin_var->flags))
|
||||
continue;
|
||||
|
||||
/* Here we do anything special that may be required of the data types */
|
||||
|
||||
if ((pi->plugin_var->flags & PLUGIN_VAR_TYPEMASK) == PLUGIN_VAR_STR &&
|
||||
pi->plugin_var->flags & PLUGIN_VAR_MEMALLOC)
|
||||
if ((v->key[0] & PLUGIN_VAR_TYPEMASK) == PLUGIN_VAR_STR &&
|
||||
v->key[0] & BOOKMARK_MEMALLOC)
|
||||
{
|
||||
int offset= ((thdvar_str_t *)(pi->plugin_var))->offset;
|
||||
char **pp= (char**) (thd->variables.dynamic_variables_ptr + offset);
|
||||
char **pp= (char**) (thd->variables.dynamic_variables_ptr + v->offset);
|
||||
if (*pp)
|
||||
*pp= my_strdup(*pp, MYF(MY_WME|MY_FAE));
|
||||
}
|
||||
|
@ -3325,6 +3307,48 @@ bool sys_var_pluginvar::session_update(THD *thd, set_var *var)
|
|||
return false;
|
||||
}
|
||||
|
||||
static const void *var_def_ptr(st_mysql_sys_var *pv)
|
||||
{
|
||||
switch (pv->flags & (PLUGIN_VAR_TYPEMASK | PLUGIN_VAR_THDLOCAL)) {
|
||||
case PLUGIN_VAR_INT:
|
||||
return &((sysvar_uint_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_LONG:
|
||||
return &((sysvar_ulong_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_LONGLONG:
|
||||
return &((sysvar_ulonglong_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_ENUM:
|
||||
return &((sysvar_enum_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_SET:
|
||||
return &((sysvar_set_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_BOOL:
|
||||
return &((sysvar_bool_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_STR:
|
||||
return &((sysvar_str_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_DOUBLE:
|
||||
return &((sysvar_double_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_INT | PLUGIN_VAR_THDLOCAL:
|
||||
return &((thdvar_uint_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_LONG | PLUGIN_VAR_THDLOCAL:
|
||||
return &((thdvar_ulong_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_LONGLONG | PLUGIN_VAR_THDLOCAL:
|
||||
return &((thdvar_ulonglong_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_ENUM | PLUGIN_VAR_THDLOCAL:
|
||||
return &((thdvar_enum_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_SET | PLUGIN_VAR_THDLOCAL:
|
||||
return &((thdvar_set_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_BOOL | PLUGIN_VAR_THDLOCAL:
|
||||
return &((thdvar_bool_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_STR | PLUGIN_VAR_THDLOCAL:
|
||||
return &((thdvar_str_t*) pv)->def_val;
|
||||
case PLUGIN_VAR_DOUBLE | PLUGIN_VAR_THDLOCAL:
|
||||
return &((thdvar_double_t*) pv)->def_val;
|
||||
default:
|
||||
DBUG_ASSERT(0);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool sys_var_pluginvar::global_update(THD *thd, set_var *var)
|
||||
{
|
||||
DBUG_ASSERT(!is_readonly());
|
||||
|
@ -3334,60 +3358,7 @@ bool sys_var_pluginvar::global_update(THD *thd, set_var *var)
|
|||
const void *src= &var->save_result;
|
||||
|
||||
if (!var->value)
|
||||
{
|
||||
switch (plugin_var->flags & (PLUGIN_VAR_TYPEMASK | PLUGIN_VAR_THDLOCAL)) {
|
||||
case PLUGIN_VAR_INT:
|
||||
src= &((sysvar_uint_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_LONG:
|
||||
src= &((sysvar_ulong_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_LONGLONG:
|
||||
src= &((sysvar_ulonglong_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_ENUM:
|
||||
src= &((sysvar_enum_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_SET:
|
||||
src= &((sysvar_set_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_BOOL:
|
||||
src= &((sysvar_bool_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_STR:
|
||||
src= &((sysvar_str_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_DOUBLE:
|
||||
src= &((sysvar_double_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_INT | PLUGIN_VAR_THDLOCAL:
|
||||
src= &((thdvar_uint_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_LONG | PLUGIN_VAR_THDLOCAL:
|
||||
src= &((thdvar_ulong_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_LONGLONG | PLUGIN_VAR_THDLOCAL:
|
||||
src= &((thdvar_ulonglong_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_ENUM | PLUGIN_VAR_THDLOCAL:
|
||||
src= &((thdvar_enum_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_SET | PLUGIN_VAR_THDLOCAL:
|
||||
src= &((thdvar_set_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_BOOL | PLUGIN_VAR_THDLOCAL:
|
||||
src= &((thdvar_bool_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_STR | PLUGIN_VAR_THDLOCAL:
|
||||
src= &((thdvar_str_t*) plugin_var)->def_val;
|
||||
break;
|
||||
case PLUGIN_VAR_DOUBLE | PLUGIN_VAR_THDLOCAL:
|
||||
src= &((thdvar_double_t*) plugin_var)->def_val;
|
||||
break;
|
||||
default:
|
||||
DBUG_ASSERT(0);
|
||||
}
|
||||
}
|
||||
src= var_def_ptr(plugin_var);
|
||||
|
||||
plugin_var->update(thd, plugin_var, tgt, src);
|
||||
return false;
|
||||
|
@ -3743,7 +3714,18 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
|
|||
*(int*)(opt + 1)= offset= v->offset;
|
||||
|
||||
if (opt->flags & PLUGIN_VAR_NOCMDOPT)
|
||||
{
|
||||
char *val= global_system_variables.dynamic_variables_ptr + offset;
|
||||
if (((opt->flags & PLUGIN_VAR_TYPEMASK) == PLUGIN_VAR_STR) &&
|
||||
(opt->flags & PLUGIN_VAR_MEMALLOC))
|
||||
{
|
||||
char *def_val= *(char**)var_def_ptr(opt);
|
||||
*(char**)val= def_val ? my_strdup(def_val, MYF(0)) : NULL;
|
||||
}
|
||||
else
|
||||
memcpy(val, var_def_ptr(opt), var_storage_size(opt->flags));
|
||||
continue;
|
||||
}
|
||||
|
||||
optname= (char*) memdup_root(mem_root, v->key + 1,
|
||||
(optnamelen= v->name_len) + 1);
|
||||
|
@ -3951,10 +3933,11 @@ static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp,
|
|||
*str->value= strdup_root(mem_root, *str->value);
|
||||
}
|
||||
|
||||
var= find_bookmark(plugin_name.str, o->name, o->flags);
|
||||
if (o->flags & PLUGIN_VAR_NOSYSVAR)
|
||||
continue;
|
||||
tmp_backup[tmp->nbackups++].save(&o->name);
|
||||
if ((var= find_bookmark(plugin_name.str, o->name, o->flags)))
|
||||
if (var)
|
||||
v= new (mem_root) sys_var_pluginvar(&chain, var->key + 1, o, tmp);
|
||||
else
|
||||
{
|
||||
|
|
|
@ -9004,9 +9004,26 @@ JOIN::make_simple_join(JOIN *parent, TABLE *temp_table)
|
|||
We need to destruct the copy_field (allocated in create_tmp_table())
|
||||
before setting it to 0 if the join is not "reusable".
|
||||
*/
|
||||
if (!tmp_join || tmp_join != this)
|
||||
tmp_table_param.cleanup();
|
||||
tmp_table_param.copy_field= tmp_table_param.copy_field_end=0;
|
||||
if (!tmp_join || tmp_join != this)
|
||||
tmp_table_param.cleanup();
|
||||
else
|
||||
{
|
||||
/*
|
||||
Free data buffered in copy_fields, but keep data pointed by copy_field
|
||||
around for next iteration (possibly stored in save_copy_fields).
|
||||
|
||||
It would be logically simpler to not clear copy_field
|
||||
below, but as we have loops that runs over copy_field to
|
||||
copy_field_end that should not be done anymore, it's simpler to
|
||||
just clear the pointers.
|
||||
|
||||
Another option would be to just clear copy_field_end and not run
|
||||
the loops if this is not set or to have tmp_table_param.cleanup()
|
||||
to run cleanup on save_copy_field if copy_field is not set.
|
||||
*/
|
||||
tmp_table_param.free_copy_field_data();
|
||||
tmp_table_param.copy_field= tmp_table_param.copy_field_end=0;
|
||||
}
|
||||
first_record= sort_and_group=0;
|
||||
send_records= (ha_rows) 0;
|
||||
|
||||
|
@ -11687,7 +11704,7 @@ void JOIN::join_free()
|
|||
/**
|
||||
Free resources of given join.
|
||||
|
||||
@param fill true if we should free all resources, call with full==1
|
||||
@param full true if we should free all resources, call with full==1
|
||||
should be last, before it this function can be called with
|
||||
full==0
|
||||
|
||||
|
@ -11806,7 +11823,7 @@ void JOIN::cleanup(bool full)
|
|||
/*
|
||||
If we have tmp_join and 'this' JOIN is not tmp_join and
|
||||
tmp_table_param.copy_field's of them are equal then we have to remove
|
||||
pointer to tmp_table_param.copy_field from tmp_join, because it qill
|
||||
pointer to tmp_table_param.copy_field from tmp_join, because it will
|
||||
be removed in tmp_table_param.cleanup().
|
||||
*/
|
||||
if (tmp_join &&
|
||||
|
@ -15710,6 +15727,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
|
|||
case Item::VARBIN_ITEM:
|
||||
case Item::CACHE_ITEM:
|
||||
case Item::EXPR_CACHE_ITEM:
|
||||
case Item::PARAM_ITEM:
|
||||
if (make_copy_field)
|
||||
{
|
||||
DBUG_ASSERT(((Item_result_field*)item)->result_field);
|
||||
|
@ -22240,7 +22258,7 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,
|
|||
err:
|
||||
if (copy)
|
||||
delete [] param->copy_field; // This is never 0
|
||||
param->copy_field=0;
|
||||
param->copy_field= 0;
|
||||
err2:
|
||||
DBUG_RETURN(TRUE);
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* Copyright (c) 2003, 2013, Oracle and/or its affiliates
|
||||
Copyright (c) 2009, 2014, SkySQL Ab.
|
||||
Copyright (c) 2009, 2016, MariaDB
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
|
||||
Copyright (c) 2009, 2013, Monty Program Ab
|
||||
Copyright (c) 2009, 2016, MariaDB
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
|
|
|
@ -303,7 +303,7 @@ case "$mode" in
|
|||
then
|
||||
# Give extra arguments to mysqld with the my.cnf file. This script
|
||||
# may be overwritten at next upgrade.
|
||||
$bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" >/dev/null 2>&1 &
|
||||
$bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" >/dev/null &
|
||||
wait_for_ready; return_value=$?
|
||||
|
||||
# Make lock for RedHat / SuSE
|
||||
|
|
|
@ -425,7 +425,7 @@ main(int argc, char *argv[])
|
|||
|
||||
event_dispatch();
|
||||
|
||||
free(sds);
|
||||
my_free(sds);
|
||||
|
||||
mysql_library_end();
|
||||
|
||||
|
|
|
@ -24,10 +24,13 @@ ENDIF()
|
|||
|
||||
|
||||
SET(MANUFACTURER "MariaDB Corporation Ab")
|
||||
FIND_PATH(WIX_DIR heat.exe
|
||||
"$ENV{ProgramFiles}/WiX Toolset v3.9/bin"
|
||||
"$ENV{ProgramFiles}/WiX Toolset v3.10/bin"
|
||||
)
|
||||
SET(WIX_BIN_PATHS)
|
||||
FOREACH(WIX_VER 3.9 3.10 3.11)
|
||||
LIST(APPEND WIX_BIN_PATHS "$ENV{ProgramFiles}/WiX Toolset v${WIX_VER}/bin")
|
||||
LIST(APPEND WIX_BIN_PATHS "$ENV{ProgramFiles} (x86)/WiX Toolset v${WIX_VER}/bin")
|
||||
ENDFOREACH()
|
||||
|
||||
FIND_PATH(WIX_DIR heat.exe ${WIX_BIN_PATHS})
|
||||
SET(CPACK_WIX_PACKAGE_BASE_NAME "MariaDB")
|
||||
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||
SET(CPACK_WIX_UPGRADE_CODE "49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3")
|
||||
|
|
|
@ -434,6 +434,7 @@ EXECUTE_PROCESS(
|
|||
IF(SIGNCODE)
|
||||
EXECUTE_PROCESS(
|
||||
COMMAND ${SIGNTOOL_EXECUTABLE} sign ${SIGNTOOL_PARAMETERS}
|
||||
/d ${CPACK_PACKAGE_FILE_NAME}.msi
|
||||
${CPACK_PACKAGE_FILE_NAME}.msi
|
||||
)
|
||||
ENDIF()
|
||||
|
|
Loading…
Add table
Reference in a new issue