diff options
author | unknown <vva@eagle.mysql.r18.ru> | 2004-03-12 17:56:27 +0400 |
---|---|---|
committer | unknown <vva@eagle.mysql.r18.ru> | 2004-03-12 17:56:27 +0400 |
commit | de448d41c099af652a4ae6d7e3513d4b3999a0d2 (patch) | |
tree | 7c27ab0b2e953bb681a945686244a0704313633d /sql/sql_db.cc | |
parent | f85032f16ec19832d75d0420f9d4d2b1bb01fc75 (diff) | |
parent | 7430fc2e1464159acb16d273cebf4a426e367fd2 (diff) | |
download | mariadb-git-de448d41c099af652a4ae6d7e3513d4b3999a0d2.tar.gz |
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2985/mysql-4.0
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index a88cff0cd9b..b5339f0d535 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -381,7 +381,7 @@ bool mysql_change_db(THD *thd,const char *name) ulong db_access; DBUG_ENTER("mysql_change_db"); - if (!dbname || !(db_length=strip_sp(dbname))) + if (!dbname || !(db_length= strlength(dbname))) { x_free(dbname); /* purecov: inspected */ send_error(&thd->net,ER_NO_DB_ERROR); /* purecov: inspected */ |