diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-31 04:47:25 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-31 04:47:25 +0200 |
| commit | 495231ea25a82d97e69e96ff9e5d7688434cfff2 (patch) | |
| tree | 851a8ba92ed9883efe2504e0726aae6843c317c0 /sql/sql_db.cc | |
| parent | bf1f8fd3eb4b98dadd265f8ed10d92220dabe1bb (diff) | |
| download | mariadb-git-495231ea25a82d97e69e96ff9e5d7688434cfff2.tar.gz | |
New myisamchk option --sort-recover
Allow delete of crashed MyISAM tables
Fixed bug when BLOB was first part of key
Fixed bug when using result from CASE in GROUP BY
Fixed core-dump bug in monthname()
Optimized calling of check_db_name()
Docs/manual.texi:
Added more information about myisamchk
client/mysqladmin.c:
Added error message for CREATE database and fixed possible overflow bug
include/myisam.h:
New myisamchk option --sort-recover
libmysql/libmysql.c:
Removed commented code
Don't define getpwuid (breaks on SCO 3.2)
myisam/mi_check.c:
Fixed (new) bug when using --recover --optimize
myisam/mi_delete_table.c:
Allow delete of crashed tables
myisam/mi_key.c:
Fixed bug when BLOB was first part of key
myisam/myisamchk.c:
New myisamchk option --sort-recover
mysql-test/r/case.result:
New test cases to check for reported bugs
mysql-test/r/func_time.result:
New test cases to check for reported bugs
mysql-test/r/type_blob.result:
New test cases to check for reported bugs
mysql-test/r/type_datetime.result:
New test cases to check for reported bugs
mysql-test/t/case.test:
New test cases to check for reported bugs
mysql-test/t/func_time.test:
New test cases to check for reported bugs
mysql-test/t/type_blob.test:
New test cases to check for reported bugs
mysql-test/t/type_datetime.test:
New test cases to check for reported bugs
mysys/my_bitmap.c:
Optimize
sql-bench/limits/ms-sql.cfg:
Updated limits
sql/item_cmpfunc.cc:
Fixed bug when using result from CASE in GROUP BY
sql/item_cmpfunc.h:
Fixed bug when using result from CASE in GROUP BY
sql/item_timefunc.cc:
Fixed core-dump bug in monthname()
sql/sql_db.cc:
Optimized calling of check_db_name()
sql/sql_parse.cc:
Optimized calling of check_db_name()
sql/table.cc:
Fixed typo
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 25bbe75e944..3786e771ecb 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -28,6 +28,8 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *path, uint level); +/* db-name is already validated when we come here */ + void mysql_create_db(THD *thd, char *db, uint create_options) { char path[FN_REFLEN+16]; @@ -35,11 +37,6 @@ void mysql_create_db(THD *thd, char *db, uint create_options) long result=1; DBUG_ENTER("mysql_create_db"); - if (!stripp_sp(db) || check_db_name(db)) - { - net_printf(&thd->net,ER_WRONG_DB_NAME, db); - DBUG_VOID_RETURN; - } VOID(pthread_mutex_lock(&LOCK_mysql_create_db)); /* Check directory */ @@ -96,6 +93,8 @@ static TYPELIB deletable_extentions= {array_elements(del_exts)-1,"del_exts", del_exts}; +/* db-name is already validated when we come here */ + void mysql_rm_db(THD *thd,char *db,bool if_exists) { long deleted=0; @@ -103,12 +102,6 @@ void mysql_rm_db(THD *thd,char *db,bool if_exists) MY_DIR *dirp; DBUG_ENTER("mysql_rm_db"); - if (!stripp_sp(db) || check_db_name(db)) - { - net_printf(&thd->net,ER_WRONG_DB_NAME, db); - DBUG_VOID_RETURN; - } - VOID(pthread_mutex_lock(&LOCK_mysql_create_db)); VOID(pthread_mutex_lock(&LOCK_open)); |