diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/sp-security.result | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/sp-security.result')
| -rw-r--r-- | mysql-test/main/sp-security.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/sp-security.result b/mysql-test/main/sp-security.result index 4487528210f..de33c11a28f 100644 --- a/mysql-test/main/sp-security.result +++ b/mysql-test/main/sp-security.result @@ -1,3 +1,4 @@ +set @@global.character_set_server=@@session.character_set_server; connect con1root,localhost,root,,; connection con1root; use test; @@ -800,3 +801,4 @@ disconnect u1; connection default; DROP DATABASE u1; DROP USER u1@localhost; +set @@global.character_set_server=@save_character_set_server; |