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
b4c9c778
Commit
b4c9c778
authored
Sep 14, 2005
by
eric@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/eric/mysql-5.0-fed-err
parents
92e2936f
f3030c34
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
246 additions
and
4 deletions
+246
-4
mysql-test/r/rpl_ddl.result
mysql-test/r/rpl_ddl.result
+182
-0
mysql-test/r/view.result
mysql-test/r/view.result
+3
-3
mysql-test/t/rpl_ddl.test
mysql-test/t/rpl_ddl.test
+52
-1
sql/sql_parse.cc
sql/sql_parse.cc
+9
-0
No files found.
mysql-test/r/rpl_ddl.result
View file @
b4c9c778
...
...
@@ -1072,6 +1072,188 @@ Database (mysqltest3)
mysqltest3
-------- switch to master -------
######## CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1" ########
-------- switch to master -------
INSERT INTO t1 SET f1= 15 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
16
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
15
-------- switch to master -------
CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1";
SELECT MAX(f1) FROM t1;
MAX(f1)
16
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
16
-------- switch to master -------
ROLLBACK;
SELECT MAX(f1) FROM t1;
MAX(f1)
16
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
16
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-------- switch to master -------
flush logs;
-------- switch to slave --------
flush logs;
-------- switch to master -------
SHOW PROCEDURE STATUS LIKE 'p1';
Db mysqltest1
Name p1
Type PROCEDURE
Definer root@localhost
Modified #
Created #
Security_type DEFINER
Comment
-------- switch to slave -------
SHOW PROCEDURE STATUS LIKE 'p1';
Db mysqltest1
Name p1
Type PROCEDURE
Definer @
Modified #
Created #
Security_type DEFINER
Comment
######## ALTER PROCEDURE p1 COMMENT "I have been altered" ########
-------- switch to master -------
INSERT INTO t1 SET f1= 16 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
17
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
16
-------- switch to master -------
ALTER PROCEDURE p1 COMMENT "I have been altered";
SELECT MAX(f1) FROM t1;
MAX(f1)
17
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
17
-------- switch to master -------
ROLLBACK;
SELECT MAX(f1) FROM t1;
MAX(f1)
17
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
17
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-------- switch to master -------
flush logs;
-------- switch to slave --------
flush logs;
-------- switch to master -------
SHOW PROCEDURE STATUS LIKE 'p1';
Db mysqltest1
Name p1
Type PROCEDURE
Definer root@localhost
Modified #
Created #
Security_type DEFINER
Comment I have been altered
-------- switch to slave -------
SHOW PROCEDURE STATUS LIKE 'p1';
Db mysqltest1
Name p1
Type PROCEDURE
Definer @
Modified #
Created #
Security_type DEFINER
Comment I have been altered
######## DROP PROCEDURE p1 ########
-------- switch to master -------
INSERT INTO t1 SET f1= 17 + 1;
SELECT MAX(f1) FROM t1;
MAX(f1)
18
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
17
-------- switch to master -------
DROP PROCEDURE p1;
SELECT MAX(f1) FROM t1;
MAX(f1)
18
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
18
-------- switch to master -------
ROLLBACK;
SELECT MAX(f1) FROM t1;
MAX(f1)
18
TEST-INFO: MASTER: The INSERT is committed (Succeeded)
-------- switch to slave --------
SELECT MAX(f1) FROM t1;
MAX(f1)
18
TEST-INFO: SLAVE: The INSERT is committed (Succeeded)
-------- switch to master -------
flush logs;
-------- switch to slave --------
flush logs;
-------- switch to master -------
SHOW PROCEDURE STATUS LIKE 'p1';
-------- switch to slave -------
SHOW PROCEDURE STATUS LIKE 'p1';
DROP DATABASE IF EXISTS mysqltest1;
DROP DATABASE IF EXISTS mysqltest2;
DROP DATABASE IF EXISTS mysqltest3;
mysql-test/r/view.result
View file @
b4c9c778
...
...
@@ -2210,15 +2210,15 @@ INSERT INTO t1 VALUES ('2005-09-06');
CREATE VIEW v1 AS SELECT DAYNAME(date) FROM t1;
SHOW CREATE VIEW v1;
View Create View
v1 CREATE ALGORITHM=UNDEFINED VIEW `v1` AS select dayname(`t1`.`date`) AS `DAYNAME(date)` from `t1`
v1 CREATE ALGORITHM=UNDEFINED
DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `v1` AS select dayname(`t1`.`date`) AS `DAYNAME(date)` from `t1`
CREATE VIEW v2 AS SELECT DAYOFWEEK(date) FROM t1;
SHOW CREATE VIEW v2;
View Create View
v2 CREATE ALGORITHM=UNDEFINED VIEW `v2` AS select dayofweek(`t1`.`date`) AS `DAYOFWEEK(date)` from `t1`
v2 CREATE ALGORITHM=UNDEFINED
DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `v2` AS select dayofweek(`t1`.`date`) AS `DAYOFWEEK(date)` from `t1`
CREATE VIEW v3 AS SELECT WEEKDAY(date) FROM t1;
SHOW CREATE VIEW v3;
View Create View
v3 CREATE ALGORITHM=UNDEFINED VIEW `v3` AS select weekday(`t1`.`date`) AS `WEEKDAY(date)` from `t1`
v3 CREATE ALGORITHM=UNDEFINED
DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `v3` AS select weekday(`t1`.`date`) AS `WEEKDAY(date)` from `t1`
SELECT DAYNAME('2005-09-06');
DAYNAME('2005-09-06')
Tuesday
...
...
mysql-test/t/rpl_ddl.test
View file @
b4c9c778
...
...
@@ -340,6 +340,57 @@ connection master;
SELECT
'-------- switch to master -------'
as
""
;
--
enable_query_log
# End of 4.1 tests
###############################################################
# Cases with stored procedures
###############################################################
let
$my_stmt
=
CREATE
PROCEDURE
p1
()
READS
SQL
DATA
SELECT
"this is p1"
;
let
$my_master_commit
=
true
;
let
$my_slave_commit
=
true
;
--
source
include
/
rpl_stmt_seq
.
inc
--
vertical_results
--
replace_column
5
# 6 #
SHOW
PROCEDURE
STATUS
LIKE
'p1'
;
--
disable_query_log
SELECT
'-------- switch to slave -------'
as
""
;
--
enable_query_log
connection
slave
;
--
replace_column
5
# 6 #
SHOW
PROCEDURE
STATUS
LIKE
'p1'
;
connection
master
;
--
horizontal_results
let
$my_stmt
=
ALTER
PROCEDURE
p1
COMMENT
"I have been altered"
;
let
$my_master_commit
=
true
;
let
$my_slave_commit
=
true
;
--
source
include
/
rpl_stmt_seq
.
inc
--
vertical_results
--
replace_column
5
# 6 #
SHOW
PROCEDURE
STATUS
LIKE
'p1'
;
--
disable_query_log
SELECT
'-------- switch to slave -------'
as
""
;
--
enable_query_log
connection
slave
;
--
replace_column
5
# 6 #
SHOW
PROCEDURE
STATUS
LIKE
'p1'
;
connection
master
;
--
horizontal_results
let
$my_stmt
=
DROP
PROCEDURE
p1
;
let
$my_master_commit
=
true
;
let
$my_slave_commit
=
true
;
--
source
include
/
rpl_stmt_seq
.
inc
--
vertical_results
SHOW
PROCEDURE
STATUS
LIKE
'p1'
;
--
disable_query_log
SELECT
'-------- switch to slave -------'
as
""
;
--
enable_query_log
connection
slave
;
SHOW
PROCEDURE
STATUS
LIKE
'p1'
;
connection
master
;
--
horizontal_results
###############################################################
# Cleanup
###############################################################
...
...
@@ -349,4 +400,4 @@ DROP DATABASE IF EXISTS mysqltest2;
DROP
DATABASE
IF
EXISTS
mysqltest3
;
--
enable_warnings
# End of 4.1 tests
sql/sql_parse.cc
View file @
b4c9c778
...
...
@@ -4029,6 +4029,9 @@ mysql_execute_command(THD *thd)
goto
error
;
}
if
(
end_active_trans
(
thd
))
goto
error
;
if
(
!
lex
->
sphead
->
m_db
.
str
||
!
lex
->
sphead
->
m_db
.
str
[
0
])
{
lex
->
sphead
->
m_db
.
length
=
strlen
(
thd
->
db
);
...
...
@@ -4283,6 +4286,9 @@ mysql_execute_command(THD *thd)
sp
->
m_name
.
str
,
lex
->
sql_command
==
SQLCOM_ALTER_PROCEDURE
,
0
))
goto
error
;
if
(
end_active_trans
(
thd
))
goto
error
;
memcpy
(
&
lex
->
sp_chistics
,
&
chistics
,
sizeof
(
lex
->
sp_chistics
));
if
(
!
trust_routine_creators
&&
mysql_bin_log
.
is_open
()
&&
!
sp
->
m_chistics
->
detistic
&&
...
...
@@ -4342,6 +4348,9 @@ mysql_execute_command(THD *thd)
if
(
check_routine_access
(
thd
,
ALTER_PROC_ACL
,
db
,
name
,
lex
->
sql_command
==
SQLCOM_DROP_PROCEDURE
,
0
))
goto
error
;
if
(
end_active_trans
(
thd
))
goto
error
;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
if
(
sp_automatic_privileges
&&
!
opt_noacl
&&
sp_revoke_privileges
(
thd
,
db
,
name
,
...
...
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