1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed three bugs in mysqlcheck and changed documentation for mysqld_multi

Browse Source
This commit is contained in:
jani@rhols221.adsl.netsonic.fi 2002-10-17 19:34:02 +03:00
parent 98c4101b6e
commit f11f48a144
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/mysqlcheck.c
View File

@ -16,7 +16,7 @@
/* By Jani Tolonen, 2001-04-20, MySQL Development Team */ /* By Jani Tolonen, 2001-04-20, MySQL Development Team */
#define CHECK_VERSION "2.4.1" #define CHECK_VERSION "2.4.2"
#include "client_priv.h" #include "client_priv.h"
#include <m_ctype.h> #include <m_ctype.h>
@ -463,7 +463,7 @@ static int handle_request_for_tables(char *tables, uint length)
if (!(query =(char *) my_malloc((sizeof(char)*(length+110)), MYF(MY_WME)))) if (!(query =(char *) my_malloc((sizeof(char)*(length+110)), MYF(MY_WME))))
return 1; return 1;
sprintf(query, "%s TABLE `%s` %s", op, tables, options); sprintf(query, "%s TABLE %s %s", op, tables, options);
if (mysql_query(sock, query)) if (mysql_query(sock, query))
{ {
sprintf(message, "when executing '%s TABLE `%s` %s", op, tables,options); sprintf(message, "when executing '%s TABLE `%s` %s", op, tables,options);
@ -493,12 +493,9 @@ static void print_result()
if (status) if (status)
{ {
if (found_error) if (found_error && opt_auto_repair && what_to_do != DO_REPAIR &&
{ (!opt_fast || strcmp(row[3],"OK")))
if (what_to_do != DO_REPAIR && opt_auto_repair && insert_dynamic(&tables4repair, prev);
(!opt_fast || strcmp(row[3],"OK")))
insert_dynamic(&tables4repair, row[0]);
}
found_error=0; found_error=0;
if (opt_silent) if (opt_silent)
continue; continue;
@ -515,6 +512,9 @@ static void print_result()
strmov(prev, row[0]); strmov(prev, row[0]);
putchar('\n'); putchar('\n');
} }
if (found_error && opt_auto_repair && what_to_do != DO_REPAIR &&
(!opt_fast || strcmp(row[3],"OK")))
insert_dynamic(&tables4repair, prev);
mysql_free_result(res); mysql_free_result(res);
} }

6
scripts/mysqld_multi.sh
View File

@ -4,7 +4,7 @@ use Getopt::Long;
use POSIX qw(strftime); use POSIX qw(strftime);
$|=1; $|=1;
$VER="2.3"; $VER="2.4";
$opt_config_file = undef(); $opt_config_file = undef();
$opt_example = 0; $opt_example = 0;
@ -508,8 +508,8 @@ sub example
[mysqld_multi] [mysqld_multi]
mysqld = @bindir@/mysqld_safe mysqld = @bindir@/mysqld_safe
mysqladmin = @bindir@/mysqladmin mysqladmin = @bindir@/mysqladmin
user = multi_admin user = root
password = multipass password = your_password
[mysqld2] [mysqld2]
socket = /tmp/mysql.sock2 socket = /tmp/mysql.sock2