Commit 76fbe88b authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
parents c99091e6 d0a29f7b

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:

include/errmsg.h

+2 −1
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ extern const char *client_errors[]; /* Error messages */ 
#define CR_FETCH_CANCELED                       2050

#define CR_NO_DATA                              2051

#define CR_NO_STMT_METADATA                     2052

#define CR_ERROR_LAST  /*Copy last error nr:*/  2052

#define CR_NO_RESULT_SET                        2053

#define CR_ERROR_LAST  /*Copy last error nr:*/  2053

/* Add error numbers before CR_ERROR_LAST and change it accordingly. */