Commit c06f995b authored by unknown's avatar unknown
Browse files

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

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
parents 114197b5 25226de9

.bzrignore

+7 −0
Original line number Diff line number Diff line
@@ -1323,3 +1323,10 @@ win/vs8cache.txt 
zlib/*.ds?

zlib/*.vcproj

mysql-test/r/*.warnings

bdb/dist/db.h

bdb/dist/db_config.h

bdb/dist/db_cxx.h

bdb/dist/db_int.h

bdb/dist/include.tcl

*.gcda

*.gcno

client/mysql.cc

+0 −2
Original line number Diff line number Diff line
@@ -2397,7 +2397,6 @@ print_table_data(MYSQL_RES *result) 
      const char *buffer;

      uint data_length;

      uint field_max_length;

      bool right_justified;

      uint visible_length;

      uint extra_padding;
@@ -3446,7 +3445,6 @@ server_version_string(MYSQL *mysql) 
  {

    char *bufp = buf;

    MYSQL_RES *result;

    MYSQL_ROW cur;



    bufp = strnmov(buf, mysql_get_server_info(mysql), sizeof buf);

client/mysqldump.c

+2 −2
Original line number Diff line number Diff line
@@ -1419,7 +1419,7 @@ static uint dump_routines_for_db(char *db) 
            routine body of other routines that are not the creator of!

          */

          DBUG_PRINT("info",("length of body for %s row[2] '%s' is %d",

                             routine_name, row[2], strlen(row[2])));

                             routine_name, row[2], (int) strlen(row[2])));

          if (strlen(row[2]))

          {

            char *query_str= NULL;
@@ -2001,7 +2001,7 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
    write_footer(sql_file);

    my_fclose(sql_file, MYF(MY_WME));

  }

  DBUG_RETURN(num_fields);

  DBUG_RETURN((uint) num_fields);

} /* get_table_structure */

client/mysqltest.c

+9 −8
Original line number Diff line number Diff line
@@ -948,8 +948,8 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname) 
    die(NullS);

  if (!eval_result && (uint) stat_info.st_size != ds->length)

  {

    DBUG_PRINT("info",("Size differs:  result size: %u  file size: %llu",

		       ds->length, stat_info.st_size));

    DBUG_PRINT("info",("Size differs:  result size: %u  file size: %lu",

		       ds->length, (ulong) stat_info.st_size));

    DBUG_PRINT("info",("result: '%s'", ds->str));

    DBUG_RETURN(RESULT_LENGTH_MISMATCH);

  }
@@ -3132,14 +3132,15 @@ void do_connect(struct st_command *command) 
    else if (!strncmp(con_options, "COMPRESS", 8))

      con_compress= 1;

    else

      die("Illegal option to connect: %.*s", end - con_options, con_options);

      die("Illegal option to connect: %.*s", 

          (int) (end - con_options), con_options);

    /* Process next option */

    con_options= end;

  }



  if (next_con == connections_end)

    die("Connection limit exhausted, you can have max %d connections",

        (sizeof(connections)/sizeof(struct st_connection)));

        (int) (sizeof(connections)/sizeof(struct st_connection)));



  if (find_connection_by_name(ds_connection_name.str))

    die("Connection %s already exists", ds_connection_name.str);
@@ -3460,10 +3461,10 @@ int read_line(char *buf, int size) 
	DBUG_RETURN(0);

      }

      else if ((c == '{' &&

                (!my_strnncoll_simple(charset_info, "while", 5,

                                      buf, min(5, p - buf), 0) ||

                 !my_strnncoll_simple(charset_info, "if", 2,

                                      buf, min(2, p - buf), 0))))

                (!my_strnncoll_simple(charset_info, (const uchar*) "while", 5,

                                      (uchar*) buf, min(5, p - buf), 0) ||

                 !my_strnncoll_simple(charset_info, (const uchar*) "if", 2,

                                      (uchar*) buf, min(2, p - buf), 0))))

      {

        /* Only if and while commands can be terminated by { */

        *p++= c;

cmd-line-utils/readline/bind.c

+3 −1
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ rl_generic_bind (type, keyseq, data, map) 
  KEYMAP_ENTRY k;



  k.function = 0;

  k.type= 0;



  /* If no keys to bind to, exit right away. */

  if (!keyseq || !*keyseq)
@@ -735,7 +736,8 @@ _rl_read_file (filename, sizep) 
  file_size = (size_t)finfo.st_size;



  /* check for overflow on very large files */

  if (file_size != finfo.st_size || file_size + 1 < file_size)

  if ((long long) file_size != (long long) finfo.st_size ||

      file_size + 1 < file_size)

    {

      if (file >= 0)

	close (file);