diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-03 18:41:18 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-03 18:41:18 -0800 |
| commit | 37deed3f37561f264f65e162146bbc2ad35fb1a2 (patch) | |
| tree | c1cfb6c0995bfcc4ac3fb335f518a8b404413e32 /mysql-test/main/grant_4332.result | |
| parent | 658128af43b4d7c6db445164f8ed25ed4d1e3109 (diff) | |
| parent | 5b996782be6b752ce50a0ecaa222b0688aa9e75d (diff) | |
| download | mariadb-git-37deed3f37561f264f65e162146bbc2ad35fb1a2.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev16188
Diffstat (limited to 'mysql-test/main/grant_4332.result')
| -rw-r--r-- | mysql-test/main/grant_4332.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/grant_4332.result b/mysql-test/main/grant_4332.result index b62ca1a20cc..af6b23088f5 100644 --- a/mysql-test/main/grant_4332.result +++ b/mysql-test/main/grant_4332.result @@ -1,5 +1,5 @@ -set GLOBAL sql_mode=""; -set LOCAL sql_mode=""; +set global sql_mode=""; +set local sql_mode=""; alter table mysql.user modify User char(16) binary not null default ''; alter table mysql.db modify User char(16) binary not null default ''; alter table mysql.tables_priv modify User char(16) binary not null default ''; @@ -32,4 +32,4 @@ Catalog Database Table Table_alias Column Column_alias Type Length Max length Is def user() 253 141 14 N 1 39 8 user() root@localhost -set GLOBAL sql_mode=default; +set global sql_mode=default; |