Commit 68d32bc3 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/dlenev/src/mysql-5.0-bg7637


sql/mysqld.cc:
  Auto merged
parents 168f04bd b7d9b72a

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -382,8 +382,11 @@ libmysqld/examples/link_sources 
libmysqld/examples/my_readline.h

libmysqld/examples/mysql

libmysqld/examples/mysql.cc

libmysqld/examples/mysql_client_test.c

libmysqld/examples/mysql_client_test_embedded

libmysqld/examples/mysqltest

libmysqld/examples/mysqltest.c

libmysqld/examples/mysqltest_embedded

libmysqld/examples/readline.cc

libmysqld/examples/sql_string.cc

libmysqld/examples/sql_string.h

BUILD/compile-pentium64-debug

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium64_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $static_link"



extra_configs="$extra_configs "



. "$path/FINISH.sh"

client/mysqlbinlog.cc

+9 −6
Original line number Diff line number Diff line
@@ -752,9 +752,13 @@ static MYSQL* safe_connect() 
  if (opt_protocol)

    mysql_options(local_mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);

  if (!mysql_real_connect(local_mysql, host, user, pass, 0, port, sock, 0))

    die("failed on connect: %s", mysql_error(local_mysql));

  {

    char errmsg[256];

    strmake(errmsg, mysql_error(local_mysql), sizeof(errmsg)-1);

    mysql_close(local_mysql);

    die("failed on connect: %s", errmsg);

  }

  local_mysql->reconnect= 1;



  return local_mysql;

}
@@ -781,8 +785,7 @@ static int check_master_version(MYSQL* mysql, 
  if (mysql_query(mysql, "SELECT VERSION()") ||

      !(res = mysql_store_result(mysql)))

  {

    char errmsg[FN_REFLEN];



    char errmsg[256];

    strmake(errmsg, mysql_error(mysql), sizeof(errmsg)-1);

    mysql_close(mysql);

    die("Error checking master version: %s", errmsg);

include/m_ctype.h

+3 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ typedef struct my_collation_handler_st 
                         my_bool diff_if_only_endspace_difference);

  int     (*strnxfrm)(struct charset_info_st *,

		      uchar *, uint, const uchar *, uint);

  uint    (*strnxfrmlen)(struct charset_info_st *, uint); 

  my_bool (*like_range)(struct charset_info_st *,

			const char *s, uint s_length,

			pchar w_prefix, pchar w_one, pchar w_many,
@@ -260,6 +261,7 @@ extern CHARSET_INFO my_charset_cp1250_czech_ci; 
/* declarations for simple charsets */

extern int  my_strnxfrm_simple(CHARSET_INFO *, uchar *, uint, const uchar *,

                               uint); 

uint  my_strnxfrmlen_simple(CHARSET_INFO *, uint); 

extern int  my_strnncoll_simple(CHARSET_INFO *, const uchar *, uint,

				const uchar *, uint, my_bool);

innobase/include/eval0eval.ic

+0 −2
Original line number Diff line number Diff line
@@ -205,8 +205,6 @@ eval_node_copy_and_alloc_val( 
{

	byte*		data;

	

	ut_ad(UNIV_SQL_NULL > ULINT_MAX);



	if (len == UNIV_SQL_NULL) {

		dfield_set_len(que_node_get_val(node), len);