diff options
| author | unknown <monty@mysql.com> | 2004-03-12 01:12:14 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-12 01:12:14 +0200 |
| commit | dd8b25510e11ca35c37bb9949810ac84c6d7ce29 (patch) | |
| tree | c0a17d040743869a3c5573eeaabb8a33a3224a2d /myisam/mi_check.c | |
| parent | a1d9e1eec4ff8e9e53567bb3606bc4605a952375 (diff) | |
| parent | bc9de3d4552f2294bad973d0b9fbe07de3d07c1d (diff) | |
| download | mariadb-git-dd8b25510e11ca35c37bb9949810ac84c6d7ce29.tar.gz | |
Merge with 3.23 to get patch for floor()
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_check.c:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'myisam/mi_check.c')
| -rw-r--r-- | myisam/mi_check.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 8581f79c99d..61c98eb526f 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -112,7 +112,9 @@ int chk_status(MI_CHECK *param, register MI_INFO *info) /* Don't count this as a real warning, as check can correct this ! */ uint save=param->warning_printed; mi_check_print_warning(param, - "%d clients is using or hasn't closed the table properly", + share->state.open_count==1 ? + "%d client is using or hasn't closed the table properly" : + "%d clients are using or haven't closed the table properly", share->state.open_count); /* If this will be fixed by the check, forget the warning */ if (param->testflag & T_UPDATE_STATE) |