Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
MariaDB and MySQL Packaging Team
mariadb-5.5
Commits
fa5f29ea
Commit
fa5f29ea
authored
Dec 30, 2017
by
Otto Kekäläinen
Browse files
New upstream version 5.5.58
parent
69b6b895
Changes
137
Hide whitespace changes
Inline
Side-by-side
mysql-test/t/case.test
View file @
fa5f29ea
...
...
@@ -174,6 +174,18 @@ drop table t1, t2;
--
echo
End
of
5.0
tests
--
echo
#
--
echo
# Bug#19875294 ASSERTION `SRC' FAILED IN MY_STRNXFRM_UNICODE
--
echo
# (SIG 6 -STRINGS/CTYPE-UTF8.C:5151)
--
echo
#
set
@@
sql_mode
=
''
;
CREATE
TABLE
t1
(
c1
SET
(
''
,
''
)
CHARACTER
SET
ucs2
);
INSERT
INTO
t1
VALUES
(
990101.102
);
SELECT
COALESCE
(
c1
)
FROM
t1
ORDER
BY
1
;
DROP
TABLE
t1
;
set
@@
sql_mode
=
default
;
#
# lp:1001510
# Bug #11764313 57135: CRASH IN ITEM_FUNC_CASE::FIND_ITEM WITH CASE WHEN
...
...
mysql-test/t/count_distinct.test
View file @
fa5f29ea
...
...
@@ -120,6 +120,35 @@ select count(distinct user_id) from t1;
drop
table
t1
;
set
@@
tmp_table_size
=
default
;
#
# MDEV-13457: Wrong result for aggregate function with distinct clause when the value for
# tmp_table_size is small
#
create
table
t1
(
a
VARCHAR
(
1020
),
b
int
);
insert
into
t1
values
(
0
,
1
),
(
1
,
2
),
(
2
,
3
),
(
3
,
4
),
(
4
,
5
),
(
5
,
6
),
(
6
,
7
),
(
7
,
8
),
(
8
,
9
),
(
9
,
10
),
(
0
,
11
),
(
1
,
12
),
(
2
,
13
),
(
3
,
14
);
set
@@
tmp_table_size
=
1024
;
select
count
(
distinct
a
)
from
t1
;
drop
table
t1
;
set
@@
tmp_table_size
=
default
;
#
# End of 5.5 tests
#
mysql-test/t/ctype_ucs.test
View file @
fa5f29ea
...
...
@@ -862,6 +862,29 @@ SELECT @@sql_mode;
SET
sql_mode
=
DEFAULT
;
SET
NAMES
utf8
;
--
echo
#
--
echo
# MDEV-13972 crash in Item_func_sec_to_time::get_date
--
echo
#
SELECT
SEC_TO_TIME
(
CONVERT
(
900
*
24
*
60
*
60
USING
ucs2
));
--
echo
#
--
echo
# MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
--
echo
#
CREATE
TABLE
t1
(
c1
VARCHAR
(
32766
)
CHARACTER
SET
ucs2
);
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARCHAR
(
32767
)
CHARACTER
SET
ucs2
);
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARCHAR
(
32768
)
CHARACTER
SET
ucs2
);
DESCRIBE
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# End of 5.5 tests
--
echo
#
mysql-test/t/ctype_utf32.test
View file @
fa5f29ea
...
...
@@ -890,6 +890,19 @@ SELECT @@sql_mode;
SET
sql_mode
=
DEFAULT
;
SET
NAMES
utf8
;
--
echo
#
--
echo
# MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
--
echo
#
CREATE
TABLE
t1
(
c1
VARCHAR
(
16383
)
CHARACTER
SET
utf32
);
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARCHAR
(
16384
)
CHARACTER
SET
utf32
);
DESCRIBE
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# End of 5.5 tests
--
echo
#
mysql-test/t/ctype_utf8.test
View file @
fa5f29ea
...
...
@@ -1695,6 +1695,22 @@ SELECT CHAR(i USING utf8) FROM t1;
SET
sql_mode
=
DEFAULT
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
--
echo
#
CREATE
TABLE
t1
(
c1
VARCHAR
(
21844
)
CHARACTER
SET
utf8
);
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARCHAR
(
21845
)
CHARACTER
SET
utf8
);
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARCHAR
(
21846
)
CHARACTER
SET
utf8
);
DESCRIBE
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# End of 5.5 tests
--
echo
#
mysql-test/t/func_in.test
View file @
fa5f29ea
...
...
@@ -606,3 +606,11 @@ EXECUTE s;
DROP
TABLE
t1
;
--
echo
# End of 5.3 tests
#
# Bug#26361149 MYSQL SERVER CRASHES AT: COL IN(IFNULL(CONST, COL), NAME_CONST('NAME', NULL))
#
create
table
t1
(
a
int
);
insert
t1
values
(
1
),(
2
),(
3
);
select
*
from
t1
where
1
in
(
a
,
name_const
(
'a'
,
null
));
drop
table
t1
;
mysql-test/t/func_time.test
View file @
fa5f29ea
...
...
@@ -1602,3 +1602,34 @@ DROP TABLE t1;
--
echo
# MDEV-10524 Assertion `arg1_int >= 0' failed in Item_func_additive_op::result_precision()
--
echo
#
SELECT
1
MOD
ADDTIME
(
'13:58:57'
,
'00:00:01'
)
+
2
;
--
echo
#
--
echo
# MDEV-11819 NO_ZERO_IN_DATE: Incorrect generated column value
--
echo
#
SET
sql_mode
=
'NO_ZERO_IN_DATE'
;
CREATE
TABLE
t1
(
a
TIME
(
6
));
INSERT
INTO
t1
SELECT
timediff
(
timestamp
'2008-12-31 23:59:59.000001'
,
timestamp
'2008-12-30 01:01:01.000002'
);
SELECT
*
FROM
t1
;
DROP
TABLE
t1
;
SET
sql_mode
=
DEFAULT
;
--
echo
#
--
echo
# MDEV-13972 crash in Item_func_sec_to_time::get_date
--
echo
#
# The below query can return warning sporadically
--
disable_warnings
DO
TO_DAYS
(
SEC_TO_TIME
(
TIME
(
CEILING
(
UUID
()))));
--
enable_warnings
DO
TO_DAYS
(
SEC_TO_TIME
(
MAKEDATE
(
''
,
RAND
(
~
(
''
)))));
SELECT
TO_DAYS
(
SEC_TO_TIME
(
MAKEDATE
(
0
,
RAND
(
~
0
))));
SELECT
SEC_TO_TIME
(
MAKEDATE
(
0
,
RAND
(
~
0
)));
--
echo
#
--
echo
# End of 5.5 tests
--
echo
#
mysql-test/t/log_tables-big.test
View file @
fa5f29ea
...
...
@@ -7,6 +7,7 @@
# check that CSV engine was compiled in
--
source
include
/
have_csv
.
inc
set
@
log_output
.
saved
=
@@
global
.
log_output
;
set
@@
global
.
log_output
=
'TABLE'
;
connect
(
con1
,
localhost
,
root
,,);
...
...
@@ -21,13 +22,13 @@ select get_lock('bug27638', 1);
connection
con2
;
set
session
long_query_time
=
1
;
select
get_lock
(
'bug27638'
,
2
);
select
if
(
query_time
>=
'00:00:01'
,
'OK'
,
'WRONG'
)
as
qt
,
sql_text
from
mysql
.
slow_log
select
if
(
query_time
>=
'00:00:01'
,
'OK'
,
concat
(
'WRONG: '
,
query_time
)
)
as
qt
,
sql_text
from
mysql
.
slow_log
where
sql_text
=
'select get_lock(\'bug27638\', 2)'
;
select
get_lock
(
'bug27638'
,
60
);
select
if
(
query_time
>=
'00:00:59'
,
'OK'
,
'WRONG'
)
as
qt
,
sql_text
from
mysql
.
slow_log
select
if
(
query_time
>=
'00:00:59'
,
'OK'
,
concat
(
'WRONG: '
,
query_time
)
)
as
qt
,
sql_text
from
mysql
.
slow_log
where
sql_text
=
'select get_lock(\'bug27638\', 60)'
;
select
get_lock
(
'bug27638'
,
101
);
select
if
(
query_time
>=
'00:01:40'
,
'OK'
,
'WRONG'
)
as
qt
,
sql_text
from
mysql
.
slow_log
select
if
(
query_time
>=
'00:01:40'
,
'OK'
,
concat
(
'WRONG: '
,
query_time
)
)
as
qt
,
sql_text
from
mysql
.
slow_log
where
sql_text
=
'select get_lock(\'bug27638\', 101)'
;
connection
con1
;
select
release_lock
(
'bug27638'
);
...
...
@@ -36,4 +37,4 @@ connection default;
disconnect
con1
;
disconnect
con2
;
set
@@
global
.
log_output
=
default
;
set
@@
global
.
log_output
=
@
log_output
.
saved
;
mysql-test/t/myisam.test
View file @
fa5f29ea
...
...
@@ -1030,8 +1030,9 @@ show create table t1;
drop
table
t1
;
# MyISAM specific varchar tests
--
error
1118
create
table
t1
(
v
varchar
(
65535
));
show
create
table
t1
;
drop
table
t1
;
eval
set
storage_engine
=
$default
;
...
...
mysql-test/t/partition_datatype.test
View file @
fa5f29ea
...
...
@@ -217,11 +217,13 @@ select * from t1 where a = 'bbbb';
drop
table
t1
;
--
error
ER_PARTITION_FIELDS_TOO_LONG
create
table
t1
(
a
varchar
(
3070
))
partition
by
key
(
a
);
--
error
ER_TOO_BIG_ROWSIZE
--
error
ER_PARTITION_FIELDS_TOO_LONG
create
table
t1
(
a
varchar
(
65532
)
not
null
)
partition
by
key
(
a
);
--
error
ER_BLOB_FIELD_IN_PART_FUNC_ERROR
create
table
t1
(
a
varchar
(
65533
))
partition
by
key
(
a
);
--
error
ER_
TOO_BIG_ROWSIZE
--
error
ER_
BLOB_FIELD_IN_PART_FUNC_ERROR
create
table
t1
(
a
varchar
(
65534
)
not
null
)
partition
by
key
(
a
);
--
error
ER_
TOO_BIG_ROWSIZE
--
error
ER_
BLOB_FIELD_IN_PART_FUNC_ERROR
create
table
t1
(
a
varchar
(
65535
))
partition
by
key
(
a
);
#
...
...
mysql-test/t/ps.test
View file @
fa5f29ea
...
...
@@ -3714,4 +3714,133 @@ deallocate prepare stmt2;
drop
table
t1
;
--
echo
#
--
echo
# MDEV-9208: Function->Function->View = Mysqld segfault
--
echo
# (Server crashes in Dependency_marker::visit_field on 2nd
--
echo
# execution with merged subquery)
--
echo
#
CREATE
TABLE
t1
(
i1
INT
);
insert
into
t1
values
(
1
),(
2
);
CREATE
TABLE
t2
(
i2
INT
);
insert
into
t2
values
(
1
),(
2
);
prepare
stmt
from
"
select 1 from (
select
if (i1<0, 0, 0) as f1,
(select f1) as f2
from t1, t2
) sq
"
;
execute
stmt
;
execute
stmt
;
drop
table
t1
,
t2
;
--
echo
#
--
echo
# MDEV-9619: Assertion `null_ref_table' failed in virtual
--
echo
# table_map Item_direct_view_ref::used_tables() const on 2nd
--
echo
# execution of PS
--
echo
#
CREATE
TABLE
t1
(
f1
VARCHAR
(
10
))
ENGINE
=
MyISAM
;
CREATE
ALGORITHM
=
MERGE
VIEW
v1
AS
SELECT
*
FROM
t1
;
INSERT
INTO
t1
VALUES
(
'a'
),(
'b'
);
CREATE
TABLE
t2
(
f2
VARCHAR
(
10
))
ENGINE
=
MyISAM
;
INSERT
INTO
t2
VALUES
(
'c'
),(
'd'
);
PREPARE
stmt
FROM
"SELECT * FROM v1 WHERE f1 = SOME ( SELECT f2 FROM t2 )"
;
EXECUTE
stmt
;
EXECUTE
stmt
;
insert
into
t1
values
(
'c'
);
EXECUTE
stmt
;
EXECUTE
stmt
;
deallocate
prepare
stmt
;
drop
view
v1
;
drop
table
t1
,
t2
;
CREATE
TABLE
t1
(
f1
VARCHAR
(
10
))
ENGINE
=
MyISAM
;
CREATE
ALGORITHM
=
MERGE
VIEW
v1
AS
SELECT
*
FROM
t1
;
INSERT
INTO
t1
VALUES
(
'a'
),(
'b'
);
CREATE
TABLE
t2
(
f2
VARCHAR
(
10
))
ENGINE
=
MyISAM
;
INSERT
INTO
t2
VALUES
(
'c'
),(
'd'
);
PREPARE
stmt
FROM
"SELECT * FROM v1 WHERE (f1,f1) = SOME ( SELECT f2,f2 FROM t2 )"
;
EXECUTE
stmt
;
EXECUTE
stmt
;
insert
into
t1
values
(
'c'
);
EXECUTE
stmt
;
EXECUTE
stmt
;
deallocate
prepare
stmt
;
drop
view
v1
;
drop
table
t1
,
t2
;
CREATE
TABLE
t1
(
column1
INT
)
ENGINE
=
MyISAM
;
INSERT
INTO
t1
VALUES
(
3
),(
9
);
CREATE
TABLE
t2
(
column2
INT
)
ENGINE
=
MyISAM
;
INSERT
INTO
t2
VALUES
(
1
),(
4
);
CREATE
TABLE
t3
(
column3
INT
)
ENGINE
=
MyISAM
;
INSERT
INTO
t3
VALUES
(
6
),(
8
);
CREATE
TABLE
t4
(
column4
INT
)
ENGINE
=
MyISAM
;
INSERT
INTO
t4
VALUES
(
2
),(
5
);
PREPARE
stmt
FROM
"
SELECT (
SELECT MAX( table1.column1 ) AS field1
FROM t1 AS table1
WHERE (111,table3.column3) IN ( SELECT 111,table2.column2 AS field2 FROM t2 AS table2 )
) AS sq
FROM t3 AS table3, t4 AS table4 GROUP BY sq
"
;
EXECUTE
stmt
;
EXECUTE
stmt
;
deallocate
prepare
stmt
;
drop
table
t1
,
t2
,
t3
,
t4
;
create
table
t1
(
a
int
,
b
int
,
c
int
);
create
table
t2
(
x
int
,
y
int
,
z
int
);
create
table
t3
as
select
*
from
t1
;
insert
into
t1
values
(
1
,
2
,
3
),(
4
,
5
,
6
),(
100
,
200
,
300
),(
400
,
500
,
600
);
insert
into
t2
values
(
1
,
2
,
3
),(
7
,
8
,
9
),(
100
,
200
,
300
),(
400
,
500
,
600
);
insert
into
t3
values
(
1
,
2
,
3
),(
11
,
12
,
13
),(
100
,
0
,
0
),(
400
,
500
,
600
);
set
@
optimizer_switch_save
=@@
optimizer_switch
;
set
@
join_cache_level_save
=@@
join_cache_level
;
set
optimizer_switch
=
'materialization=off'
;
set
join_cache_level
=
0
;
select
*
from
t1
where
(
select
a
,
b
from
t3
where
t3
.
c
=
t1
.
c
)
in
(
select
x
,
y
from
t2
where
t1
.
c
=
t2
.
z
);
prepare
stmt
from
"select * from t1 where (select a,b from t3 where t3.c=t1.c) in (select x,y from t2 where t1.c= t2.z)"
;
EXECUTE
stmt
;
EXECUTE
stmt
;
create
view
v1
as
select
*
from
t1
;
create
view
v2
as
select
*
from
t2
;
create
view
v3
as
select
*
from
t3
;
select
*
from
v1
where
(
select
a
,
b
from
v3
where
v3
.
c
=
v1
.
c
)
in
(
select
x
,
y
from
v2
where
v1
.
c
=
v2
.
z
);
prepare
stmt
from
"select * from v1 where (select a,b from v3 where v3.c=v1.c) in (select x,y from v2 where v1.c= v2.z)"
;
EXECUTE
stmt
;
EXECUTE
stmt
;
set
optimizer_switch
=@
optimizer_switch_save
;
set
join_cache_level
=@
join_cache_level_save
;
deallocate
prepare
stmt
;
drop
view
v1
,
v2
,
v3
;
drop
table
t1
,
t2
,
t3
;
--
echo
# End of 5.5 tests
mysql-test/t/read_only.test
View file @
fa5f29ea
...
...
@@ -114,6 +114,11 @@ drop table t1;
--
error
ER_OPTION_PREVENTS_STATEMENT
insert
into
t1
values
(
1
);
#
# MDEV-14056 DROP TEMPORARY TABLE IF EXISTS causes error 1290 with read_only option
#
drop
temporary
table
if
exists
t1
;
#
# Bug#11733 COMMITs should not happen if read-only is set
#
...
...
mysql-test/t/show_function_with_pad_char_to_full_length.test
0 → 100644
View file @
fa5f29ea
#
# Test that show function status succeeds with
# sql_mode = 'PAD_CHAR_TO_FULL_LENGTH (MDEV-13149)
# show function status
create
function
f
()
returns
int
return
1
;
--
replace_column
1
T
3
T
4
T
5
T
6
T
7
T
8
T
9
T
10
T
11
T
show
function
status
;
set
sql_mode
=
'PAD_CHAR_TO_FULL_LENGTH'
;
--
replace_column
1
T
3
T
4
T
5
T
6
T
7
T
8
T
9
T
10
T
11
T
show
function
status
;
drop
function
f
;
select
@@
sql_mode
;
# select ROUTINE_NAME from information_schema.ROUTINES
create
function
f
()
returns
int
return
1
;
select
ROUTINE_NAME
from
information_schema
.
ROUTINES
where
ROUTINE_NAME
=
'f'
;
set
sql_mode
=
'PAD_CHAR_TO_FULL_LENGTH'
;
select
ROUTINE_NAME
from
information_schema
.
ROUTINES
where
ROUTINE_NAME
=
'f'
;
drop
function
f
;
select
@@
sql_mode
;
mysql-test/t/subselect_mat_cost_bugs.test
View file @
fa5f29ea
...
...
@@ -522,4 +522,23 @@ select * from t1 where a in (select max(a) from t1 where a < 4) or a > 5;
drop
table
t1
;
--
echo
#
--
echo
# MDEV-13135: subquery with ON expression subject to
--
echo
# semi-join optimizations
--
echo
#
CREATE
TABLE
t1
(
a
INT
);
CREATE
ALGORITHM
=
MERGE
VIEW
v1
AS
SELECT
a
AS
v_a
FROM
t1
;
INSERT
INTO
t1
VALUES
(
1
),(
3
);
CREATE
TABLE
t2
(
b
INT
,
KEY
(
b
));
INSERT
INTO
t2
VALUES
(
3
),(
4
);
SELECT
*
FROM
t1
WHERE
a
NOT
IN
(
SELECT
b
FROM
t2
INNER
JOIN
v1
ON
(
b
IN
(
SELECT
a
FROM
t1
))
WHERE
v_a
=
b
);
DROP
VIEW
v1
;
DROP
TABLE
t1
,
t2
;
mysql-test/t/type_varchar.test
View file @
fa5f29ea
...
...
@@ -217,3 +217,47 @@ CREATE TABLE t1 (a CHAR(16));
INSERT
INTO
t1
VALUES
(
'5'
),
(
's'
),
(
''
);
SELECT
5
=
a
FROM
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
--
echo
#
CREATE
TABLE
t1
(
c1
VARBINARY
(
65532
));
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARBINARY
(
65533
));
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARBINARY
(
65534
));
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARBINARY
(
65535
));
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARBINARY
(
65536
));
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARCHAR
(
65532
));
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARCHAR
(
65533
));
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARCHAR
(
65534
));
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARCHAR
(
65535
));
DESCRIBE
t1
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
VARCHAR
(
65536
));
DESCRIBE
t1
;
DROP
TABLE
t1
;
mysql-test/t/view.test
View file @
fa5f29ea
...
...
@@ -5573,11 +5573,8 @@ drop table t1,t2,t3;
CREATE
TABLE
t3
(
a
INT
);
CREATE
ALGORITHM
=
MERGE
VIEW
v1
AS
SELECT
t2
.
a
FROM
t3
AS
t1
,
t3
AS
t2
;
CREATE
ALGORITHM
=
MERGE
VIEW
v2
AS
SELECT
*
FROM
v1
;
PREPARE
stmt
FROM
'REPLACE INTO v2 SELECT a FROM t3'
;
--
error
ER_VIEW_NO_INSERT_FIELD_LIST
EXECUTE
stmt
;
--
error
ER_VIEW_NO_INSERT_FIELD_LIST
EXECUTE
stmt
;
PREPARE
stmt
FROM
'REPLACE INTO v2 SELECT a FROM t3'
;
drop
view
v1
,
v2
;
drop
table
t3
;
...
...
mysys/my_new.cc
View file @
fa5f29ea
...
...
@@ -47,6 +47,11 @@ void* operator new[](std::size_t sz, const std::nothrow_t&) throw()
return
(
void
*
)
my_malloc
(
sz
?
sz
:
1
,
MYF
(
0
));
}
void
operator
delete
(
void
*
ptr
,
std
::
size_t
)
{
my_free
(
ptr
);
}
void
operator
delete
(
void
*
ptr
)
{
my_free
(
ptr
);
...
...
@@ -57,6 +62,11 @@ void operator delete[] (void *ptr) throw ()
my_free
(
ptr
);
}
void
operator
delete
[]
(
void
*
ptr
,
std
::
size_t
)
throw
()
{
my_free
(
ptr
);
}
void
operator
delete
(
void
*
ptr
,
const
std
::
nothrow_t
&
)
throw
()
{
my_free
(
ptr
);
...
...
plugin/handler_socket/CMakeLists.txt
View file @
fa5f29ea
...
...
@@ -10,6 +10,12 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
STRING
(
REPLACE
"-fno-implicit-templates"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
ENDIF
()
include
(
CheckCXXCompilerFlag
)
check_cxx_compiler_flag
(
" -Wdeprecated-declarations"
HAVE_CXX_WDEPRECATED_DECLARATIONS
)
IF
(
HAVE_CXX_WDEPRECATED_DECLARATIONS
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated-declarations"
)
ENDIF
()
INCLUDE_DIRECTORIES
(
libhsclient
)
# Handlersocket client library. We do not distribute it,
...
...
plugin/server_audit/server_audit.c
View file @
fa5f29ea
...
...
@@ -15,7 +15,7 @@
#define PLUGIN_VERSION 0x104
#define PLUGIN_STR_VERSION "1.4.
1
"
#define PLUGIN_STR_VERSION "1.4.
2
"
#define _my_thread_var loc_thread_var
...
...
@@ -1090,6 +1090,7 @@ static void setup_connection_connect(struct connection_info *cn,
const
struct
mysql_event_connection
*
event
)
{
cn
->
query_id
=
0
;
cn
->
query_length
=
0
;
cn
->
log_always
=
0
;
cn
->
thread_id
=
event
->
thread_id
;
get_str_n
(
cn
->
db
,
&
cn
->
db_length
,
sizeof
(
cn
->
db
),
...
...
@@ -1131,6 +1132,7 @@ static void setup_connection_initdb(struct connection_info *cn,
cn
->
thread_id
=
event
->
general_thread_id
;
cn
->
query_id
=
0
;
cn
->
query_length
=
0
;
cn
->
log_always
=
0
;
get_str_n
(
cn
->
db
,
&
cn
->
db_length
,
sizeof
(
cn
->
db
),
event
->
general_query
,
event
->
general_query_length
);
...
...
@@ -1163,6 +1165,7 @@ static void setup_connection_table(struct connection_info *cn,
cn
->
thread_id
=
event
->
thread_id
;
cn
->
query_id
=
query_counter
++
;
cn
->
log_always
=
0
;
cn
->
query_length
=
0
;
get_str_n
(
cn
->
db
,
&
cn
->
db_length
,
sizeof
(
cn
->
db
),
event
->
database
,
event
->
database_length
);
get_str_n
(
cn
->
user
,
&
cn
->
user_length
,
sizeof
(
cn
->
db
),
...
...
@@ -1184,6 +1187,7 @@ static void setup_connection_query(struct connection_info *cn,
cn
->
thread_id
=
event
->
general_thread_id
;
cn
->
query_id
=
query_counter
++
;
cn
->
log_always
=
0
;
cn
->
query_length
=
0
;
get_str_n
(
cn
->
db
,
&
cn
->
db_length
,
sizeof
(
cn
->
db
),
""
,
0
);
if
(
get_user_host
(
event
->
general_user
,
event
->
general_user_length
,
...
...
@@ -2008,6 +2012,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
event_query_command
(
event
))
{
log_statement
(
cn
,
event
,
"QUERY"
);
cn
->
query_length
=
0
;
/* So the log_current_query() won't log this again. */
}
}
else
if
(
event_class
==
MYSQL_AUDIT_TABLE_CLASS
&&
FILTER
(
EVENT_TABLE
)
&&
cn
)
...
...
@@ -2523,7 +2528,8 @@ static void log_current_query(MYSQL_THD thd)
if
(
!
thd
)
return
;
cn
=
get_loc_info
(
thd
);
if
(
!
ci_needs_setup
(
cn
)
&&
FILTER
(
EVENT_QUERY
)
&&
do_log_user
(
cn
->
user
))
if
(
!
ci_needs_setup
(
cn
)
&&
cn
->
query_length
&&
FILTER
(
EVENT_QUERY
)
&&
do_log_user
(
cn
->
user
))
{
log_statement_ex
(
cn
,
cn
->
query_time
,
thd_get_thread_id
(
thd
),
cn
->
query
,
cn
->
query_length
,
0
,
"QUERY"
);
...
...
scripts/CMakeLists.txt
View file @
fa5f29ea
...
...
@@ -205,6 +205,11 @@ ELSE()
SET
(
localstatedir
${
MYSQL_DATADIR
}
)
ENDIF
()
SET
(
resolveip_locations
"$basedir/
${
INSTALL_BINDIR
}
$basedir/bin"
)
SET
(
mysqld_locations
"$basedir/
${
INSTALL_SBINDIR
}
$basedir/libexec $basedir/sbin $basedir/bin"
)
SET
(
errmsg_locations
"$basedir/
${
INSTALL_MYSQLSHAREDIR
}
/english $basedir/share/english $basedir/share/mysql/english"
)
SET
(
pkgdata_locations
"$basedir/
${
INSTALL_MYSQLSHAREDIR
}
$basedir/share $basedir/share/mysql"
)
IF
(
UNIX
)
CONFIGURE_FILE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/mysql_install_db.sh
${
CMAKE_CURRENT_BINARY_DIR
}
/mysql_install_db ESCAPE_QUOTES @ONLY
)
...
...
Prev
1
2
3
4
5
6
7
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment