mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor authentification optimisation

Browse source 
sql/sql_parse.cc:
  authentification fix: one constructor and two
  variables optimised
This commit is contained in:
unknown 2003-09-16 02:39:25 +04:00
parent d5877319af
commit 12887c2f6c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sql/sql_parse.cc
View file

@ -800,11 +800,10 @@ check_connection(THD *thd)
/* Since 4.1 all database names are stored in utf8 */
if (db)
{
uint32 length= copy_and_convert(db_buff, sizeof(db_buff)-1,
system_charset_info,
db, strlen(db),
thd->charset());
db_buff[length]= 0;
db_buff[copy_and_convert(db_buff, sizeof(db_buff)-1,
system_charset_info,
db, strlen(db),
thd->charset())]= 0;
db= db_buff;
}
@ -1191,6 +1190,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
password. New clients send the size (1 byte) + string (not null
terminated, so also '\0' for empty string).
*/
char db_buff[NAME_LEN+1]; // buffer to store db in utf8
char *db= passwd;
uint passwd_len= thd->client_capabilities & CLIENT_SECURE_CONNECTION ?
*passwd++ : strlen(passwd);
@ -1203,10 +1203,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
}
/* Convert database name to utf8 */
String convdb;
convdb.copy(db, strlen(db), thd->variables.character_set_client,
system_charset_info);
db= convdb.c_ptr();
db_buff[copy_and_convert(db_buff, sizeof(db_buff)-1,
system_charset_info, db, strlen(db),
thd->charset())]= 0;
db= db_buff;
/* Save user and privileges */
uint save_master_access= thd->master_access;