mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#4625 remove info messages from ha_tokudb::check; too many test failures with it in refs[t:4625]

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@41031 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska 2013-04-17 00:02:09 -04:00 committed by Yoni Fogel
parent 5d2f12fdf0
commit 892d7680d1
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/tokudb/Makefile.in
View file

@ -363,8 +363,6 @@ plugin_federated_shared_target = @plugin_federated_shared_target@
plugin_federated_static_target = @plugin_federated_static_target@
plugin_heap_shared_target = @plugin_heap_shared_target@
plugin_heap_static_target = @plugin_heap_static_target@
plugin_ibmdb2i_shared_target = @plugin_ibmdb2i_shared_target@
plugin_ibmdb2i_static_target = @plugin_ibmdb2i_static_target@
plugin_innobase_shared_target = @plugin_innobase_shared_target@
plugin_innobase_static_target = @plugin_innobase_static_target@
plugin_innodb_plugin_shared_target = @plugin_innodb_plugin_shared_target@
@ -381,8 +379,6 @@ plugin_tokudb_shared_target = @plugin_tokudb_shared_target@
plugin_tokudb_static_target = @plugin_tokudb_static_target@
prefix = @prefix@
program_transform_name = @program_transform_name@
pstack_dir = @pstack_dir@
pstack_libs = @pstack_libs@
readline_basedir = @readline_basedir@
readline_dir = @readline_dir@
readline_h_ln_cmd = @readline_h_ln_cmd@

12
storage/tokudb/ha_tokudb.cc
View file

@ -9780,6 +9780,7 @@ ha_tokudb_check_info(THD *thd, TABLE *table, const char *msg) {
}
}
volatile int ha_tokudb_check_verbose = 0; // debug
volatile int ha_tokudb_check_wait = 0; // debug
int
@ -9794,14 +9795,11 @@ ha_tokudb::check(THD *thd, HA_CHECK_OPT *check_opt) {
int result = HA_ADMIN_OK;
int r;
int verbose = 0;
int keep_going = 1;
if (check_opt->flags & T_QUICK) {
keep_going = 0;
}
if (check_opt->flags & T_EXTEND) {
verbose = 1;
keep_going = 1;
}
@ -9813,7 +9811,7 @@ ha_tokudb::check(THD *thd, HA_CHECK_OPT *check_opt) {
time_t now;
char timebuf[32];
snprintf(write_status_msg, sizeof write_status_msg, "%s primary=%d num=%d", share->table_name, primary_key, num_DBs);
if (verbose) {
if (ha_tokudb_check_verbose) {
ha_tokudb_check_info(thd, table, write_status_msg);
now = time(0);
fprintf(stderr, "%.24s ha_tokudb::check %s\n", ctime_r(&now, timebuf), write_status_msg);
@ -9826,16 +9824,16 @@ ha_tokudb::check(THD *thd, HA_CHECK_OPT *check_opt) {
kname = "primary"; // hidden primary key does not set name
snprintf(write_status_msg, sizeof write_status_msg, "%s key=%s %u", share->table_name, kname, i);
thd_proc_info(thd, write_status_msg);
if (verbose) {
if (ha_tokudb_check_verbose) {
ha_tokudb_check_info(thd, table, write_status_msg);
now = time(0);
fprintf(stderr, "%.24s ha_tokudb::check %s\n", ctime_r(&now, timebuf), write_status_msg);
}
struct check_context check_context = { thd };
r = db->verify_with_progress(db, ha_tokudb_check_progress, &check_context, verbose, keep_going);
r = db->verify_with_progress(db, ha_tokudb_check_progress, &check_context, ha_tokudb_check_verbose, keep_going);
snprintf(write_status_msg, sizeof write_status_msg, "%s key=%s %u result=%d", share->table_name, kname, i, r);
thd_proc_info(thd, write_status_msg);
if (verbose) {
if (ha_tokudb_check_verbose) {
ha_tokudb_check_info(thd, table, write_status_msg);
now = time(0);
fprintf(stderr, "%.24s ha_tokudb::check %s\n", ctime_r(&now, timebuf), write_status_msg);