Commit b399594a authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents 23ce2f51 3bff5b59

client/mysql.cc

+1 −0
Original line number Diff line number Diff line
@@ -1125,6 +1125,7 @@ int main(int argc,char *argv[]) 
  }

  if (mysql_server_init(emb_argc, emb_argv, (char**) server_default_groups))

  {

    put_error(NULL);

    free_defaults(defaults_argv);

    my_end(0);

    exit(1);

client/mysqldump.c

+1 −0
Original line number Diff line number Diff line
@@ -3306,6 +3306,7 @@ static int do_show_master_status(MYSQL *mysql_con) 
      my_printf_error(0, "Error: Binlogging on server not active",

                      MYF(0));

      mysql_free_result(master);

      maybe_exit(EX_MYSQLERR);

      return 1;

    }

    mysql_free_result(master);

include/sql_common.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 




extern const char	*unknown_sqlstate;

extern const char	*cant_connect_sqlstate;

extern const char	*not_error_sqlstate;



#ifdef	__cplusplus

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -1486,7 +1486,7 @@ my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql) 


const char *STDCALL mysql_sqlstate(MYSQL *mysql)

{

  return mysql->net.sqlstate;

  return mysql ? mysql->net.sqlstate : cant_connect_sqlstate;

}



uint STDCALL mysql_warning_count(MYSQL *mysql)

libmysqld/lib_sql.cc

+10 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ C_MODE_START 
#include <sql_common.h>

#include "embedded_priv.h"



extern unsigned int mysql_server_last_errno;

extern char mysql_server_last_error[MYSQL_ERRMSG_SIZE];

static my_bool emb_read_query_result(MYSQL *mysql);
@@ -1084,3 +1086,11 @@ bool Protocol::net_store_data(const char *from, uint length) 
  return false;

}





void vprint_msg_to_log(enum loglevel level __attribute__((unused)),

                       const char *format, va_list argsi)

{

  vsnprintf(mysql_server_last_error, sizeof(mysql_server_last_error),

           format, argsi);

  mysql_server_last_errno= CR_UNKNOWN_ERROR;

}