diff options
author | unknown <jani@hynda.mysql.fi> | 2007-10-04 20:33:42 +0300 |
---|---|---|
committer | unknown <jani@hynda.mysql.fi> | 2007-10-04 20:33:42 +0300 |
commit | 4eb383e06c021e89244cbf7d24abecb7b3bde01b (patch) | |
tree | 6574ddabcd49b313915d7d025c74aaf9b04bec33 /storage/maria/ma_sp_test.c | |
parent | 6f296a01ac39f7d10774fd3d93b5633f31ce99c7 (diff) | |
download | mariadb-git-4eb383e06c021e89244cbf7d24abecb7b3bde01b.tar.gz |
After merge fixes. Applied changes made in myisam manually to maria.
storage/maria/ma_test1.c:
After merge fixes. Applied changes made in myisam manually to maria.
Fixed memory leak.
storage/maria/ma_test2.c:
After merge fixes. Applied changes made in myisam manually to maria.
Fixed memory leak.
Diffstat (limited to 'storage/maria/ma_sp_test.c')
-rw-r--r-- | storage/maria/ma_sp_test.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/storage/maria/ma_sp_test.c b/storage/maria/ma_sp_test.c index 7a413f68135..b8c00753acb 100644 --- a/storage/maria/ma_sp_test.c +++ b/storage/maria/ma_sp_test.c @@ -24,11 +24,11 @@ #define MAX_REC_LENGTH 1024 #define KEYALG HA_KEY_ALG_RTREE -static void create_linestring(char *record,uint rownr); -static void print_record(char * record,my_off_t offs,const char * tail); +static void create_linestring(uchar *record,uint rownr); +static void print_record(uchar * record,my_off_t offs,const char * tail); -static void create_key(char *key,uint rownr); -static void print_key(const char *key,const char * tail); +static void create_key(uchar *key,uint rownr); +static void print_key(const uchar *key,const char * tail); static int run_test(const char *filename); static int read_with_pos(MARIA_HA * file, int silent); @@ -65,9 +65,9 @@ int run_test(const char *filename) int i; int error; int row_count=0; - char record[MAX_REC_LENGTH]; - char key[MAX_REC_LENGTH]; - char read_record[MAX_REC_LENGTH]; + uchar record[MAX_REC_LENGTH]; + uchar key[MAX_REC_LENGTH]; + uchar read_record[MAX_REC_LENGTH]; int upd=10; ha_rows hrows; @@ -277,7 +277,7 @@ static int read_with_pos (MARIA_HA * file,int silent) { int error; int i; - char read_record[MAX_REC_LENGTH]; + uchar read_record[MAX_REC_LENGTH]; int rows=0; if (!silent) @@ -305,7 +305,7 @@ static int read_with_pos (MARIA_HA * file,int silent) #ifdef NOT_USED -static void bprint_record(char * record, +static void bprint_record(uchar * record, my_off_t offs __attribute__((unused)), const char * tail) { @@ -324,9 +324,9 @@ static void bprint_record(char * record, #endif -static void print_record(char * record, my_off_t offs,const char * tail) +static void print_record(uchar * record, my_off_t offs,const char * tail) { - char *pos; + uchar *pos; char *ptr; uint len; @@ -346,7 +346,7 @@ static void print_record(char * record, my_off_t offs,const char * tail) #ifdef NOT_USED -static void create_point(char *record,uint rownr) +static void create_point(uchar *record,uint rownr) { uint tmp; char *ptr; @@ -373,11 +373,11 @@ static void create_point(char *record,uint rownr) #endif -static void create_linestring(char *record,uint rownr) +static void create_linestring(uchar *record,uint rownr) { uint tmp; char *ptr; - char *pos=record; + uchar *pos= record; double x[200]; int i,j; int npoints=2; @@ -401,10 +401,10 @@ static void create_linestring(char *record,uint rownr) } -static void create_key(char *key,uint rownr) +static void create_key(uchar *key,uint rownr) { double c=rownr; - char *pos; + uchar *pos; uint i; bzero(key,MAX_REC_LENGTH); @@ -415,7 +415,7 @@ static void create_key(char *key,uint rownr) } } -static void print_key(const char *key,const char * tail) +static void print_key(const uchar *key,const char * tail) { double c; uint i; |