database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source 
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
This commit is contained in:
Sergei Golubchik
2015-09-03 12:58:41 +02:00
parent 5088cbf4ed 4b41e3c7f3
commit 530a6e7481
361 changed files with 9490 additions and 4591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/create_drop_binlog.result
View File

@@ -187,11 +187,11 @@ DROP ROLE r1;
CREATE ROLE IF NOT EXISTS r1;
CREATE ROLE IF NOT EXISTS r1;
Warnings:
Note 1974 Can't create role 'r1'; it already exists
Note 1975 Can't create role 'r1'; it already exists
DROP ROLE IF EXISTS r1;
DROP ROLE IF EXISTS r1;
Warnings:
Note 1975 Can't drop role 'r1'; it doesn't exist
Note 1976 Can't drop role 'r1'; it doesn't exist
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
# # Format_desc 1 # VER
@@ -218,11 +218,11 @@ DROP USER u1@localhost;
CREATE USER IF NOT EXISTS u1@localhost;
CREATE USER IF NOT EXISTS u1@localhost;
Warnings:
Note 1972 Can't create user 'u1'@'localhost'; it already exists
Note 1973 Can't create user 'u1'@'localhost'; it already exists
DROP USER IF EXISTS u1@localhost;
DROP USER IF EXISTS u1@localhost;
Warnings:
Note 1973 Can't drop user 'u1'@'localhost'; it doesn't exist
Note 1974 Can't drop user 'u1'@'localhost'; it doesn't exist
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
# # Format_desc 1 # VER