mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7
Fixed conflicts in: - binlog.binlog_unsafe - rpl.rpl_slow_query_log
This commit is contained in:
@@ -7427,6 +7427,9 @@ void get_default_definer(THD *thd, LEX_USER *definer)
|
||||
|
||||
definer->host.str= (char *) sctx->priv_host;
|
||||
definer->host.length= strlen(definer->host.str);
|
||||
|
||||
definer->password.str= NULL;
|
||||
definer->password.length= 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -7478,6 +7481,8 @@ LEX_USER *create_definer(THD *thd, LEX_STRING *user_name, LEX_STRING *host_name)
|
||||
|
||||
definer->user= *user_name;
|
||||
definer->host= *host_name;
|
||||
definer->password.str= NULL;
|
||||
definer->password.length= 0;
|
||||
|
||||
return definer;
|
||||
}
|
||||
|
Reference in New Issue
Block a user