mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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
This commit is contained in:
@@ -32,7 +32,7 @@ static void print_record(char * record,my_off_t offs,const char * tail);
|
||||
static int run_test(const char *filename);
|
||||
|
||||
|
||||
int main(int argc,char *argv[])
|
||||
int main(int argc __attribute__((unused)),char *argv[])
|
||||
{
|
||||
MY_INIT(argv[0]);
|
||||
exit(run_test("rt_test"));
|
||||
@@ -63,7 +63,6 @@ int run_test(const char *filename)
|
||||
int row_count=0;
|
||||
char record[MAX_REC_LENGTH];
|
||||
char read_record[MAX_REC_LENGTH];
|
||||
int upd=10;
|
||||
ha_rows hrows;
|
||||
|
||||
|
||||
@@ -343,7 +342,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;
|
||||
@@ -356,8 +358,12 @@ 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)
|
||||
|
||||
static void print_record(char * record,
|
||||
my_off_t offs __attribute__((unused)),
|
||||
const char * tail)
|
||||
{
|
||||
int i;
|
||||
char * pos;
|
||||
|
Reference in New Issue
Block a user