mirror of
https://github.com/MariaDB/server.git
synced 2025-11-12 10:22:39 +03:00
Warning handling and initial prepared statement handling (last not complete yet) Changed a lot of functions that returned 0/1 to my_bool type. GRANT handling now uses read/write locks instead of mutex Change basic net functions to use THD instead of NET (needed for 4.1 protocol) Use my_sprintf instead of sprintf() + strlen() Added alloc_query() to be able to chare query initialization code with prepared statements. Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID() Note that the following test fails (will be fixed ASAP): sub_select, union, rpl_rotate_logs and rpl_mystery22 BitKeeper/deleted/.del-README~3449730baf983117: Delete: mysql-test/t/README BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe: Delete: libmysqld/sql_error.cc BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6: Delete: libmysqld/sql_prepare.cc Docs/manual.texi: Updated variable list client/mysql.cc: Show warning count to user. client/mysqltest.c: Add warnings to test results configure.in: New shared library version number include/errmsg.h: Indentation cleanup include/mysql.h: Removed MYSQL_ERROR Indentaion cleanups include/mysql_com.h: Changed functions to returns true/false to my_bool. include/mysqld_error.h: New error messages isam/pack_isam.c: Indentation change libmysql/Makefile.am: Fix of wrong merge libmysql/Makefile.shared: Indentation cleanup libmysql/errmsg.c: Removed not used errors libmysql/libmysql.c: Change functions to return 1 on error (not -1) Change type of functions that returns 0/1 to my_bool Lot of code optimizations. Lot of changes for prepared statements. This now handles sending of binary data to server. Receving of binary data is not yet done (will have to wait until server code for this is ready) mysql_warning_count and mysql_warnings() implemented. libmysql/libmysql.def: Added mysql_warnings and mysql_warning_count libmysql/manager.c: Fixed wrong testing of result from my_connect() libmysqld/lib_sql.cc: Removed global variable THR_NET Change basic net functions to use THD instead of NET GRANT handling now uses read/write locks instead of mutex libmysqld/libmysqld.c: Changed functions to be my_bool myisam/ft_boolean_search.c: Trivial code cleanup myisam/ft_stopwords.c: Trivial code cleanup myisam/mi_check.c: Update to 4.1 structures myisam/myisampack.c: Trivial code cleanup myisam/rt_key.c: Code cleanup myisam/rt_test.c: Code cleanup Removed compiler warnings myisam/sp_key.c: Indentation changes myisam/sp_test.c: Removed compiler warnings mysql-test/README: Updated to reflect the new --external flag. mysql-test/mysql-test-run.sh: --local (start new server) is now default. Use --external to test against external server. mysql-test/r/rollback.result: Updated for 4.1 warnings mysql-test/r/rpl_log.result: Update for 4.1 mysql-test/t/rollback.test: Updated for 4.1 warnings mysql-test/t/rpl_log_pos.test: Portability fix mysys/hash.c: Indentation change mysys/my_error.c: Indentation change mysys/tree.c: Updated file description sql/field.cc: Fixed bugs introduced by merge Use my_sprintf instead of sprintf() + strlen() sql/field.h: Add CHARSET_INFO to field structure sql/gstream.h: Indentation changes. Added GPL copyright header sql/ha_innodb.cc: Updated parameters for net functions. sql/item.cc: Updates of Item_param Indentation changes sql/item.h: Removed size_of() function from item. sql/item_func.cc: Update function usage for 4.1 Added get_system_var() sql/item_func.h: Indentation change sql/item_strfunc.cc: Removed not needed inclusion of gstream.h Update to use system variables (from 4.0) sql/item_sum.h: Removed size_of() functions from item. sql/item_timefunc.cc: Change sprintf() + strlen() -> my_sprintf() Added length parameter to ->append() sql/item_timefunc.h: Removed size_of() functions from item. sql/item_uniq.h: Removed size_of() functions from item. sql/lex.h: Removed SQL_ERROR_COUNT variable sql/log.cc: Change sprintf() + strlen() -> my_sprintf() sql/log_event.cc: Change sprintf() + strlen() -> my_sprintf() sql/mini_client.cc: Added check that one always specifies a length to mc_mysql_query() sql/mysql_priv.h: New prototypes Change of NET -> THD parameter for net functions. sql/mysqld.cc: New startup options: 'max_prepared_statements', 'max_error_count' Updated usage of net functions. sql/net_pkg.cc: Change basic net functions to use THD instead of NET (needed to be able to handle 4.0 and 4.1 protocols) Lots of function comments sql/net_serv.cc: Change int return values -> my_bool Updated net_write_command() to take an extra header block to be added to the packet. (This made the prepared statement code much nicer and more efficient) sql/repl_failsafe.cc: Update net functions to use THD instead of NET sql/set_var.cc: Added @@error_count and @@warning_count variables. Updated to 4.1 function usage sql/set_var.h: Added @@error_count and @@warning_count variables. sql/share/czech/errmsg.txt: Removed Warning: from warning error messages. sql/share/english/errmsg.txt: Removed Warning: from warning error messages. sql/share/greek/errmsg.txt: Removed Warning: from warning error messages. sql/share/hungarian/errmsg.txt: Removed Warning: from warning error messages. sql/share/japanese/errmsg.txt: Removed Warning: from warning error messages. sql/share/korean/errmsg.txt: Removed Warning: from warning error messages. sql/share/norwegian-ny/errmsg.txt: Removed Warning: from warning error messages. sql/share/norwegian/errmsg.txt: Removed Warning: from warning error messages. sql/share/polish/errmsg.txt: Removed Warning: from warning error messages. sql/share/romanian/errmsg.txt: Removed Warning: from warning error messages. sql/share/slovak/errmsg.txt: Removed Warning: from warning error messages. sql/share/swedish/errmsg.txt: Removed Warning: from warning error messages. sql/slave.cc: Change basic net functions to use THD instead of NET skip_load_data_file recoded to fit new client/server protocol sql/spatial.h: Added copyright header Indentation cleanups sql/sql_acl.cc: Change basic net functions to use THD instead of NET GRANT handling now uses read/write locks instead of mutex sql/sql_analyse.cc: Change basic net functions to use THD instead of NET sprintf() + strlen() -> my_sprintf() sql/sql_base.cc: More DBUG statements sql/sql_class.cc: Change basic net functions to use THD instead of NET warning and prepared statement handling sql/sql_class.h: Change basic net functions to use THD instead of NET warning and prepared statement handling sql/sql_db.cc: Code cleanup & optimization. sql/sql_delete.cc: Change basic net functions to use THD instead of NET sql/sql_derived.cc: Change basic net functions to use THD instead of NET sql/sql_do.cc: Change basic net functions to use THD instead of NET sql/sql_error.cc: Big rewrite of error handling. sql/sql_handler.cc: Change basic net functions to use THD instead of NET sql/sql_insert.cc: Change basic net functions to use THD instead of NET sql/sql_lex.cc: Change basic net functions to use THD instead of NET sql/sql_lex.h: Added param_count to st_select_lex_node sql/sql_list.h: Removed not needed error list. sql/sql_load.cc: Change basic net functions to use THD instead of NET sql/sql_parse.cc: Change basic net functions to use THD instead of NET Added alloc_query() to be able to chare query initialization code with prepared statements. Update of warning handling. Added create_select_for_variable() (for SHOW COUNT(*) WARNINGS) sql/sql_prepare.cc: Initial prepared statement handling sql/sql_rename.cc: Change basic net functions to use THD instead of NET sql/sql_repl.cc: Change basic net functions to use THD instead of NET sql/sql_select.cc: Small code cleanups Added missing initialization of error that caused some queries that returned an empty result set to fail sql/sql_select.h: Ensure that JOIN.error is properly initialized sql/sql_show.cc: Change basic net functions to use THD instead of NET A lot of optimization sql/sql_table.cc: Change basic net functions to use THD instead of NET Indentaion cleanup sql/sql_udf.cc: Change basic net functions to use THD instead of NET sql/sql_union.cc: Change basic net functions to use THD instead of NET sql/sql_update.cc: Change basic net functions to use THD instead of NET sql/sql_yacc.yy: Change basic net functions to use THD instead of NET Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID() sql/structs.h: Moved structures to files where they was used sql/table.cc: Don't accept empty database names sql/uniques.cc: Indentation cleanup sql/unireg.cc: Change basic net functions to use THD instead of NET sql/unireg.h: Added defaults for warnings and prepared statements strings/ctype-simple.c: optimization tests/client_test.c: Fixed wrong paramaters to printf()
678 lines
17 KiB
C++
678 lines
17 KiB
C++
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
/* create and drop of databases */
|
|
|
|
#include "mysql_priv.h"
|
|
#include "sql_acl.h"
|
|
#include <my_dir.h>
|
|
#include <m_ctype.h>
|
|
#ifdef __WIN__
|
|
#include <direct.h>
|
|
#endif
|
|
|
|
#define MY_DB_OPT_FILE "db.opt"
|
|
|
|
const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", NullS};
|
|
static TYPELIB deletable_extentions=
|
|
{array_elements(del_exts)-1,"del_exts", del_exts};
|
|
|
|
const char *known_exts[]=
|
|
{".ISM",".ISD",".ISM",".MRG",".MYI",".MYD",".db",NullS};
|
|
static TYPELIB known_extentions=
|
|
{array_elements(known_exts)-1,"known_exts", known_exts};
|
|
|
|
static long mysql_rm_known_files(THD *thd, MY_DIR *dirp,
|
|
const char *db, const char *path,
|
|
uint level);
|
|
|
|
/*
|
|
Create database options file:
|
|
|
|
DESCRIPTION
|
|
Currently database default charset is only stored there.
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 Could not create file or write to it. Error sent through my_error()
|
|
*/
|
|
|
|
static bool write_db_opt(const char *path, HA_CREATE_INFO *create)
|
|
{
|
|
register File file;
|
|
char buf[256]; // Should be enough for one option
|
|
bool error=1;
|
|
|
|
if ((file=my_create(path, CREATE_MODE,O_RDWR | O_TRUNC,MYF(MY_WME))) >= 0)
|
|
{
|
|
ulong length;
|
|
length= my_sprintf(buf,(buf, "default-character-set=%s\n",
|
|
(create && create->table_charset) ?
|
|
create->table_charset->name : "DEFAULT"));
|
|
|
|
/* Error is written by my_write */
|
|
if (!my_write(file,(byte*) buf, length, MYF(MY_NABP+MY_WME)))
|
|
error=0;
|
|
my_close(file,MYF(0));
|
|
}
|
|
exit:
|
|
return error;
|
|
}
|
|
|
|
|
|
/*
|
|
Load database options file
|
|
|
|
load_db_opt()
|
|
path Path for option file
|
|
create Where to store the read options
|
|
|
|
DESCRIPTION
|
|
For now, only default-character-set is read.
|
|
|
|
RETURN VALUES
|
|
0 File found
|
|
1 No database file or could not open it
|
|
|
|
*/
|
|
|
|
static bool load_db_opt(const char *path, HA_CREATE_INFO *create)
|
|
{
|
|
File file;
|
|
char buf[256];
|
|
DBUG_ENTER("load_db_opt");
|
|
bool error=1;
|
|
uint nbytes;
|
|
|
|
bzero((char*) create,sizeof(*create));
|
|
if ((file=my_open(path, O_RDONLY | O_SHARE, MYF(0))) >= 0)
|
|
{
|
|
IO_CACHE cache;
|
|
init_io_cache(&cache, file, IO_SIZE, READ_CACHE, 0, 0, MYF(0));
|
|
|
|
while ((int) (nbytes= my_b_gets(&cache, (byte*) buf, sizeof(buf))) > 0)
|
|
{
|
|
char *pos= buf+nbytes-1;
|
|
/* Remove end space and control characters */
|
|
while (pos > buf && !my_isgraph(system_charset_info, pos[-1]))
|
|
pos--;
|
|
*pos=0;
|
|
if ((pos= strchr(buf, '=')))
|
|
{
|
|
if (!strncmp(buf,"default-character-set", (pos-buf)))
|
|
{
|
|
if (!(create->table_charset=get_charset_by_name(pos+1, MYF(0))))
|
|
{
|
|
sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),
|
|
pos+1);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
error=0;
|
|
end_io_cache(&cache);
|
|
my_close(file,MYF(0));
|
|
}
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Create a database
|
|
|
|
SYNOPSIS
|
|
mysql_create_db()
|
|
thd Thread handler
|
|
db Name of database to create
|
|
Function assumes that this is already validated.
|
|
create_info Database create options (like character set)
|
|
silent Used by replication when internally creating a database.
|
|
In this case the entry should not be logged.
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
-1 Error
|
|
|
|
*/
|
|
|
|
int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
|
|
bool silent)
|
|
{
|
|
char path[FN_REFLEN+16];
|
|
MY_DIR *dirp;
|
|
long result=1;
|
|
int error = 0;
|
|
uint create_options = create_info ? create_info->options : 0;
|
|
DBUG_ENTER("mysql_create_db");
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
|
|
|
|
// do not create database if another thread is holding read lock
|
|
if (wait_if_global_read_lock(thd,0))
|
|
{
|
|
error= -1;
|
|
goto exit2;
|
|
}
|
|
|
|
/* Check directory */
|
|
(void)sprintf(path,"%s/%s", mysql_data_home, db);
|
|
unpack_dirname(path,path); // Convert if not unix
|
|
if ((dirp = my_dir(path,MYF(MY_DONT_SORT))))
|
|
{
|
|
my_dirend(dirp);
|
|
if (!(create_options & HA_LEX_CREATE_IF_NOT_EXISTS))
|
|
{
|
|
my_error(ER_DB_CREATE_EXISTS,MYF(0),db);
|
|
error = -1;
|
|
goto exit;
|
|
}
|
|
result = 0;
|
|
}
|
|
else
|
|
{
|
|
strend(path)[-1]=0; // Remove last '/' from path
|
|
if (my_mkdir(path,0777,MYF(0)) < 0)
|
|
{
|
|
my_error(ER_CANT_CREATE_DB,MYF(0),db,my_errno);
|
|
error = -1;
|
|
goto exit;
|
|
}
|
|
}
|
|
|
|
unpack_dirname(path, path);
|
|
strcat(path,MY_DB_OPT_FILE);
|
|
if (write_db_opt(path, create_info))
|
|
{
|
|
/*
|
|
Could not create options file.
|
|
Restore things to beginning.
|
|
*/
|
|
if (rmdir(path) >= 0)
|
|
{
|
|
error= -1;
|
|
goto exit;
|
|
}
|
|
/*
|
|
We come here when we managed to create the database, but not the option
|
|
file. In this case it's best to just continue as if nothing has
|
|
happened. (This is a very unlikely senario)
|
|
*/
|
|
}
|
|
|
|
if (!silent)
|
|
{
|
|
char *query;
|
|
uint query_length;
|
|
|
|
if (!thd->query) // Only in replication
|
|
{
|
|
query= path;
|
|
query_length= (uint) (strxmov(path,"create database ", db, NullS) -
|
|
path);
|
|
}
|
|
else
|
|
{
|
|
query= thd->query;
|
|
query_length= thd->query_length;
|
|
}
|
|
mysql_update_log.write(thd, query, query_length);
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
Query_log_event qinfo(thd, query, query_length);
|
|
mysql_bin_log.write(&qinfo);
|
|
}
|
|
send_ok(thd, result);
|
|
}
|
|
|
|
exit:
|
|
start_waiting_global_read_lock(thd);
|
|
exit2:
|
|
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/* db-name is already validated when we come here */
|
|
|
|
int mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
|
|
{
|
|
char path[FN_REFLEN+16];
|
|
MY_DIR *dirp;
|
|
long result=1;
|
|
int error = 0;
|
|
register File file;
|
|
uint create_options = create_info ? create_info->options : 0;
|
|
DBUG_ENTER("mysql_alter_db");
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
|
|
|
|
// do not alter database if another thread is holding read lock
|
|
if (wait_if_global_read_lock(thd,0))
|
|
{
|
|
error= -1;
|
|
goto exit2;
|
|
}
|
|
|
|
/* Check directory */
|
|
(void)sprintf(path,"%s/%s/%s", mysql_data_home, db, MY_DB_OPT_FILE);
|
|
fn_format(path, path, "", "", MYF(MY_UNPACK_FILENAME));
|
|
if ((error=write_db_opt(path, create_info)))
|
|
goto exit;
|
|
|
|
/*
|
|
Change options if current database is being altered
|
|
TODO: Delete this code
|
|
*/
|
|
if (thd->db && !strcmp(thd->db,db))
|
|
{
|
|
thd->db_charset= create_info ? create_info->table_charset : NULL;
|
|
}
|
|
|
|
mysql_update_log.write(thd,thd->query, thd->query_length);
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
Query_log_event qinfo(thd, thd->query, thd->query_length);
|
|
mysql_bin_log.write(&qinfo);
|
|
}
|
|
send_ok(thd, result);
|
|
|
|
exit:
|
|
start_waiting_global_read_lock(thd);
|
|
exit2:
|
|
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Drop all tables in a database.
|
|
|
|
db-name is already validated when we come here
|
|
If thd == 0, do not write any messages; This is useful in replication
|
|
when we want to remove a stale database before replacing it with the new one
|
|
*/
|
|
|
|
|
|
int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
|
|
{
|
|
long deleted=0;
|
|
int error = 0;
|
|
char path[FN_REFLEN+16];
|
|
MY_DIR *dirp;
|
|
DBUG_ENTER("mysql_rm_db");
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
|
|
|
|
// do not drop database if another thread is holding read lock
|
|
if (wait_if_global_read_lock(thd,0))
|
|
{
|
|
error= -1;
|
|
goto exit2;
|
|
}
|
|
|
|
(void) sprintf(path,"%s/%s",mysql_data_home,db);
|
|
unpack_dirname(path,path); // Convert if not unix
|
|
/* See if the directory exists */
|
|
if (!(dirp = my_dir(path,MYF(MY_DONT_SORT))))
|
|
{
|
|
if (!if_exists)
|
|
{
|
|
error= -1;
|
|
my_error(ER_DB_DROP_EXISTS,MYF(0),db);
|
|
}
|
|
else if (!silent)
|
|
send_ok(thd,0);
|
|
goto exit;
|
|
}
|
|
pthread_mutex_lock(&LOCK_open);
|
|
remove_db_from_cache(db);
|
|
pthread_mutex_unlock(&LOCK_open);
|
|
|
|
error = -1;
|
|
if ((deleted=mysql_rm_known_files(thd, dirp, db, path,0)) >= 0 && thd)
|
|
{
|
|
ha_drop_database(path);
|
|
query_cache_invalidate1(db);
|
|
if (!silent)
|
|
{
|
|
if (!thd->query)
|
|
{
|
|
thd->query = path;
|
|
thd->query_length = (uint) (strxmov(path,"drop database ", db, NullS)-
|
|
path);
|
|
}
|
|
mysql_update_log.write(thd, thd->query, thd->query_length);
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
Query_log_event qinfo(thd, thd->query, thd->query_length);
|
|
mysql_bin_log.write(&qinfo);
|
|
}
|
|
if (thd->query == path)
|
|
{
|
|
thd->query = 0; // just in case
|
|
thd->query_length = 0;
|
|
}
|
|
send_ok(thd,(ulong) deleted);
|
|
}
|
|
error = 0;
|
|
}
|
|
|
|
exit:
|
|
start_waiting_global_read_lock(thd);
|
|
exit2:
|
|
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
|
|
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
/*
|
|
Removes files with known extensions plus all found subdirectories that
|
|
are 2 digits (raid directories).
|
|
thd MUST be set when calling this function!
|
|
*/
|
|
|
|
static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
|
|
const char *org_path, uint level)
|
|
{
|
|
long deleted=0;
|
|
ulong found_other_files=0;
|
|
char filePath[FN_REFLEN];
|
|
TABLE_LIST *tot_list=0, **tot_list_next;
|
|
DBUG_ENTER("mysql_rm_known_files");
|
|
DBUG_PRINT("enter",("path: %s", org_path));
|
|
|
|
tot_list_next= &tot_list;
|
|
|
|
for (uint idx=2 ;
|
|
idx < (uint) dirp->number_off_files && !thd->killed ;
|
|
idx++)
|
|
{
|
|
FILEINFO *file=dirp->dir_entry+idx;
|
|
DBUG_PRINT("info",("Examining: %s", file->name));
|
|
|
|
/* Check if file is a raid directory */
|
|
if (my_isdigit(system_charset_info,file->name[0]) &&
|
|
my_isdigit(system_charset_info,file->name[1]) &&
|
|
!file->name[2] && !level)
|
|
{
|
|
char newpath[FN_REFLEN];
|
|
MY_DIR *new_dirp;
|
|
strxmov(newpath,org_path,"/",file->name,NullS);
|
|
unpack_filename(newpath,newpath);
|
|
if ((new_dirp = my_dir(newpath,MYF(MY_DONT_SORT))))
|
|
{
|
|
DBUG_PRINT("my",("New subdir found: %s", newpath));
|
|
if ((mysql_rm_known_files(thd, new_dirp, NullS, newpath,1)) < 0)
|
|
{
|
|
my_dirend(dirp);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
}
|
|
continue;
|
|
}
|
|
if (find_type(fn_ext(file->name),&deletable_extentions,1+2) <= 0)
|
|
{
|
|
if (find_type(fn_ext(file->name),&known_extentions,1+2) <= 0)
|
|
found_other_files++;
|
|
continue;
|
|
}
|
|
strxmov(filePath,org_path,"/",file->name,NullS);
|
|
if (db && !my_strcasecmp(system_charset_info,
|
|
fn_ext(file->name), reg_ext))
|
|
{
|
|
/* Drop the table nicely */
|
|
*fn_ext(file->name)=0; // Remove extension
|
|
TABLE_LIST *table_list=(TABLE_LIST*)
|
|
thd->calloc(sizeof(*table_list)+ strlen(db)+strlen(file->name)+2);
|
|
if (!table_list)
|
|
{
|
|
my_dirend(dirp);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
table_list->db= (char*) (table_list+1);
|
|
strmov(table_list->real_name=strmov(table_list->db,db)+1,
|
|
file->name);
|
|
/* Link into list */
|
|
(*tot_list_next)= table_list;
|
|
tot_list_next= &table_list->next;
|
|
}
|
|
else
|
|
{
|
|
|
|
if (my_delete_with_symlink(filePath,MYF(MY_WME)))
|
|
{
|
|
my_dirend(dirp);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
deleted++;
|
|
}
|
|
}
|
|
my_dirend(dirp);
|
|
|
|
if (thd->killed ||
|
|
(tot_list && mysql_rm_table_part2_with_lock(thd, tot_list, 1, 1)))
|
|
DBUG_RETURN(-1);
|
|
|
|
/*
|
|
If the directory is a symbolic link, remove the link first, then
|
|
remove the directory the symbolic link pointed at
|
|
*/
|
|
if (!found_other_files)
|
|
{
|
|
char tmp_path[FN_REFLEN], *pos;
|
|
char *path=unpack_filename(tmp_path,org_path);
|
|
#ifdef HAVE_READLINK
|
|
int error;
|
|
|
|
/* Remove end FN_LIBCHAR as this causes problem on Linux in readlink */
|
|
pos=strend(path);
|
|
if (pos > path && pos[-1] == FN_LIBCHAR)
|
|
*--pos=0;
|
|
|
|
if ((error=my_readlink(filePath, path, MYF(MY_WME))) < 0)
|
|
DBUG_RETURN(-1);
|
|
if (!error)
|
|
{
|
|
if (my_delete(path,MYF(!level ? MY_WME : 0)))
|
|
{
|
|
/* Don't give errors if we can't delete 'RAID' directory */
|
|
if (level)
|
|
DBUG_RETURN(deleted);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
/* Delete directory symbolic link pointed at */
|
|
path= filePath;
|
|
}
|
|
#endif
|
|
/* Remove last FN_LIBCHAR to not cause a problem on OS/2 */
|
|
pos=strend(path);
|
|
|
|
if (pos > path && pos[-1] == FN_LIBCHAR)
|
|
*--pos=0;
|
|
/* Don't give errors if we can't delete 'RAID' directory */
|
|
if (rmdir(path) < 0 && !level)
|
|
{
|
|
my_error(ER_DB_DROP_RMDIR, MYF(0), path, errno);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
}
|
|
DBUG_RETURN(deleted);
|
|
}
|
|
|
|
|
|
/*
|
|
Change default database.
|
|
|
|
SYNOPSIS
|
|
mysql_change_db()
|
|
thd Thread handler
|
|
name Databasename
|
|
|
|
DESCRIPTION
|
|
Becasue the database name may have been given directly from the
|
|
communication packet (in case of 'connect' or 'COM_INIT_DB')
|
|
we have to do end space removal in this function.
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 error
|
|
*/
|
|
|
|
bool mysql_change_db(THD *thd, const char *name)
|
|
{
|
|
int length, db_length;
|
|
char *dbname=my_strdup((char*) name,MYF(MY_WME));
|
|
char path[FN_REFLEN];
|
|
uint db_access;
|
|
HA_CREATE_INFO create;
|
|
DBUG_ENTER("mysql_change_db");
|
|
|
|
if (!dbname || !(db_length=strip_sp(dbname)))
|
|
{
|
|
x_free(dbname); /* purecov: inspected */
|
|
send_error(thd,ER_NO_DB_ERROR); /* purecov: inspected */
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
|
}
|
|
if ((db_length > NAME_LEN) || check_db_name(dbname))
|
|
{
|
|
net_printf(thd,ER_WRONG_DB_NAME, dbname);
|
|
x_free(dbname);
|
|
DBUG_RETURN(1);
|
|
}
|
|
if (lower_case_table_names)
|
|
my_casedn_str(system_charset_info, dbname);
|
|
DBUG_PRINT("info",("Use database: %s", dbname));
|
|
if (test_all_bits(thd->master_access,DB_ACLS))
|
|
db_access=DB_ACLS;
|
|
else
|
|
db_access= (acl_get(thd->host,thd->ip,(char*) &thd->remote.sin_addr,
|
|
thd->priv_user,dbname) |
|
|
thd->master_access);
|
|
if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))
|
|
{
|
|
net_printf(thd,ER_DBACCESS_DENIED_ERROR,
|
|
thd->priv_user,
|
|
thd->host_or_ip,
|
|
dbname);
|
|
mysql_log.write(thd,COM_INIT_DB,ER(ER_DBACCESS_DENIED_ERROR),
|
|
thd->priv_user,
|
|
thd->host_or_ip,
|
|
dbname);
|
|
my_free(dbname,MYF(0));
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
(void) sprintf(path,"%s/%s",mysql_data_home,dbname);
|
|
length=unpack_dirname(path,path); // Convert if not unix
|
|
if (length && path[length-1] == FN_LIBCHAR)
|
|
path[length-1]=0; // remove ending '\'
|
|
if (access(path,F_OK))
|
|
{
|
|
net_printf(thd,ER_BAD_DB_ERROR,dbname);
|
|
my_free(dbname,MYF(0));
|
|
DBUG_RETURN(1);
|
|
}
|
|
send_ok(thd);
|
|
x_free(thd->db);
|
|
thd->db=dbname; // THD::~THD will free this
|
|
thd->db_length=db_length;
|
|
thd->db_access=db_access;
|
|
|
|
strmov(path+unpack_dirname(path,path), MY_DB_OPT_FILE);
|
|
load_db_opt(path, &create);
|
|
thd->db_charset=create.table_charset;
|
|
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
int mysqld_show_create_db(THD *thd, const char *dbname)
|
|
{
|
|
int length, db_length;
|
|
char path[FN_REFLEN], *to;
|
|
uint db_access;
|
|
bool found_libchar;
|
|
HA_CREATE_INFO create;
|
|
CONVERT *convert=thd->variables.convert_set;
|
|
DBUG_ENTER("mysql_show_create_db");
|
|
|
|
if (check_db_name(dbname))
|
|
{
|
|
net_printf(thd,ER_WRONG_DB_NAME, dbname);
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
if (test_all_bits(thd->master_access,DB_ACLS))
|
|
db_access=DB_ACLS;
|
|
else
|
|
db_access= (acl_get(thd->host,thd->ip,(char*) &thd->remote.sin_addr,
|
|
thd->priv_user,dbname) |
|
|
thd->master_access);
|
|
if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))
|
|
{
|
|
net_printf(thd,ER_DBACCESS_DENIED_ERROR,
|
|
thd->priv_user,
|
|
thd->host_or_ip,
|
|
dbname);
|
|
mysql_log.write(thd,COM_INIT_DB,ER(ER_DBACCESS_DENIED_ERROR),
|
|
thd->priv_user,
|
|
thd->host_or_ip,
|
|
dbname);
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
(void) sprintf(path,"%s/%s",mysql_data_home, dbname);
|
|
length=unpack_dirname(path,path); // Convert if not unix
|
|
found_libchar= 0;
|
|
if (length && path[length-1] == FN_LIBCHAR)
|
|
{
|
|
found_libchar= 1;
|
|
path[length-1]=0; // remove ending '\'
|
|
}
|
|
if (access(path,F_OK))
|
|
{
|
|
net_printf(thd,ER_BAD_DB_ERROR,dbname);
|
|
DBUG_RETURN(1);
|
|
}
|
|
if (found_libchar)
|
|
path[length-1]= FN_LIBCHAR;
|
|
strmov(path+length, MY_DB_OPT_FILE);
|
|
load_db_opt(path, &create);
|
|
|
|
List<Item> field_list;
|
|
field_list.push_back(new Item_empty_string("Database",NAME_LEN));
|
|
field_list.push_back(new Item_empty_string("Create Database",1024));
|
|
|
|
if (send_fields(thd,field_list,1))
|
|
DBUG_RETURN(1);
|
|
|
|
String *packet = &thd->packet;
|
|
packet->length(0);
|
|
net_store_data(packet, convert, dbname);
|
|
to= strxmov(path, "CREATE DATABASE `", dbname, "`", NullS);
|
|
if (create.table_charset)
|
|
to= strxmov(to," DEFAULT CHARACTER SET ", create.table_charset->name,
|
|
NullS);
|
|
net_store_data(packet, convert, path, (uint) (to-path));
|
|
|
|
if (my_net_write(&thd->net,(char*) packet->ptr(), packet->length()))
|
|
DBUG_RETURN(1);
|
|
|
|
send_eof(thd);
|
|
DBUG_RETURN(0);
|
|
}
|