mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Fixes after merge with 4.0
mysql-test/r/heap_btree.result: Updated results mysql-test/r/heap_hash.result: Updated results mysql-test/r/merge.result: Updated results mysql-test/r/rpl_log.result: Updated results mysql-test/r/select.result: Updated results mysql-test/r/subselect.result: Updated results sql/item_cmpfunc.h: Fix after merge sql/log_event.cc: Fix after merge sql/mysql_priv.h: Fix after merge sql/sql_acl.cc: Fix after merge sql/sql_class.cc: Fix after merge sql/sql_db.cc: Fix after merge sql/sql_delete.cc: Fix after merge sql/sql_lex.cc: Fix after merge sql/sql_lex.h: Fix after merge sql/sql_parse.cc: Fix after merge sql/sql_update.cc: Fix after merge sql/sql_yacc.yy: Fix after merge
This commit is contained in:
@ -1359,10 +1359,10 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
|
||||
case SSL_TYPE_NOT_SPECIFIED:
|
||||
break;
|
||||
case SSL_TYPE_NONE:
|
||||
table->field[24]->store("",0);
|
||||
table->field[25]->store("",0);
|
||||
table->field[26]->store("",0);
|
||||
table->field[27]->store("",0);
|
||||
table->field[24]->store("", 0, system_charset_info);
|
||||
table->field[25]->store("", 0, system_charset_info);
|
||||
table->field[26]->store("", 0, system_charset_info);
|
||||
table->field[27]->store("", 0, system_charset_info);
|
||||
break;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user