Commit 00c41b28 authored by unknown's avatar unknown
Browse files

Fix to make Windows compilation smoother 


VC++Files/innobase/innobase.dsp:
  non-existent file removed
client/mysql.cc:
  local opt_max_allowed_packet and opt_net_buffer_length introduced
client/mysqldump.c:
  local opt_max_allowed_packet and opt_net_buffer_length introduced
include/mysql.h:
  mysql_get_parameters() interface added
  #define max_allowed_packet added
include/mysql_com.h:
  these should not be exported
libmysql/libmysql.c:
  mysql_get_parameters implementations
libmysql/libmysql.def:
  interface changed
libmysql_r/Makefile.am:
  MYSQL_CLIENT define added
libmysqld/lib_sql.cc:
  line moved to be above the '#include "mysql.cc"'
libmysqld/libmysqld.c:
  mysql_get_parameters implementation (embedded)
libmysqld/libmysqld.def:
  interface changed
sql/log_event.cc:
  should be like that in this case
tools/mysqlmanager.c:
  compiler warns on this line
parent 3b1dd9af

VC++Files/innobase/innobase.dsp

+0 −4
Original line number Diff line number Diff line
@@ -368,10 +368,6 @@ SOURCE=.\row\row0vers.c 
# End Source File

# Begin Source File



SOURCE=.\srv\srv0que.c

# End Source File

# Begin Source File



SOURCE=.\srv\srv0srv.c

# End Source File

# Begin Source File

client/mysql.cc

+12 −4
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static my_bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0, 
	       vertical=0, line_numbers=1, column_names=1,opt_html=0,

               opt_xml=0,opt_nopager=1, opt_outfile=0, named_cmds= 0,

               tty_password= 0, opt_nobeep=0;

static ulong opt_max_allowed_packet, opt_net_buffer_length;

static uint verbose=0,opt_silent=0,opt_mysql_port=0, opt_local_infile=0;

static my_string opt_mysql_unix_port=0;

static int connect_flag=CLIENT_INTERACTIVE;
@@ -330,7 +331,7 @@ int main(int argc,char *argv[]) 
    exit(1);

  }

  if (status.batch && !status.line_buff &&

      !(status.line_buff=batch_readline_init(max_allowed_packet+512,stdin)))

      !(status.line_buff=batch_readline_init(opt_max_allowed_packet+512,stdin)))

  {

    free_defaults(defaults_argv);

    exit(1);
@@ -573,11 +574,11 @@ static struct my_option my_long_options[] = 
   (gptr*) &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 0, 0, 3600*12, 0,

   0, 1},

  {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET, "",

   (gptr*) &max_allowed_packet, (gptr*) &max_allowed_packet, 0, GET_ULONG,

   (gptr*) &opt_max_allowed_packet, (gptr*) &opt_max_allowed_packet, 0, GET_ULONG,

   REQUIRED_ARG, 16 *1024L*1024L, 4096, (longlong) 2*1024L*1024L*1024L,

   MALLOC_OVERHEAD, 1024, 0},

  {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",

   (gptr*) &net_buffer_length, (gptr*) &net_buffer_length, 0, GET_ULONG,

   (gptr*) &opt_net_buffer_length, (gptr*) &opt_net_buffer_length, 0, GET_ULONG,

   REQUIRED_ARG, 16384, 1024, 512*1024*1024L, MALLOC_OVERHEAD, 1024, 0},

  {"select_limit", OPT_SELECT_LIMIT, "", (gptr*) &select_limit,

   (gptr*) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 0},
