Skip to content

Commit 855443d

Browse files
ssorumgardssorumgard
committed
Merge branch 'mysql-8.0' into mysql-trunk
2 parents 9376d71 + eb57577 commit 855443d

File tree

2 files changed

+146
-4
lines changed

2 files changed

+146
-4
lines changed

‎mysql-test/std_data/dd/sdi/upgrade/mysql.json

Lines changed: 142 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7193,7 +7193,7 @@
71937193
"se_private_data": "table_id=X",
71947194
"engine_attribute": "",
71957195
"secondary_engine_attribute": "",
7196-
"column_key": 1,
7196+
"column_key": 4,
71977197
"column_type_utf8": "varchar(288)",
71987198
"elements": [],
71997199
"collation_id": X,
@@ -8629,6 +8629,39 @@
86298629
}
86308630
],
86318631
"tablespace_ref": "mysql"
8632+
},
8633+
{
8634+
"name": "definer",
8635+
"hidden": false,
8636+
"is_generated": false,
8637+
"ordinal_position": 6,
8638+
"comment": "",
8639+
"options": "flags=0;",
8640+
"se_private_data": "id=A;root=B;space_id=C;table_id=D;trx_id=E",
8641+
"type": 3,
8642+
"algorithm": 2,
8643+
"is_algorithm_explicit": false,
8644+
"is_visible": true,
8645+
"engine": "InnoDB",
8646+
"engine_attribute": "",
8647+
"secondary_engine_attribute": "",
8648+
"elements": [
8649+
{
8650+
"ordinal_position": 1,
8651+
"length": 864,
8652+
"order": 2,
8653+
"hidden": false,
8654+
"column_opx": 3
8655+
},
8656+
{
8657+
"ordinal_position": 2,
8658+
"length": 4294967295,
8659+
"order": 2,
8660+
"hidden": true,
8661+
"column_opx": 0
8662+
}
8663+
],
8664+
"tablespace_ref": "mysql"
86328665
}
86338666
],
86348667
"foreign_keys": [
@@ -15452,7 +15485,7 @@
1545215485
"se_private_data": "table_id=X",
1545315486
"engine_attribute": "",
1545415487
"secondary_engine_attribute": "",
15455-
"column_key": 1,
15488+
"column_key": 4,
1545615489
"column_type_utf8": "varchar(288)",
1545715490
"elements": [],
1545815491
"collation_id": X,
@@ -16442,6 +16475,39 @@
1644216475
}
1644316476
],
1644416477
"tablespace_ref": "mysql"
16478+
},
16479+
{
16480+
"name": "definer",
16481+
"hidden": false,
16482+
"is_generated": false,
16483+
"ordinal_position": 7,
16484+
"comment": "",
16485+
"options": "flags=0;",
16486+
"se_private_data": "id=A;root=B;space_id=C;table_id=D;trx_id=E",
16487+
"type": 3,
16488+
"algorithm": 2,
16489+
"is_algorithm_explicit": false,
16490+
"is_visible": true,
16491+
"engine": "InnoDB",
16492+
"engine_attribute": "",
16493+
"secondary_engine_attribute": "",
16494+
"elements": [
16495+
{
16496+
"ordinal_position": 1,
16497+
"length": 864,
16498+
"order": 2,
16499+
"hidden": false,
16500+
"column_opx": 19
16501+
},
16502+
{
16503+
"ordinal_position": 2,
16504+
"length": 4294967295,
16505+
"order": 2,
16506+
"hidden": true,
16507+
"column_opx": 0
16508+
}
16509+
],
16510+
"tablespace_ref": "mysql"
1644516511
}
1644616512
],
1644716513
"foreign_keys": [
@@ -22327,6 +22393,46 @@
2232722393
}
2232822394
],
2232922395
"tablespace_ref": "mysql"
22396+
},
22397+
{
22398+
"name": "type_2",
22399+
"hidden": false,
22400+
"is_generated": false,
22401+
"ordinal_position": 10,
22402+
"comment": "",
22403+
"options": "flags=0;",
22404+
"se_private_data": "id=A;root=B;space_id=C;table_id=D;trx_id=E",
22405+
"type": 3,
22406+
"algorithm": 2,
22407+
"is_algorithm_explicit": false,
22408+
"is_visible": true,
22409+
"engine": "InnoDB",
22410+
"engine_attribute": "",
22411+
"secondary_engine_attribute": "",
22412+
"elements": [
22413+
{
22414+
"ordinal_position": 1,
22415+
"length": 1,
22416+
"order": 2,
22417+
"hidden": false,
22418+
"column_opx": 3
22419+
},
22420+
{
22421+
"ordinal_position": 2,
22422+
"length": 864,
22423+
"order": 2,
22424+
"hidden": false,
22425+
"column_opx": 30
22426+
},
22427+
{
22428+
"ordinal_position": 3,
22429+
"length": 4294967295,
22430+
"order": 2,
22431+
"hidden": true,
22432+
"column_opx": 0
22433+
}
22434+
],
22435+
"tablespace_ref": "mysql"
2233022436
}
2233122437
],
2233222438
"foreign_keys": [
@@ -23980,7 +24086,7 @@
2398024086
"se_private_data": "table_id=X",
2398124087
"engine_attribute": "",
2398224088
"secondary_engine_attribute": "",
23983-
"column_key": 1,
24089+
"column_key": 4,
2398424090
"column_type_utf8": "varchar(288)",
2398524091
"elements": [],
2398624092
"collation_id": X,
@@ -24577,6 +24683,39 @@
2457724683
}
2457824684
],
2457924685
"tablespace_ref": "mysql"
24686+
},
24687+
{
24688+
"name": "definer",
24689+
"hidden": false,
24690+
"is_generated": false,
24691+
"ordinal_position": 7,
24692+
"comment": "",
24693+
"options": "flags=0;",
24694+
"se_private_data": "id=A;root=B;space_id=C;table_id=D;trx_id=E",
24695+
"type": 3,
24696+
"algorithm": 2,
24697+
"is_algorithm_explicit": false,
24698+
"is_visible": true,
24699+
"engine": "InnoDB",
24700+
"engine_attribute": "",
24701+
"secondary_engine_attribute": "",
24702+
"elements": [
24703+
{
24704+
"ordinal_position": 1,
24705+
"length": 864,
24706+
"order": 2,
24707+
"hidden": false,
24708+
"column_opx": 12
24709+
},
24710+
{
24711+
"ordinal_position": 2,
24712+
"length": 4294967295,
24713+
"order": 2,
24714+
"hidden": true,
24715+
"column_opx": 0
24716+
}
24717+
],
24718+
"tablespace_ref": "mysql"
2458024719
}
2458124720
],
2458224721
"foreign_keys": [

‎mysql-test/suite/opt_trace/r/security_ps_prot.result

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,8 @@ root@localhost
971971
drop user user1@localhost;
972972
Warnings:
973973
Warning 4005 User 'user1'@'localhost' is referenced as a definer account in a view.
974+
Warning 4005 User 'user1'@'localhost' is referenced as a definer account in a stored routine.
975+
Warning 4005 User 'user1'@'localhost' is referenced as a definer account in a trigger.
974976

975977
# ==========================================================
976978
# Part E.
@@ -984,7 +986,8 @@ drop view v1;
984986
create sql security definer view v1 as select * from t1 where 'secret';
985987
create user user1@localhost identified by '';
986988
Warnings:
987-
Warning 4005 User 'user1'@'localhost' is referenced as a definer account in a procedure.
989+
Warning 4005 User 'user1'@'localhost' is referenced as a definer account in a stored routine.
990+
Warning 4005 User 'user1'@'localhost' is referenced as a definer account in a trigger.
988991
grant create, insert, select on somedb.* to user1@localhost;
989992
grant create routine on somedb.* to user1@localhost;
990993

0 commit comments

Comments
 (0)