Commit 7dac7062 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Changed relay_log_space to ulonglong 

Removed compiler warnings.
parent d3484f88

Build-tools/Do-compile

+3 −1
Original line number Diff line number Diff line
@@ -123,7 +123,9 @@ if ($opt_stage == 0 && ! $opt_use_old_distribution) 
  system("touch timestamp");

  sleep(2);

  system("touch timestamp2");

  system("find . -newer timestamp -print | xargs touch; rm -f timestamp timestamp2");

  system("find . -newer timestamp -print | xargs touch");

  unlink("timestamp");

  unlink("timestamp2");

  sleep(2);

  # Ensure that files we don't want to rebuild are newer than other files

  safe_cd($ver);

include/mysql.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ typedef struct st_mysql_rows { 


typedef MYSQL_ROWS *MYSQL_ROW_OFFSET;	/* offset to current row */



#include <my_alloc.h>

#include "my_alloc.h"



typedef struct st_mysql_data {

  my_ulonglong rows;

mysql-test/t/innodb_handler.test

+10 −3
Original line number Diff line number Diff line
@@ -30,13 +30,15 @@ handler t2 read a next; 
handler t2 read a=(15);

handler t2 read a=(16);



!$1070 handler t2 read a=(19,"fff");

--error 1070

handler t2 read a=(19,"fff");



handler t2 read b=(19,"fff");

handler t2 read b=(19,"yyy");

handler t2 read b=(19);



!$1109 handler t1 read a last;

--error 1109

handler t1 read a last;



handler t2 read a=(11);

handler t2 read a>=(11);
@@ -60,9 +62,14 @@ handler t2 read a=(19) where b="yyy"; 


handler t2 read first;

handler t2 read next;

#

# We alter the table even if it's still in use by to test the Innodb

# delayed-drop code.  This will generate a warning in the master.err log.

#

alter table t1 type=innodb;

handler t2 read next;

!$1064 handler t2 read last;

--error 1064

handler t2 read last;



handler t2 close;

drop table if exists t1;

sql/mini_client.cc

+0 −4
Original line number Diff line number Diff line
@@ -73,10 +73,6 @@ extern "C" { // Because of SCO 3.2V4.2 
}



static void mc_free_rows(MYSQL_DATA *cur);

static MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,

		  	          my_bool default_value,

				  my_bool long_flag_protocol);



void mc_end_server(MYSQL *mysql);

static int mc_sock_connect(File s, const struct sockaddr *name, uint namelen, uint to);

static void mc_free_old_query(MYSQL *mysql);

sql/mysqld.cc

+3 −2
Original line number Diff line number Diff line
@@ -3619,8 +3619,9 @@ struct my_option my_long_options[] = 
   (gptr*) &max_system_variables.read_buff_size,0, GET_ULONG, REQUIRED_ARG,

   128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE, 0},

  {"relay_log_space_limit", OPT_RELAY_LOG_SPACE_LIMIT,

   "Undocumented", (gptr*) &relay_log_space_limit,

   (gptr*) &relay_log_space_limit, 0, GET_ULONG, REQUIRED_ARG, 0L, 0L,

   "Max space to use for all relay logs",

   (gptr*) &relay_log_space_limit,

   (gptr*) &relay_log_space_limit, 0, GET_ULL, REQUIRED_ARG, 0L, 0L,

   (longlong) ULONG_MAX, 0, 1, 0},

  {"slave_compressed_protocol", OPT_SLAVE_COMPRESSED_PROTOCOL,

   "Use compression on master/slave protocol",