Commit 129c00b9 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 

into bk-internal.mysql.com:/data0/bk/mysql-4.1-cluster-extra


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents af5a042c 8c01aba7

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ magnus@neptunus.(none) 
magnus@shellback.(none)

marko@hundin.mysql.fi

mats@mysql.com

matt@booty.(none)

matt@mysql.com

matthias@three.local.lan

miguel@hegel.(none)
@@ -159,6 +160,7 @@ nick@nick.leippe.com 
papa@gbichot.local

patg@krsna.patg.net

paul@central.snake.net

paul@frost.snake.net

paul@ice.local

paul@ice.snake.net

paul@kite-hub.kitebird.com

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -1677,7 +1677,7 @@ static int com_server_help(String *buffer __attribute__((unused)), 
      if (num_fields == 2)

      {

	put_info("Many help items for your request exist.", INFO_INFO);

	put_info("To make a more specific request, please type 'help <item>',\nwhere item is one of the following", INFO_INFO);

	put_info("To make a more specific request, please type 'help <item>',\nwhere <item> is one of the following", INFO_INFO);

	num_name= 0;

	num_cat= 1;

	last_char= '_';
@@ -1685,7 +1685,7 @@ static int com_server_help(String *buffer __attribute__((unused)), 
      else if ((cur= mysql_fetch_row(result)))

      {

	tee_fprintf(PAGER, "You asked for help about help category: \"%s\"\n", cur[0]);

	put_info("For more information, type 'help <item>', where item is one of the following", INFO_INFO);

	put_info("For more information, type 'help <item>', where <item> is one of the following", INFO_INFO);

	num_name= 1;

	num_cat= 2;

	print_help_item(&cur,1,2,&last_char);

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -1914,7 +1914,7 @@ static int init_dumping(char *database) 
        sprintf(qbuf,"SHOW CREATE DATABASE IF NOT EXISTS %s",

		qdatabase);



        if (mysql_query_with_error_report(sock, &dbinfo, qbuf))

        if (mysql_query(sock, qbuf) || !(dbinfo = mysql_store_result(sock)))

        {

          /* Old server version, dump generic CREATE DATABASE */

	  fprintf(md_result_file,

libmysql/libmysql.c

+2 −1
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), 
    (void) signal(SIGPIPE, SIG_IGN);

#endif

#ifdef EMBEDDED_LIBRARY

    if (argc > -1)

       result= init_embedded_server(argc, argv, groups);

#endif

  }

libmysqld/lib_sql.cc

+1 −0
Original line number Diff line number Diff line
@@ -710,6 +710,7 @@ bool Protocol_prep::write() 
  }

  cur->data= (MYSQL_ROW)(((char *)cur) + sizeof(MYSQL_ROWS));

  memcpy(cur->data, packet->ptr()+1, packet->length()-1);

  cur->length= packet->length();       /* To allow us to do sanity checks */



  *data->prev_ptr= cur;

  data->prev_ptr= &cur->next;