diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 17:35:29 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 17:35:29 +0300 |
| commit | 5a92ccbaea1bb3973e23846a741f5694a1e687bd (patch) | |
| tree | aafc504552502b48b79cadcb06b2b5c7eba4f374 /sql/sql_yacc_ora.yy | |
| parent | c997af7d1f432dfca922958453f0e2313287f1eb (diff) | |
| parent | c016ea660ede8b7ff75f8ca65f73e2958262263a (diff) | |
| download | mariadb-git-5a92ccbaea1bb3973e23846a741f5694a1e687bd.tar.gz | |
Merge 10.3 into 10.4
Disable MDEV-20576 assertions until MDEV-20595 has been fixed.
Diffstat (limited to 'sql/sql_yacc_ora.yy')
| -rw-r--r-- | sql/sql_yacc_ora.yy | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index 67bcfbaa616..dad1960257c 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -2850,8 +2850,6 @@ server_option: { MYSQL_YYABORT_UNLESS(Lex->server_options.host.str == 0); Lex->server_options.host= $2; - my_casedn_str(system_charset_info, - (char*) Lex->server_options.host.str); } | DATABASE TEXT_STRING_sys { |