database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-01-05 22:52:06 +02:00
parent 6feb74c4b2 6d49ef49e5
commit fa7d85bb87
73 changed files with 2051 additions and 5588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_acl.cc
View File

@ -8599,7 +8599,7 @@ bool mysql_show_create_user(THD *thd, LEX_USER *lex_user)
hostname, NullS) - buff);
Item_string *field = new (thd->mem_root) Item_string_ascii(thd, "", 0);
if (!field)
DBUG_RETURN(true);
DBUG_RETURN(true); // Error given my my_alloc()
field->name.str= buff;
field->name.length= head_length;