Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
ccb0504f
Commit
ccb0504f
authored
Jun 09, 2021
by
Dmitry Shulga
Committed by
Sergei Golubchik
Jun 17, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-16708: fix in test failures caused by missing warnings received in prepare response packet
parent
b126c3f3
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
34 additions
and
6 deletions
+34
-6
mysql-test/suite/compat/oracle/r/sp-package.result
mysql-test/suite/compat/oracle/r/sp-package.result
+0
-2
mysql-test/suite/compat/oracle/t/parser.test
mysql-test/suite/compat/oracle/t/parser.test
+2
-2
mysql-test/suite/compat/oracle/t/sp-package.test
mysql-test/suite/compat/oracle/t/sp-package.test
+2
-2
mysql-test/suite/funcs_1/t/is_columns_memory.test
mysql-test/suite/funcs_1/t/is_columns_memory.test
+4
-0
mysql-test/suite/funcs_1/t/is_columns_myisam.test
mysql-test/suite/funcs_1/t/is_columns_myisam.test
+4
-0
mysql-test/suite/funcs_1/t/storedproc.test
mysql-test/suite/funcs_1/t/storedproc.test
+2
-0
mysql-test/suite/innodb/t/innodb_bug51920.test
mysql-test/suite/innodb/t/innodb_bug51920.test
+2
-0
mysql-test/suite/perfschema/t/ortho_iter.test
mysql-test/suite/perfschema/t/ortho_iter.test
+4
-0
mysql-test/suite/perfschema/t/rpl_threads.test
mysql-test/suite/perfschema/t/rpl_threads.test
+6
-0
mysql-test/suite/versioning/t/load_data.test
mysql-test/suite/versioning/t/load_data.test
+2
-0
mysql-test/suite/versioning/t/sysvars.test
mysql-test/suite/versioning/t/sysvars.test
+6
-0
No files found.
mysql-test/suite/compat/oracle/r/sp-package.result
View file @
ccb0504f
...
@@ -34,7 +34,6 @@ ERROR HY000: Incorrect usage of OR REPLACE and IF NOT EXISTS
...
@@ -34,7 +34,6 @@ ERROR HY000: Incorrect usage of OR REPLACE and IF NOT EXISTS
# PACKAGE and PS
# PACKAGE and PS
#
#
PREPARE stmt FROM 'CREATE PACKAGE test2 AS FUNCTION f1 RETURN INT; END test2';
PREPARE stmt FROM 'CREATE PACKAGE test2 AS FUNCTION f1 RETURN INT; END test2';
ERROR HY000: This command is not supported in the prepared statement protocol yet
CREATE PACKAGE test2 AS
CREATE PACKAGE test2 AS
FUNCTION f1 RETURN INT;
FUNCTION f1 RETURN INT;
END;
END;
...
@@ -42,7 +41,6 @@ $$
...
@@ -42,7 +41,6 @@ $$
PREPARE stmt FROM 'CREATE PACKAGE BODY test2 AS'
PREPARE stmt FROM 'CREATE PACKAGE BODY test2 AS'
' FUNCTION f1 RETURN INT AS BEGIN RETURN 10; END;'
' FUNCTION f1 RETURN INT AS BEGIN RETURN 10; END;'
'END test2';
'END test2';
ERROR HY000: This command is not supported in the prepared statement protocol yet
DROP PACKAGE test2;
DROP PACKAGE test2;
#
#
# Package and READ ONLY transactions
# Package and READ ONLY transactions
...
...
mysql-test/suite/compat/oracle/t/parser.test
View file @
ccb0504f
...
@@ -247,6 +247,7 @@ CALL comment();
...
@@ -247,6 +247,7 @@ CALL comment();
CALL
comment
;
CALL
comment
;
DROP
PROCEDURE
comment
;
DROP
PROCEDURE
comment
;
enable_prepare_warnings
;
DELIMITER
/
;
DELIMITER
/
;
CREATE
FUNCTION
comment
RETURN
INT
COMMENT
'test'
AS
CREATE
FUNCTION
comment
RETURN
INT
COMMENT
'test'
AS
BEGIN
BEGIN
...
@@ -254,7 +255,6 @@ BEGIN
...
@@ -254,7 +255,6 @@ BEGIN
END
;
END
;
/
/
DELIMITER
;
/
DELIMITER
;
/
enable_prepare_warnings
;
SELECT
test
.
comment
()
FROM
DUAL
;
SELECT
test
.
comment
()
FROM
DUAL
;
disable_prepare_warnings
;
disable_prepare_warnings
;
DROP
FUNCTION
comment
;
DROP
FUNCTION
comment
;
...
@@ -570,8 +570,8 @@ call p1(1,2);
...
@@ -570,8 +570,8 @@ call p1(1,2);
drop
procedure
p1
;
drop
procedure
p1
;
delimiter
//;
set
sql_mode
=
ORACLE
;
set
sql_mode
=
ORACLE
;
delimiter
//;
create
or
replace
procedure
p1
(
id
int
,
dt
int
)
as
create
or
replace
procedure
p1
(
id
int
,
dt
int
)
as
begin
begin
while
(
1
)
while
(
1
)
...
...
mysql-test/suite/compat/oracle/t/sp-package.test
View file @
ccb0504f
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
SET
sql_mode
=
ORACLE
;
SET
sql_mode
=
ORACLE
;
--
enable_prepare_warnings
--
echo
#
--
echo
#
--
echo
# Creating a body of a non-existing package
--
echo
# Creating a body of a non-existing package
...
@@ -49,7 +50,6 @@ DELIMITER ;$$
...
@@ -49,7 +50,6 @@ DELIMITER ;$$
--
echo
# PACKAGE and PS
--
echo
# PACKAGE and PS
--
echo
#
--
echo
#
--
error
ER_UNSUPPORTED_PS
PREPARE
stmt
FROM
'CREATE PACKAGE test2 AS FUNCTION f1 RETURN INT; END test2'
;
PREPARE
stmt
FROM
'CREATE PACKAGE test2 AS FUNCTION f1 RETURN INT; END test2'
;
DELIMITER
$$
;
DELIMITER
$$
;
...
@@ -58,7 +58,6 @@ CREATE PACKAGE test2 AS
...
@@ -58,7 +58,6 @@ CREATE PACKAGE test2 AS
END
;
END
;
$$
$$
DELIMITER
;
$$
DELIMITER
;
$$
--
error
ER_UNSUPPORTED_PS
PREPARE
stmt
FROM
'CREATE PACKAGE BODY test2 AS'
PREPARE
stmt
FROM
'CREATE PACKAGE BODY test2 AS'
' FUNCTION f1 RETURN INT AS BEGIN RETURN 10; END;'
' FUNCTION f1 RETURN INT AS BEGIN RETURN 10; END;'
'END test2'
;
'END test2'
;
...
@@ -2689,3 +2688,4 @@ DELIMITER ;$$
...
@@ -2689,3 +2688,4 @@ DELIMITER ;$$
CALL xyz.xyz123(17,18,@R);
CALL xyz.xyz123(17,18,@R);
DROP PACKAGE xyz;
DROP PACKAGE xyz;
DROP TABLE t1;
DROP TABLE t1;
--disable_prepare_warnings
mysql-test/suite/funcs_1/t/is_columns_memory.test
View file @
ccb0504f
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
default_charset
.
inc
--
source
include
/
default_charset
.
inc
--
enable_prepare_warnings
let
$engine_type
=
MEMORY
;
let
$engine_type
=
MEMORY
;
SET
@@
session
.
sql_mode
=
'NO_ENGINE_SUBSTITUTION'
;
SET
@@
session
.
sql_mode
=
'NO_ENGINE_SUBSTITUTION'
;
--
source
suite
/
funcs_1
/
datadict
/
datadict_load
.
inc
--
source
suite
/
funcs_1
/
datadict
/
datadict_load
.
inc
...
@@ -23,4 +25,6 @@ SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
...
@@ -23,4 +25,6 @@ SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
let
$my_where
=
WHERE
table_schema
LIKE
'test%'
;
let
$my_where
=
WHERE
table_schema
LIKE
'test%'
;
--
source
suite
/
funcs_1
/
datadict
/
columns
.
inc
--
source
suite
/
funcs_1
/
datadict
/
columns
.
inc
--
disable_prepare_warnings
--
source
suite
/
funcs_1
/
include
/
cleanup
.
inc
--
source
suite
/
funcs_1
/
include
/
cleanup
.
inc
mysql-test/suite/funcs_1/t/is_columns_myisam.test
View file @
ccb0504f
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
default_charset
.
inc
--
source
include
/
default_charset
.
inc
--
enable_prepare_warnings
let
$engine_type
=
MyISAM
;
let
$engine_type
=
MyISAM
;
SET
@@
session
.
sql_mode
=
'NO_ENGINE_SUBSTITUTION'
;
SET
@@
session
.
sql_mode
=
'NO_ENGINE_SUBSTITUTION'
;
--
source
suite
/
funcs_1
/
datadict
/
datadict_load
.
inc
--
source
suite
/
funcs_1
/
datadict
/
datadict_load
.
inc
...
@@ -23,4 +25,6 @@ SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
...
@@ -23,4 +25,6 @@ SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
let
$my_where
=
WHERE
table_schema
LIKE
'test%'
;
let
$my_where
=
WHERE
table_schema
LIKE
'test%'
;
--
source
suite
/
funcs_1
/
datadict
/
columns
.
inc
--
source
suite
/
funcs_1
/
datadict
/
columns
.
inc
--
disable_prepare_warnings
--
source
suite
/
funcs_1
/
include
/
cleanup
.
inc
--
source
suite
/
funcs_1
/
include
/
cleanup
.
inc
mysql-test/suite/funcs_1/t/storedproc.test
View file @
ccb0504f
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
#
#
############################################################################
############################################################################
--
disable_ps_protocol
--
source
include
/
default_charset
.
inc
--
source
include
/
default_charset
.
inc
set
sql_mode
=
""
;
set
sql_mode
=
""
;
...
@@ -29547,3 +29548,4 @@ DROP TABLE IF EXISTS res_t1;
...
@@ -29547,3 +29548,4 @@ DROP TABLE IF EXISTS res_t1;
let
$message
=
.
+++
END
OF
SCRIPT
+++
;
let
$message
=
.
+++
END
OF
SCRIPT
+++
;
--
source
include
/
show_msg80
.
inc
--
source
include
/
show_msg80
.
inc
# ==============================================================================
# ==============================================================================
--
enable_ps_protocol
mysql-test/suite/innodb/t/innodb_bug51920.test
View file @
ccb0504f
...
@@ -22,9 +22,11 @@ let $wait_condition =
...
@@ -22,9 +22,11 @@ let $wait_condition =
WHERE
INFO
=
"UPDATE bug51920 SET i=2"
;
WHERE
INFO
=
"UPDATE bug51920 SET i=2"
;
--
source
include
/
wait_condition
.
inc
--
source
include
/
wait_condition
.
inc
--
enable_prepare_warnings
SELECT
ID
FROM
INFORMATION_SCHEMA
.
PROCESSLIST
SELECT
ID
FROM
INFORMATION_SCHEMA
.
PROCESSLIST
WHERE
INFO
=
"UPDATE bug51920 SET i=2"
WHERE
INFO
=
"UPDATE bug51920 SET i=2"
INTO
@
thread_id
;
INTO
@
thread_id
;
--
disable_prepare_warnings
KILL
@
thread_id
;
KILL
@
thread_id
;
let
$wait_condition
=
let
$wait_condition
=
...
...
mysql-test/suite/perfschema/t/ortho_iter.test
View file @
ccb0504f
...
@@ -25,6 +25,8 @@ flush status;
...
@@ -25,6 +25,8 @@ flush status;
# (select event_name from
# (select event_name from
# performance_schema.memory_summary_by_account_by_event_name));
# performance_schema.memory_summary_by_account_by_event_name));
--
enable_prepare_warnings
delimiter
$
;
delimiter
$
;
create
procedure
check_instrument
(
in
instr_name
varchar
(
128
))
create
procedure
check_instrument
(
in
instr_name
varchar
(
128
))
begin
begin
...
@@ -274,6 +276,8 @@ end
...
@@ -274,6 +276,8 @@ end
$
$
delimiter
;
$
delimiter
;
$
--
disable_prepare_warnings
# Check the configuration is ok
# Check the configuration is ok
show
global
variables
like
"performance_schema%"
;
show
global
variables
like
"performance_schema%"
;
...
...
mysql-test/suite/perfschema/t/rpl_threads.test
View file @
ccb0504f
...
@@ -29,9 +29,11 @@ connection master;
...
@@ -29,9 +29,11 @@ connection master;
# Read the ID of the binlog dump connection,
# Read the ID of the binlog dump connection,
# as exposed in PROCESSLIST.
# as exposed in PROCESSLIST.
--
enable_prepare_warnings
select
ID
from
INFORMATION_SCHEMA
.
PROCESSLIST
select
ID
from
INFORMATION_SCHEMA
.
PROCESSLIST
where
COMMAND
=
"Binlog Dump"
where
COMMAND
=
"Binlog Dump"
into
@
master_dump_pid
;
into
@
master_dump_pid
;
--
disable_prepare_warnings
select
COMMAND
,
STATE
select
COMMAND
,
STATE
from
INFORMATION_SCHEMA
.
PROCESSLIST
from
INFORMATION_SCHEMA
.
PROCESSLIST
...
@@ -47,9 +49,11 @@ sync_slave_with_master;
...
@@ -47,9 +49,11 @@ sync_slave_with_master;
# Read the ID of the SLAVE IO thread,
# Read the ID of the SLAVE IO thread,
# as exposed in PROCESSLIST.
# as exposed in PROCESSLIST.
--
enable_prepare_warnings
select
ID
from
INFORMATION_SCHEMA
.
PROCESSLIST
select
ID
from
INFORMATION_SCHEMA
.
PROCESSLIST
where
STATE
like
"Waiting for master to send event%"
where
STATE
like
"Waiting for master to send event%"
into
@
slave_io_pid
;
into
@
slave_io_pid
;
--
disable_prepare_warnings
select
COMMAND
,
STATE
select
COMMAND
,
STATE
from
INFORMATION_SCHEMA
.
PROCESSLIST
from
INFORMATION_SCHEMA
.
PROCESSLIST
...
@@ -62,9 +66,11 @@ select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
...
@@ -62,9 +66,11 @@ select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
# Read the ID of the SLAVE SQL thread,
# Read the ID of the SLAVE SQL thread,
# as exposed in PROCESSLIST.
# as exposed in PROCESSLIST.
--
enable_prepare_warnings
select
ID
from
INFORMATION_SCHEMA
.
PROCESSLIST
select
ID
from
INFORMATION_SCHEMA
.
PROCESSLIST
where
STATE
like
"Slave has read all relay log%"
where
STATE
like
"Slave has read all relay log%"
into
@
slave_sql_pid
;
into
@
slave_sql_pid
;
--
disable_prepare_warnings
select
COMMAND
,
STATE
select
COMMAND
,
STATE
from
INFORMATION_SCHEMA
.
PROCESSLIST
from
INFORMATION_SCHEMA
.
PROCESSLIST
...
...
mysql-test/suite/versioning/t/load_data.test
View file @
ccb0504f
...
@@ -4,7 +4,9 @@
...
@@ -4,7 +4,9 @@
CREATE
TABLE
t1
(
a
INT
,
b
INT
,
c
INT
,
vc
INT
AS
(
c
),
UNIQUE
(
a
),
UNIQUE
(
b
))
WITH
SYSTEM
VERSIONING
;
CREATE
TABLE
t1
(
a
INT
,
b
INT
,
c
INT
,
vc
INT
AS
(
c
),
UNIQUE
(
a
),
UNIQUE
(
b
))
WITH
SYSTEM
VERSIONING
;
INSERT
IGNORE
INTO
t1
(
a
,
b
,
c
)
VALUES
(
1
,
2
,
3
);
INSERT
IGNORE
INTO
t1
(
a
,
b
,
c
)
VALUES
(
1
,
2
,
3
);
--
enable_prepare_warnings
SELECT
a
,
b
,
c
FROM
t1
INTO
OUTFILE
'15330.data'
;
SELECT
a
,
b
,
c
FROM
t1
INTO
OUTFILE
'15330.data'
;
--
disable_prepare_warnings
LOAD
DATA
INFILE
'15330.data'
IGNORE
INTO
TABLE
t1
(
a
,
b
,
c
);
LOAD
DATA
INFILE
'15330.data'
IGNORE
INTO
TABLE
t1
(
a
,
b
,
c
);
LOAD
DATA
INFILE
'15330.data'
REPLACE
INTO
TABLE
t1
(
a
,
b
,
c
);
LOAD
DATA
INFILE
'15330.data'
REPLACE
INTO
TABLE
t1
(
a
,
b
,
c
);
...
...
mysql-test/suite/versioning/t/sysvars.test
View file @
ccb0504f
...
@@ -57,7 +57,9 @@ show global variables like 'system_versioning_asof';
...
@@ -57,7 +57,9 @@ show global variables like 'system_versioning_asof';
set
global
system_versioning_asof
=
'1900-01-01 00:00:00'
;
set
global
system_versioning_asof
=
'1900-01-01 00:00:00'
;
show
global
variables
like
'system_versioning_asof'
;
show
global
variables
like
'system_versioning_asof'
;
--
enable_prepare_warnings
set
global
system_versioning_asof
=
timestamp
'1911-11-11 11:11:11.1111119'
;
set
global
system_versioning_asof
=
timestamp
'1911-11-11 11:11:11.1111119'
;
--
disable_prepare_warnings
show
global
variables
like
'system_versioning_asof'
;
show
global
variables
like
'system_versioning_asof'
;
set
@
ts
=
timestamp
'1900-01-01 00:00:00'
;
set
@
ts
=
timestamp
'1900-01-01 00:00:00'
;
...
@@ -74,7 +76,9 @@ show variables like 'system_versioning_asof';
...
@@ -74,7 +76,9 @@ show variables like 'system_versioning_asof';
set
system_versioning_asof
=
'1900-01-01 00:00:00'
;
set
system_versioning_asof
=
'1900-01-01 00:00:00'
;
show
variables
like
'system_versioning_asof'
;
show
variables
like
'system_versioning_asof'
;
--
enable_prepare_warnings
set
system_versioning_asof
=
timestamp
'1911-11-11 11:11:11.1111119'
;
set
system_versioning_asof
=
timestamp
'1911-11-11 11:11:11.1111119'
;
--
disable_prepare_warnings
show
variables
like
'system_versioning_asof'
;
show
variables
like
'system_versioning_asof'
;
set
@
ts
=
timestamp
'1900-01-01 00:00:00'
;
set
@
ts
=
timestamp
'1900-01-01 00:00:00'
;
...
@@ -134,7 +138,9 @@ drop tables t1, t2;
...
@@ -134,7 +138,9 @@ drop tables t1, t2;
--
echo
#
--
echo
#
SET
sql_mode
=
TIME_ROUND_FRACTIONAL
;
SET
sql_mode
=
TIME_ROUND_FRACTIONAL
;
--
enable_prepare_warnings
SET
@@
global
.
system_versioning_asof
=
timestamp
'2001-12-31 23:59:59.9999999'
;
SET
@@
global
.
system_versioning_asof
=
timestamp
'2001-12-31 23:59:59.9999999'
;
--
disable_prepare_warnings
SELECT
@@
global
.
system_versioning_asof
;
SELECT
@@
global
.
system_versioning_asof
;
SET
@@
global
.
system_versioning_asof
=
DEFAULT
;
SET
@@
global
.
system_versioning_asof
=
DEFAULT
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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