summaryrefslogtreecommitdiff
path: root/myisam/sp_test.c
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-10-02 13:33:08 +0300
committermonty@mashka.mysql.fi <>2002-10-02 13:33:08 +0300
commitd69250a969449da43891ef5b2859df77917183a8 (patch)
tree5a27bda6d3f628af7dcb922ad022e84cf8cb351c /myisam/sp_test.c
parent7134ffec210edde21860a2b2c2654be481de49b4 (diff)
downloadmariadb-git-d69250a969449da43891ef5b2859df77917183a8.tar.gz
Fixes and code cleanups after merge with 4.0.3
Warning handling and initial prepared statement handling (last not complete yet) Changed a lot of functions that returned 0/1 to my_bool type. GRANT handling now uses read/write locks instead of mutex Change basic net functions to use THD instead of NET (needed for 4.1 protocol) Use my_sprintf instead of sprintf() + strlen() Added alloc_query() to be able to chare query initialization code with prepared statements. Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID() Note that the following test fails (will be fixed ASAP): sub_select, union, rpl_rotate_logs and rpl_mystery22
Diffstat (limited to 'myisam/sp_test.c')
-rw-r--r--myisam/sp_test.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/myisam/sp_test.c b/myisam/sp_test.c
index 9d32b3e623d..b8b5880cf67 100644
--- a/myisam/sp_test.c
+++ b/myisam/sp_test.c
@@ -41,7 +41,7 @@ static void rtree_PrintWKB(uchar *wkb, uint n_dims);
static char blob_key[MAX_REC_LENGTH];
-int main(int argc,char *argv[])
+int main(int argc __attribute__((unused)),char *argv[])
{
MY_INIT(argv[0]);
exit(run_test("sp_test"));
@@ -320,7 +320,10 @@ static int read_with_pos (MI_INFO * file,int silent)
}
-static void bprint_record(char * record, my_off_t offs,const char * tail)
+#ifdef NOT_USED
+static void bprint_record(char * record,
+ my_off_t offs __attribute__((unused)),
+ const char * tail)
{
int i;
char * pos;
@@ -333,6 +336,8 @@ static void bprint_record(char * record, my_off_t offs,const char * tail)
}
printf("%s",tail);
}
+#endif
+
static void print_record(char * record, my_off_t offs,const char * tail)
{
@@ -356,6 +361,7 @@ static void print_record(char * record, my_off_t offs,const char * tail)
+#ifndef NOT_USED
static void create_point(char *record,uint rownr)
{
uint tmp;
@@ -380,6 +386,7 @@ static void create_point(char *record,uint rownr)
ptr=blob_key;
memcpy_fixed(pos,&ptr,sizeof(char*));
}
+#endif
static void create_linestring(char *record,uint rownr)