Commit aeda2652 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents db261667 3e029b36

BUILD/check-cpu

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ case "$cpu_family--$model_name" in 
  *Pentium*III*CPU*)

    cpu_flag="pentium3";

  ;;

  *Pentium*M*pro*)

    cpu_flag="pentium-m";

    cpu_flag_old="pentium";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

    cpu_flag_old="athlon";

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ pager: 
hours: 

[serg:]checkout:get

[arjen:]checkout:get

[kostja:]checkout:get

[nick:]checkout:get

checkout:edit

eoln:unix

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ kaa@polly.local 
kaj@work.mysql.com

kent@mysql.com

konstantin@mysql.com

kosipov@production.mysql.com

kostja@oak.local

lars@mysql.com

lenz@kallisto.mysql.com

client/mysqltest.c

+11 −2
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static void abort_not_supported_test() 
    printf("skipped\n");

  free_used_memory();

  my_end(MY_CHECK_ERROR);

  exit(2);

  exit(62);

}



static void verbose_msg(const char* fmt, ...)
@@ -2729,6 +2729,8 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) 


    if (!disable_result_log)

    {

      ulong affected_rows;    /* Ok to be undef if 'disable_info' is set */



      if (res)

      {

	MYSQL_FIELD *field= mysql_fetch_fields(res);
@@ -2750,6 +2752,13 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) 
	append_result(ds, res);

      }



      /*

        Need to call mysql_affected_rows() before the new

        query to find the warnings

      */

      if (!disable_info)

        affected_rows= (ulong)mysql_affected_rows(mysql);



      /*

        Add all warnings to the result. We can't do this if we are in

        the middle of processing results from multi-statement, because
@@ -2777,7 +2786,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) 
      if (!disable_info)

      {

	char buf[40];

	sprintf(buf,"affected rows: %lu\n",(ulong) mysql_affected_rows(mysql));

	sprintf(buf,"affected rows: %lu\n", affected_rows);

	dynstr_append(ds, buf);

	if (mysql_info(mysql))

	{

cmd-line-utils/libedit/vi.c

+1 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ vi_histedit(EditLine *el, int c) 
		return CC_ERROR;

	case 0:

		close(fd);

		execlp("vi", "vi", tempfile, 0);

		execlp("vi", "vi", tempfile, (char *) NULL);

		exit(0);

		/*NOTREACHED*/

	default: