Commit 721b8f87 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/sql_class.h:
  Auto merged
parents fdf1a633 29ff97f8

client/mysqlbinlog.cc

+19 −0
Original line number Diff line number Diff line
@@ -1310,6 +1310,25 @@ static int dump_local_log_entries(const char* logname) 
  }

  else // reading from stdin;

  {

    /*

      Bug fix: #23735

      Author: Chuck Bell

      Description:

        Windows opens stdin in text mode by default. Certain characters

        such as CTRL-Z are interpeted as events and the read() method

        will stop. CTRL-Z is the EOF marker in Windows. to get past this

        you have to open stdin in binary mode. Setmode() is used to set

        stdin in binary mode. Errors on setting this mode result in

        halting the function and printing an error message to stderr.

    */

#if defined (__WIN__) || (_WIN64)

    if (_setmode(fileno(stdin), O_BINARY) == -1)

    {

       fprintf(stderr, "Could not set binary mode on stdin.\n");

       return 1;

    }

#endif



    if (init_io_cache(file, fileno(stdin), 0, READ_CACHE, (my_off_t) 0,

		      0, MYF(MY_WME | MY_NABP | MY_DONT_CHECK_FILESIZE)))

      return 1;

client/mysqltest.c

+9 −5
Original line number Diff line number Diff line
@@ -1246,7 +1246,9 @@ void var_set(const char *var_name, const char *var_name_end, 
      v->int_dirty= 0;

      v->str_val_len= strlen(v->str_val);

    }

    strxmov(buf, v->name, "=", v->str_val, NullS);

    my_snprintf(buf, sizeof(buf), "%.*s=%.*s",

                v->name_len, v->name,

                v->str_val_len, v->str_val);

    if (!(v->env_s= my_strdup(buf, MYF(MY_WME))))

      die("Out of memory");

    putenv(v->env_s);
@@ -4685,10 +4687,9 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, 
    }



    /*

      Store the result. If res is NULL, use mysql_field_count to

      determine if that was expected

      Store the result of the query if it will return any fields

    */

    if (!(res= mysql_store_result(mysql)) && mysql_field_count(mysql))

    if (mysql_field_count(mysql) && ((res= mysql_store_result(mysql)) == 0))

    {

      handle_error(command, mysql_errno(mysql), mysql_error(mysql),

		   mysql_sqlstate(mysql), ds);
@@ -4740,7 +4741,10 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, 
    }



    if (res)

    {

      mysql_free_result(res);

      res= 0;

    }

    counter++;

  } while (!(err= mysql_next_result(mysql)));

  if (err > 0)

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib

mysql-test/t/kill.test

+4 −1
Original line number Diff line number Diff line
@@ -76,11 +76,14 @@ insert into t2 select id from t1; 
create table t3 (kill_id int);

insert into t3 values(connection_id());



connect (conn2, localhost, root,,);

connection conn2;



connection conn1;

-- disable_result_log

send select id from t1 where id in (select distinct id from t2);

-- enable_result_log



connect (conn2, localhost, root,,);

connection conn2;

select ((@id := kill_id) - kill_id) from t3;

-- sleep 1

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ $CP mysql-test/t/*.def $BASE/mysql-test/t 
$CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \

    mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \

    mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \

    mysql-test/std_data/*.cnf \

    mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \

    $BASE/mysql-test/std_data

$CP mysql-test/t/*.test mysql-test/t/*.imtest \

    mysql-test/t/*.disabled mysql-test/t/*.opt \