diff options
| author | unknown <peter@mysql.com> | 2002-10-27 13:13:31 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-10-27 13:13:31 +0300 |
| commit | 68168ee5ff7adb4cbe3af48d01c78769a0c0ce2c (patch) | |
| tree | f81de2c654d9303717dafab1ebb0f94e03df8351 /client | |
| parent | 8962d3f66dfcb32184247bca592ca4deb7444e3b (diff) | |
| parent | c37bbf06bb452899e5946a75282000de0699b335 (diff) | |
| download | mariadb-git-68168ee5ff7adb4cbe3af48d01c78769a0c0ce2c.tar.gz | |
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
include/mysql_com.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlcheck.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 394555f37a9..24b67a60255 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -16,7 +16,7 @@ /* 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 <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)))) 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)) { sprintf(message, "when executing '%s TABLE `%s` %s", op, tables,options); @@ -493,12 +493,9 @@ static void print_result() if (status) { - if (found_error) - { - if (what_to_do != DO_REPAIR && opt_auto_repair && - (!opt_fast || strcmp(row[3],"OK"))) - insert_dynamic(&tables4repair, row[0]); - } + if (found_error && opt_auto_repair && what_to_do != DO_REPAIR && + (!opt_fast || strcmp(row[3],"OK"))) + insert_dynamic(&tables4repair, prev); found_error=0; if (opt_silent) continue; @@ -515,6 +512,9 @@ static void print_result() strmov(prev, row[0]); 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); } |