diff options
author | monty@mysql.com <> | 2004-03-12 15:56:28 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2004-03-12 15:56:28 +0200 |
commit | e9e9ce659e24377e9f14780381672846b0aab864 (patch) | |
tree | d9e1ef0e0d0db5a3231370d8bc23b268dedd6529 /sql/sql_db.cc | |
parent | 158770e35656d0bd7e3576d15d9c2e27ac7baba2 (diff) | |
download | mariadb-git-e9e9ce659e24377e9f14780381672846b0aab864.tar.gz |
Fixes to newly pushed code
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r-- | sql/sql_db.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index b5339f0d535..1217a909071 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -381,13 +381,13 @@ bool mysql_change_db(THD *thd,const char *name) ulong db_access; DBUG_ENTER("mysql_change_db"); - if (!dbname || !(db_length= strlength(dbname))) + if (!dbname || !(db_length= strlen(dbname))) { x_free(dbname); /* purecov: inspected */ send_error(&thd->net,ER_NO_DB_ERROR); /* purecov: inspected */ DBUG_RETURN(1); /* purecov: inspected */ } - if ((db_length > NAME_LEN) || check_db_name(dbname)) + if (check_db_name(dbname)) { net_printf(&thd->net,ER_WRONG_DB_NAME, dbname); x_free(dbname); |