From 455b6952d60c07245d604b2f3fd7d41a63fa89ae Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 1 Jun 2001 19:38:47 +0300 Subject: Added --skip-symlinks Don't force repair of tables that are not closed properly. Docs/manual.texi: Added information about symbolic links. include/my_sys.h: symbolic link support myisam/mi_check.c: Don't force repair of tables that are not closed properly. myisam/myisamchk.c: Version number change. mysys/my_static.c: symbolic link support mysys/my_symlink2.c: Disabling of symbolic link support sql/mysqld.cc: Disabling of symbolic link support --- mysys/my_static.c | 1 + mysys/my_symlink2.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'mysys') diff --git a/mysys/my_static.c b/mysys/my_static.c index f1339877273..3fc68455841 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -97,4 +97,5 @@ int (*fatal_error_handler_hook)(uint error,const char *str,myf MyFlags)= my_bool NEAR my_disable_locking=0; my_bool NEAR my_disable_async_io=0; my_bool NEAR my_disable_flush_key_blocks=0; +my_bool NEAR my_disable_symlinks=0; my_bool NEAR mysys_uses_curses=0; diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c index 671531393f7..9fcd993ac1f 100644 --- a/mysys/my_symlink2.c +++ b/mysys/my_symlink2.c @@ -62,7 +62,8 @@ File my_create_with_symlink(const char *linkname, const char *filename, int my_delete_with_symlink(const char *name, myf MyFlags) { char link_name[FN_REFLEN]; - int was_symlink= !my_readlink(link_name, name, MYF(0)); + int was_symlink= (!my_disable_symlinks && + !my_readlink(link_name, name, MYF(0))); int result; DBUG_ENTER("my_delete_with_symlink"); @@ -90,7 +91,8 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags) return my_rename(from, to, MyFlags); #else char link_name[FN_REFLEN], tmp_name[FN_REFLEN]; - int was_symlink= !my_readlink(link_name, name, MYF(0)); + int was_symlink= (!my_disable_symlinks && + !my_readlink(link_name, name, MYF(0))); int result; DBUG_ENTER("my_rename_with_symlink"); -- cgit v1.2.1 From 7c077e68f663e082924a359ecd3cfdfdedd88967 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 2 Jun 2001 00:03:16 +0300 Subject: Fixed bug that caused client to hang because mysqld never did send an error message if the table open or the index creation failed. Updated portuguese error messages. Fix for OS/2 that affected CHECK TABLE. Docs/manual.texi: Changelog. libmysql/errmsg.c: Updated portuguese error messages mysys/my_copy.c: Fix for OS/2 sql/net_pkg.cc: cleanup sql/share/portuguese/errmsg.txt: Updated portuguese error messages sql/slave.cc: Cleanup. Fixed bug that caused client to hang because mysqld never did send an error message if the table open or the index creation failed. sql/sql_parse.cc: Moved handling of 'no_send_ok' to fetch_nx_table. sql/sql_table.cc: Cleanup. --- mysys/my_copy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysys') diff --git a/mysys/my_copy.c b/mysys/my_copy.c index bfd7e957585..be131873118 100644 --- a/mysys/my_copy.c +++ b/mysys/my_copy.c @@ -54,7 +54,7 @@ int my_copy(const char *from, const char *to, myf MyFlags) if (MyFlags & MY_HOLD_ORIGINAL_MODES) /* Copy stat if possible */ new_file_stat=stat((char*) to, &new_stat_buff); - if ((from_file=my_open(from,O_RDONLY,MyFlags)) >= 0) + if ((from_file=my_open(from,O_RDONLY | O_SHARE,MyFlags)) >= 0) { if (stat(from,&stat_buff)) { @@ -64,7 +64,7 @@ int my_copy(const char *from, const char *to, myf MyFlags) if (MyFlags & MY_HOLD_ORIGINAL_MODES && !new_file_stat) stat_buff=new_stat_buff; if ((to_file= my_create(to,(int) stat_buff.st_mode, - O_WRONLY | O_TRUNC | O_BINARY, + O_WRONLY | O_TRUNC | O_BINARY | O_SHARE, MyFlags)) < 0) goto err; -- cgit v1.2.1