database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with 4.1

Browse Source
This commit is contained in:
monty@mysql.com
2004-12-06 11:38:56 +02:00
parent 86508ad969 dededf09fa
commit 0de4777187
107 changed files with 24790 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_acl.cc
View File

@ -1313,7 +1313,7 @@ bool change_password(THD *thd, const char *host, const char *user,
acl_user->host.hostname ? acl_user->host.hostname : "",
new_password));
thd->clear_error();
Query_log_event qinfo(thd, buff, query_length, 0);
Query_log_event qinfo(thd, buff, query_length, 0, FALSE);
mysql_bin_log.write(&qinfo);
DBUG_RETURN(0);
}
@ -2153,7 +2153,7 @@ static int replace_column_table(GRANT_TABLE *g_t,
{
table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
if (table->file->index_read(table->record[0], (byte*) table->field[0]->ptr,
table->key_info[0].key_length,
key_length,
HA_READ_KEY_EXACT))
goto end;