summaryrefslogtreecommitdiff
path: root/mysys/my_static.c
diff options
context:
space:
mode:
authorjani@linux-th5m.site <>2007-05-24 15:26:10 +0300
committerjani@linux-th5m.site <>2007-05-24 15:26:10 +0300
commitf1807e1f25111e0fe91fe3393205cf7be15cd994 (patch)
tree95c9c78dd2df7c497babc3d932ae30ceb98d1296 /mysys/my_static.c
parent64d34f6e222ebaab0310847e92732401c7e58dc3 (diff)
parentfc3b3a0a864fd142f65bbd5ff611d2f09041a258 (diff)
downloadmariadb-git-f1807e1f25111e0fe91fe3393205cf7be15cd994.tar.gz
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into linux-th5m.site:/home/my/mysql-5.1-marvel
Diffstat (limited to 'mysys/my_static.c')
-rw-r--r--mysys/my_static.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c
index 77243611c03..472cf3b5084 100644
--- a/mysys/my_static.c
+++ b/mysys/my_static.c
@@ -27,7 +27,7 @@
my_bool timed_mutexes= 0;
/* from my_init */
-my_string home_dir=0;
+char * home_dir=0;
const char *my_progname=0;
char NEAR curr_dir[FN_REFLEN]= {0},
NEAR home_dir_buff[FN_REFLEN]= {0};
@@ -74,8 +74,8 @@ uint sf_malloc_prehunc=0, /* If you have problem with core- */
ulong sf_malloc_cur_memory= 0L; /* Current memory usage */
ulong sf_malloc_max_memory= 0L; /* Maximum memory usage */
uint sf_malloc_count= 0; /* Number of times NEW() was called */
-byte *sf_min_adress= (byte*) ~(unsigned long) 0L,
- *sf_max_adress= (byte*) 0L;
+uchar *sf_min_adress= (uchar*) ~(unsigned long) 0L,
+ *sf_max_adress= (uchar*) 0L;
/* Root of the linked list of struct st_irem */
struct st_irem *sf_malloc_root = NULL;