Commit 62b5893c authored by unknown's avatar unknown
Browse files

Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 

into  mysql.com:/home/my/mysql-5.0
parents 8ee22036 50bd97a9

client/mysqldump.c

+2 −2
Original line number Diff line number Diff line
@@ -2016,7 +2016,8 @@ static uint get_table_structure(char *table, char *db, char *table_type, 


*/



static void dump_triggers_for_table(char *table, char *db)

static void dump_triggers_for_table(char *table,

                                    char *db __attribute__((unused)))

{

  char       *result_table;

  char       name_buff[NAME_LEN*4+3], table_buff[NAME_LEN*2+3];
@@ -2025,7 +2026,6 @@ static void dump_triggers_for_table(char *table, char *db) 
  FILE       *sql_file= md_result_file;

  MYSQL_RES  *result;

  MYSQL_ROW  row;



  DBUG_ENTER("dump_triggers_for_table");

  DBUG_PRINT("enter", ("db: %s, table: %s", db, table));

client/mysqltest.c

+9 −8
Original line number Diff line number Diff line
@@ -1844,7 +1844,7 @@ void do_copy_file(struct st_command *command) 


void do_chmod_file(struct st_command *command)

{

  ulong mode= 0;

  long mode= 0;

  static DYNAMIC_STRING ds_mode;

  static DYNAMIC_STRING ds_file;

  const struct command_arg chmod_file_args[] = {
@@ -1864,7 +1864,7 @@ void do_chmod_file(struct st_command *command) 
    die("You must write a 4 digit octal number for mode");



  DBUG_PRINT("info", ("chmod %o %s", (uint)mode, ds_file.str));

  handle_command_error(command, chmod(ds_file.str, mode));

  handle_command_error(command, chmod(ds_file.str, (mode_t) mode));

  dynstr_free(&ds_mode);

  dynstr_free(&ds_file);

  DBUG_VOID_RETURN;
@@ -6275,7 +6275,8 @@ typedef struct st_replace_found { 




void replace_strings_append(REPLACE *rep, DYNAMIC_STRING* ds,

                            const char *str, int len)

                            const char *str,

                            int len __attribute__((unused)))

{

  reg1 REPLACE *rep_pos;

  reg2 REPLACE_STRING *rep_str;
@@ -6666,7 +6667,7 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern, 
        we need at least what we have so far in the buffer + the part

        before this match

      */

      need_buf_len= (res_p - buf) + subs[0].rm_so;

      need_buf_len= (res_p - buf) + (int) subs[0].rm_so;



      /* on this pass, calculate the memory for the result buffer */

      while (expr_p < replace_end)
@@ -6676,17 +6677,17 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern, 


        if (c == '\\' && expr_p + 1 < replace_end)

        {

          back_ref_num= expr_p[1] - '0';

          back_ref_num= (int) (expr_p[1] - '0');

        }



        /* found a valid back_ref (eg. \1)*/

        if (back_ref_num >= 0 && back_ref_num <= (int)r.re_nsub)

        {

          int start_off,end_off;

          regoff_t start_off, end_off;

          if ((start_off=subs[back_ref_num].rm_so) > -1 &&

              (end_off=subs[back_ref_num].rm_eo) > -1)

          {

            need_buf_len += (end_off - start_off);

            need_buf_len += (int) (end_off - start_off);

          }

          expr_p += 2;

        }
@@ -6706,7 +6707,7 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern, 
        /* copy the pre-match part */

        if (subs[0].rm_so)

        {

          memcpy(res_p, str_p, subs[0].rm_so);

          memcpy(res_p, str_p, (size_t) subs[0].rm_so);

          res_p+= subs[0].rm_so;

        }

cmd-line-utils/readline/xmalloc.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ xmalloc (bytes) 


  temp = malloc (bytes);

  if (temp == 0)

    memory_error_and_abort ("xmalloc");

    memory_error_and_abort ((char*) "xmalloc");

  return (temp);

}
@@ -71,7 +71,7 @@ xrealloc (pointer, bytes) 
  temp = pointer ? realloc (pointer, bytes) : malloc (bytes);



  if (temp == 0)

    memory_error_and_abort ("xrealloc");

    memory_error_and_abort ((char*) "xrealloc");

  return (temp);

}

extra/comp_err.c

+4 −0
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ static char *NAMEFILE= (char*) "mysqld_ername.h"; 
static char *STATEFILE= (char*) "sql_state.h";

static char *TXTFILE= (char*) "../sql/share/errmsg.txt";

static char *DATADIRECTORY= (char*) "../sql/share/";

#ifndef DBUG_OFF

static char *default_dbug_option= (char*) "d:t:O,/tmp/comp_err.trace";

#endif



/* Header for errmsg.sys files */

uchar file_head[]= { 254, 254, 2, 1 };
@@ -402,6 +404,8 @@ static int parse_input_file(const char *file_name, struct errors **top_error, 
  int rcount= 0;

  DBUG_ENTER("parse_input_file");



  *top_error= 0;

  *top_lang= 0;

  if (!(file= my_fopen(file_name, O_RDONLY | O_SHARE, MYF(MY_WME))))

    DBUG_RETURN(0);

extra/yassl/include/openssl/ssl.h

+6 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "opensslv.h" /* for version number */

#include "rsa.h"





#define YASSL_VERSION "1.5.8"
@@ -190,11 +189,16 @@ enum { /* ERR Constants */ 
    EVP_R_BAD_DECRYPT = 2

};



#ifdef WIN

    typedef SOCKET socket_t;

#else

    typedef int socket_t;

#endif





SSL_CTX* SSL_CTX_new(SSL_METHOD*);

SSL* SSL_new(SSL_CTX*);

int  SSL_set_fd (SSL*, int);

int  SSL_set_fd (SSL*, socket_t);

int  SSL_connect(SSL*);

int  SSL_write(SSL*, const void*, int);

int  SSL_read(SSL*, void*, int);