summaryrefslogtreecommitdiff
path: root/myisam/myisamchk.c
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-07-12 07:43:38 +0300
committermonty@mysql.com <>2004-07-12 07:43:38 +0300
commitfa7f63d46d033c1c1651d8f5155070e30c607023 (patch)
tree10e62d45a952afd6fc7079f46435e5a5144b3dc8 /myisam/myisamchk.c
parent1e311999950833cd81ca0788cd3656585c46d9ae (diff)
downloadmariadb-git-fa7f63d46d033c1c1651d8f5155070e30c607023.tar.gz
After merge fixes
Diffstat (limited to 'myisam/myisamchk.c')
-rw-r--r--myisam/myisamchk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index 6dcfe2cfa21..1be1e72c435 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -1693,11 +1693,11 @@ err:
sorting
*/
-static my_bool not_killed= 0;
+static int not_killed= 0;
volatile int *killed_ptr(MI_CHECK *param)
{
- return (int *)thd; /* always NULL */
+ return &not_killed; /* always NULL */
}
/* print warnings and errors */