mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Fixed that database name is shown for CHECK TABLE
BitKeeper/etc/ignore: Added client/mysqlcheck to the ignore list Docs/manual.texi: Changelog
This commit is contained in:
@@ -247,3 +247,4 @@ bdb/dist/config.hin
|
|||||||
innobase/ib_config.h
|
innobase/ib_config.h
|
||||||
innobase/ib_config.h.in
|
innobase/ib_config.h.in
|
||||||
mysql.proj
|
mysql.proj
|
||||||
|
client/mysqlcheck
|
||||||
|
@@ -43897,7 +43897,7 @@ users uses this code as the rest of the code and because of this we are
|
|||||||
not yet 100% confident in this code.
|
not yet 100% confident in this code.
|
||||||
|
|
||||||
@menu
|
@menu
|
||||||
* News-3.23.38::
|
* News-3.23.38:: Changes in release 3.23.38
|
||||||
* News-3.23.37:: Changes in release 3.23.37
|
* News-3.23.37:: Changes in release 3.23.37
|
||||||
* News-3.23.36:: Changes in release 3.23.36
|
* News-3.23.36:: Changes in release 3.23.36
|
||||||
* News-3.23.35:: Changes in release 3.23.35
|
* News-3.23.35:: Changes in release 3.23.35
|
||||||
@@ -43943,6 +43943,11 @@ not yet 100% confident in this code.
|
|||||||
@appendixsubsec Changes in release 3.23.38
|
@appendixsubsec Changes in release 3.23.38
|
||||||
@itemize @bullet
|
@itemize @bullet
|
||||||
@item
|
@item
|
||||||
|
New program @code{mysqlcheck}.
|
||||||
|
@item
|
||||||
|
Added database name to output for admin commands like @code{CHECK},
|
||||||
|
@code{REPAIR}, @code{OPTIMIZE}.
|
||||||
|
@item
|
||||||
Lots of portability fixes for InnoDB.
|
Lots of portability fixes for InnoDB.
|
||||||
@item
|
@item
|
||||||
Changed optimizer so that queries like
|
Changed optimizer so that queries like
|
||||||
|
@@ -334,7 +334,7 @@ typedef struct st_mi_check_param
|
|||||||
ha_checksum key_crc[MI_MAX_POSSIBLE_KEY];
|
ha_checksum key_crc[MI_MAX_POSSIBLE_KEY];
|
||||||
ulong rec_per_key_part[MI_MAX_KEY_SEG*MI_MAX_POSSIBLE_KEY];
|
ulong rec_per_key_part[MI_MAX_KEY_SEG*MI_MAX_POSSIBLE_KEY];
|
||||||
void *thd;
|
void *thd;
|
||||||
char* table_name;
|
char *db_name,*table_name;
|
||||||
char *op_name;
|
char *op_name;
|
||||||
} MI_CHECK;
|
} MI_CHECK;
|
||||||
|
|
||||||
|
@@ -50,10 +50,12 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type,
|
|||||||
{
|
{
|
||||||
THD* thd = (THD*)param->thd;
|
THD* thd = (THD*)param->thd;
|
||||||
String* packet = &thd->packet;
|
String* packet = &thd->packet;
|
||||||
packet->length(0);
|
uint length;
|
||||||
char msgbuf[MI_MAX_MSG_BUF];
|
char msgbuf[MI_MAX_MSG_BUF];
|
||||||
msgbuf[0] = 0;
|
char name[NAME_LEN*2+2];
|
||||||
|
packet->length(0);
|
||||||
|
|
||||||
|
msgbuf[0] = 0; // healthy paranoia ?
|
||||||
my_vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
|
my_vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
|
||||||
msgbuf[sizeof(msgbuf) - 1] = 0; // healthy paranoia
|
msgbuf[sizeof(msgbuf) - 1] = 0; // healthy paranoia
|
||||||
|
|
||||||
@@ -70,9 +72,12 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type,
|
|||||||
my_message(ER_NOT_KEYFILE,msgbuf,MYF(MY_WME));
|
my_message(ER_NOT_KEYFILE,msgbuf,MYF(MY_WME));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
net_store_data(packet, param->table_name);
|
length=(uint) (strxmov(name, param->db_name,".",param->table_name,NullS) -
|
||||||
|
name);
|
||||||
|
net_store_data(packet, name, length);
|
||||||
net_store_data(packet, param->op_name);
|
net_store_data(packet, param->op_name);
|
||||||
net_store_data(packet, msg_type);
|
net_store_data(packet, msg_type);
|
||||||
|
|
||||||
net_store_data(packet, msgbuf);
|
net_store_data(packet, msgbuf);
|
||||||
if (my_net_write(&thd->net, (char*)thd->packet.ptr(), thd->packet.length()))
|
if (my_net_write(&thd->net, (char*)thd->packet.ptr(), thd->packet.length()))
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
@@ -245,6 +250,7 @@ int ha_myisam::check(THD* thd, HA_CHECK_OPT* check_opt)
|
|||||||
myisamchk_init(¶m);
|
myisamchk_init(¶m);
|
||||||
param.thd = thd;
|
param.thd = thd;
|
||||||
param.op_name = (char*)"check";
|
param.op_name = (char*)"check";
|
||||||
|
param.db_name = table->table_cache_key;
|
||||||
param.table_name = table->table_name;
|
param.table_name = table->table_name;
|
||||||
param.testflag = check_opt->flags | T_CHECK | T_SILENT;
|
param.testflag = check_opt->flags | T_CHECK | T_SILENT;
|
||||||
|
|
||||||
@@ -332,6 +338,7 @@ int ha_myisam::analyze(THD *thd, HA_CHECK_OPT* check_opt)
|
|||||||
myisamchk_init(¶m);
|
myisamchk_init(¶m);
|
||||||
param.thd = thd;
|
param.thd = thd;
|
||||||
param.op_name = (char*) "analyze";
|
param.op_name = (char*) "analyze";
|
||||||
|
param.db_name = table->table_cache_key;
|
||||||
param.table_name = table->table_name;
|
param.table_name = table->table_name;
|
||||||
param.testflag=(T_FAST | T_CHECK | T_SILENT | T_STATISTICS |
|
param.testflag=(T_FAST | T_CHECK | T_SILENT | T_STATISTICS |
|
||||||
T_DONT_CHECK_CHECKSUM);
|
T_DONT_CHECK_CHECKSUM);
|
||||||
@@ -384,6 +391,7 @@ int ha_myisam::restore(THD* thd, HA_CHECK_OPT *check_opt)
|
|||||||
myisamchk_init(¶m);
|
myisamchk_init(¶m);
|
||||||
param.thd = thd;
|
param.thd = thd;
|
||||||
param.op_name = (char*)"restore";
|
param.op_name = (char*)"restore";
|
||||||
|
param.db_name = table->table_cache_key;
|
||||||
param.table_name = table->table_name;
|
param.table_name = table->table_name;
|
||||||
param.testflag = 0;
|
param.testflag = 0;
|
||||||
mi_check_print_error(¶m,errmsg, errno );
|
mi_check_print_error(¶m,errmsg, errno );
|
||||||
@@ -438,6 +446,7 @@ int ha_myisam::backup(THD* thd, HA_CHECK_OPT *check_opt)
|
|||||||
myisamchk_init(¶m);
|
myisamchk_init(¶m);
|
||||||
param.thd = thd;
|
param.thd = thd;
|
||||||
param.op_name = (char*)"backup";
|
param.op_name = (char*)"backup";
|
||||||
|
param.db_name = table->table_cache_key;
|
||||||
param.table_name = table->table_name;
|
param.table_name = table->table_name;
|
||||||
param.testflag = 0;
|
param.testflag = 0;
|
||||||
mi_check_print_error(¶m,errmsg, errno );
|
mi_check_print_error(¶m,errmsg, errno );
|
||||||
@@ -524,6 +533,7 @@ int ha_myisam::repair(THD *thd, MI_CHECK ¶m, bool optimize)
|
|||||||
ha_rows rows= file->state->records;
|
ha_rows rows= file->state->records;
|
||||||
DBUG_ENTER("ha_myisam::repair");
|
DBUG_ENTER("ha_myisam::repair");
|
||||||
|
|
||||||
|
param.db_name = table->table_cache_key;
|
||||||
param.table_name = table->table_name;
|
param.table_name = table->table_name;
|
||||||
param.tmpfile_createflag = O_RDWR | O_TRUNC;
|
param.tmpfile_createflag = O_RDWR | O_TRUNC;
|
||||||
param.using_global_keycache = 1;
|
param.using_global_keycache = 1;
|
||||||
|
Reference in New Issue
Block a user