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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-20 09:57:37 +02:00
parent 8d6c9ef001 cbb24d9aa5
commit 98dbe3bfaf
142 changed files with 3642 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_acl.cc
View File

@@ -54,6 +54,7 @@
#include "sql_array.h"
#include "sql_hset.h"
#include "password.h"
#include "scope.h"
#include "sql_plugin_compat.h"
#include "wsrep_mysqld.h"
@@ -2574,10 +2575,9 @@ static bool acl_load(THD *thd, const Grant_tables& tables)
{
READ_RECORD read_record_info;
char tmp_name[SAFE_NAME_LEN+1];
Sql_mode_save old_mode_save(thd);
DBUG_ENTER("acl_load");
thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH;
SCOPE_CLEAR(thd->variables.sql_mode, MODE_PAD_CHAR_TO_FULL_LENGTH);
grant_version++; /* Privileges updated */