@@ -738,6 +739,7 @@ static int get_options(int argc, char **argv) 
{

  char *tmp, *pagpoint;

  int ho_error;

  MYSQL_PARAMETERS *mysql_params= mysql_get_parameters();



  tmp= (char *) getenv("MYSQL_HOST");

  if (tmp)
@@ -753,9 +755,15 @@ static int get_options(int argc, char **argv) 
    strmov(pager, pagpoint);

  strmov(default_pager, pager);



  opt_max_allowed_packet= *mysql_params->p_max_allowed_packet;

  opt_net_buffer_length= *mysql_params->p_net_buffer_length;



  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))

    exit(ho_error);



  *mysql_params->p_max_allowed_packet= opt_max_allowed_packet;

  *mysql_params->p_net_buffer_length= opt_net_buffer_length;



  if (status.batch) /* disable pager and outfile in this case */

  {

    strmov(default_pager, "stdout");
@@ -2164,7 +2172,7 @@ static int com_source(String *buffer, char *line) 
    return put_info(buff, INFO_ERROR, 0);

  }



  if (!(line_buff=batch_readline_init(max_allowed_packet+512,sql_file)))

  if (!(line_buff=batch_readline_init(opt_max_allowed_packet+512,sql_file)))

  {

    my_fclose(sql_file,MYF(0));

    return put_info("Can't initialize batch_readline", INFO_ERROR, 0);

client/mysqldump.c

+10 −3
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static my_bool verbose=0,tFlag=0,cFlag=0,dFlag=0,quick=0, extended_insert = 0, 
  opt_autocommit=0,opt_master_data,opt_disable_keys=0,opt_xml=0,

  opt_delete_master_logs=0, tty_password=0,

  opt_single_transaction=0, opt_comments= 0;

static ulong opt_max_allowed_packet, opt_net_buffer_length;

static MYSQL  mysql_connection,*sock=0;

static char  insert_pat[12 * 1024],*opt_password=0,*current_user=0,

             *current_host=0,*path=0,*fields_terminated=0,
@@ -87,7 +88,6 @@ static char insert_pat[12 * 1024],*opt_password=0,*current_user=0, 
static uint     opt_mysql_port=0;

static my_string opt_mysql_unix_port=0;

static int   first_error=0;

extern ulong net_buffer_length;

static DYNAMIC_STRING extended_row;

#include <sslopt-vars.h>

FILE  *md_result_file;
@@ -238,11 +238,11 @@ static struct my_option my_long_options[] = 
  {"xml", 'X', "Dump a database as well formed XML.", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET, "",

    (gptr*) &max_allowed_packet, (gptr*) &max_allowed_packet, 0,

    (gptr*) &opt_max_allowed_packet, (gptr*) &opt_max_allowed_packet, 0,

    GET_ULONG, REQUIRED_ARG, 24*1024*1024, 4096, 

   (longlong) 2L*1024L*1024L*1024L, MALLOC_OVERHEAD, 1024, 0},

  {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",

    (gptr*) &net_buffer_length, (gptr*) &net_buffer_length, 0,

    (gptr*) &opt_net_buffer_length, (gptr*) &opt_net_buffer_length, 0,

    GET_ULONG, REQUIRED_ARG, 1024*1024L-1025, 4096, 16*1024L*1024L,

    MALLOC_OVERHEAD-1024, 1024, 0},

  {"comments", 'i', "Write additional information.",
@@ -405,6 +405,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
static int get_options(int *argc, char ***argv)

{

  int ho_error;

  MYSQL_PARAMETERS *mysql_params= mysql_get_parameters();



  opt_max_allowed_packet= *mysql_params->p_max_allowed_packet;

  opt_net_buffer_length= *mysql_params->p_net_buffer_length;



  md_result_file= stdout;

  load_defaults("my",load_default_groups,argc,argv);
@@ -412,6 +416,9 @@ static int get_options(int *argc, char ***argv) 
  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))

    exit(ho_error);



  *mysql_params->p_max_allowed_packet= opt_max_allowed_packet;

  *mysql_params->p_net_buffer_length= opt_net_buffer_length;



  if (opt_delayed)

    opt_lock=0;				/* Can't have lock with delayed */

  if (!path && (enclosed || opt_enclosed || escaped || lines_terminated ||

include/mysql.h

+13 −0
Original line number Diff line number Diff line
@@ -244,6 +244,17 @@ typedef struct st_mysql_manager 
  char last_error[MAX_MYSQL_MANAGER_ERR];

} MYSQL_MANAGER;



typedef struct st_mysql_parameters

{

  unsigned long *p_max_allowed_packet;

  unsigned long *p_net_buffer_length;

} MYSQL_PARAMETERS;



#if !defined(MYSQL_CLIENT) && !defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)

#define max_allowed_packet (*mysql_get_parameters()->p_max_allowed_packet)

#define net_buffer_length (*mysql_get_parameters()->p_net_buffer_length)

#endif



/*

  Set up and bring down the server; to ensure that applications will

  work when linked against either the standard client library or the
@@ -252,6 +263,8 @@ typedef struct st_mysql_manager 
int STDCALL mysql_server_init(int argc, char **argv, char **groups);

void STDCALL mysql_server_end(void);



MYSQL_PARAMETERS *STDCALL mysql_get_parameters();



/*

  Set up and bring down a thread; these function should be called

  for each thread in an application which opens at least one MySQL

include/mysql_com.h

+0 −9
Original line number Diff line number Diff line
@@ -34,12 +34,6 @@ 
#define MYSQL_SERVICENAME "MySQL"

#endif /* __WIN__ */



#if defined(__WIN__) && !defined(MYSQL_SERVER) && !defined(MYSQL_CLIENT) && !defined(EMBEDDED_LIBRARY)

#define dll_import_spec __declspec( dllimport )

#else

#define dll_import_spec

#endif



enum enum_server_command {

  COM_SLEEP, COM_QUIT, COM_INIT_DB, COM_QUERY, COM_FIELD_LIST,

  COM_CREATE_DB, COM_DROP_DB, COM_REFRESH, COM_SHUTDOWN,  COM_STATISTICS,
@@ -229,9 +223,6 @@ typedef struct st_udf_init 
extern "C" {

#endif



dll_import_spec extern unsigned long max_allowed_packet;

dll_import_spec extern unsigned long net_buffer_length;



void randominit(struct rand_struct *,unsigned long seed1,

		unsigned long seed2);

double my_rnd(struct rand_struct *);