Commit 021cea21 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_db.cc:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
parents 2f48a591 675a5b77

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -943,6 +943,7 @@ ndb/src/common/mgmcommon/printConfig/*.d 
ndb/src/common/portlib/libportlib.dsp

ndb/src/common/transporter/libtransporter.dsp

ndb/src/common/util/libgeneral.dsp

ndb/src/common/util/testBitmask.cpp

ndb/src/cw/cpcd/ndb_cpcd

ndb/src/dummy.cpp

ndb/src/kernel/blocks/backup/libbackup.dsp

client/Makefile.am

+6 −6
Original line number Diff line number Diff line
@@ -64,11 +64,11 @@ mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ 
				$(top_builddir)/mysys/libmysys.a 

mysqlcheck_SOURCES=		mysqlcheck.c $(yassl_dummy_link_fix)

mysqlshow_SOURCES=		mysqlshow.c $(yassl_dummy_link_fix)

mysqlslap_SOURCES=		mysqlslap.c \

				$(yassl_dummy_link_fix)

mysqldump_SOURCES=		mysqldump.c my_user.c $(yassl_dummy_link_fix)

mysqlimport_SOURCES=		mysqlimport.c \

mysqlslap_SOURCES=		mysqlslap.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c my_user.c \

	                        $(top_srcdir)/mysys/mf_getdate.c \

                                $(yassl_dummy_link_fix)

mysqlimport_SOURCES=		mysqlimport.c $(yassl_dummy_link_fix)

mysql_upgrade_SOURCES=          mysql_upgrade.c $(yassl_dummy_link_fix)

sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c

client/mysql.cc

+4 −1
Original line number Diff line number Diff line
@@ -2884,7 +2884,7 @@ com_connect(String *buffer, char *line) 
  bzero(buff, sizeof(buff));

  if (buffer)

  {

    strmov(buff, line);

    strmake(buff, line, sizeof(buff));

    tmp= get_arg(buff, 0);

    if (tmp && *tmp)

    {
@@ -3738,6 +3738,9 @@ static const char* construct_prompt() 
      case 't':

	processed_prompt.append('\t');

	break;

      case 'l':

	processed_prompt.append(delimiter_str);

	break;

      default:

	processed_prompt.append(c);

      }

client/mysqlbinlog.cc

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
/* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */

#include "mysql_priv.h" 

#include "log_event.h"

#include "sql_common.h"



#define BIN_LOG_HEADER_SIZE	4

#define PROBE_HEADER_LEN	(EVENT_LEN_OFFSET+4)
@@ -1104,7 +1105,7 @@ could be out of memory"); 
    const char *error_msg;

    Log_event *ev;



    len = net_safe_read(mysql);

    len= cli_safe_read(mysql);

    if (len == packet_error)

    {

      fprintf(stderr, "Got error reading packet from server: %s\n",

client/mysqlcheck.c

+12 −4
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static int process_all_tables_in_db(char *database) 
  LINT_INIT(res);

  if (use_db(database))

    return 1;

  if (mysql_query(sock, "SHOW TABLES") ||

  if (mysql_query(sock, "SHOW TABLE STATUS") ||

	!((res= mysql_store_result(sock))))

    return 1;
@@ -500,10 +500,14 @@ static int process_all_tables_in_db(char *database) 
      return 1;

    }

    for (end = tables + 1; (row = mysql_fetch_row(res)) ;)

    {

      /* Skip tables with an engine of NULL (probably a view). */

      if (row[1])

      {

        end= fix_table_name(end, row[0]);

        *end++= ',';

      }

    }

    *--end = 0;

    if (tot_length)

      handle_request_for_tables(tables + 1, tot_length - 1);
@@ -512,8 +516,12 @@ static int process_all_tables_in_db(char *database) 
  else

  {

    while ((row = mysql_fetch_row(res)))

      /* Skip tables with an engine of NULL (probably a view). */

      if (row[1])

      {

        handle_request_for_tables(row[0], strlen(row[0]));

      }

  }

  mysql_free_result(res);

  return 0;

} /* process_all_tables_in_db */