diff options
| author | unknown <jani@linux-th5m.site> | 2007-05-24 15:26:10 +0300 |
|---|---|---|
| committer | unknown <jani@linux-th5m.site> | 2007-05-24 15:26:10 +0300 |
| commit | 6356f5631c1b6dab40b747abe54797f1779aef80 (patch) | |
| tree | 95c9c78dd2df7c497babc3d932ae30ceb98d1296 /mysys/my_static.c | |
| parent | 7932fb543241d77c0f10e172d144273e3c640512 (diff) | |
| parent | 6e849907977dd503ad82b9aa5039d17b5db1d7b7 (diff) | |
| download | mariadb-git-6356f5631c1b6dab40b747abe54797f1779aef80.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into linux-th5m.site:/home/my/mysql-5.1-marvel
include/keycache.h:
Auto merged
include/my_sys.h:
Auto merged
mysys/my_static.c:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
storage/blackhole/ha_blackhole.h:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_preload.c:
Auto merged
mysys/mf_keycache.c:
Manual merge from main 5.1
Diffstat (limited to 'mysys/my_static.c')
| -rw-r--r-- | mysys/my_static.c | 6 |
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; |