Commit f712a3d8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-4.1 

into mysql.com:/home/mydev/mysql-4.1-4100


sql/sql_select.cc:
  Auto merged
parents 27d28a29 ea279502

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1004,3 +1004,6 @@ vio/test-sslserver 
vio/viotest-ssl

tests/mysql_client_test

tests/mysql_client_test

libmysqld/examples/mysql_client_test.c

libmysqld/examples/mysql_client_test_embedded

libmysqld/examples/mysqltest_embedded

BUILD/SETUP.sh

+3 −0
Original line number Diff line number Diff line 
#!/bin/sh



if ! test -f sql/mysqld.cc

then

  echo "You must run this script from the MySQL top-level directory"
@@ -49,6 +51,7 @@ max_configs="$max_no_es_configs --with-embedded-server" 
alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

amd64_cflags="-DBIG_TABLES"

pentium_cflags="-mcpu=pentiumpro"

pentium64_cflags="-mcpu=nocona -m64"

ppc_cflags="-mpowerpc -mcpu=powerpc"

sparc_cflags=""

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

+13 −4
Original line number Diff line number Diff line
@@ -695,8 +695,12 @@ 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);

  }

  return local_mysql;

}
@@ -717,7 +721,12 @@ static int check_master_version(MYSQL* mysql) 


  if (mysql_query(mysql, "SELECT VERSION()") ||

      !(res = mysql_store_result(mysql)))

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

  {

    char errmsg[256];

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

    mysql_close(mysql);

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

  }

  if (!(row = mysql_fetch_row(res)))

  {

    mysql_free_result(res);

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);