Commit 9b1336fe authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/my/mysql-5.1


configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
sql/item_create.cc:
  manual merge
parents f8d8b3db e0aeba21

.bzrignore

+5 −0
Original line number Diff line number Diff line
@@ -212,6 +212,11 @@ bdb/dist/autom4te.cache/requests 
bdb/dist/autom4te.cache/traces.0

bdb/dist/config.hin

bdb/dist/configure

bdb/dist/db.h

bdb/dist/db_config.h

bdb/dist/db_cxx.h

bdb/dist/db_int.h

bdb/dist/include.tcl

bdb/dist/tags

bdb/dist/template/db_server_proc

bdb/dist/template/gen_client_ret

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ 
			@sql_union_dirs@ unittest storage plugin \

			@sql_server@ scripts @man_dirs@ tests \

			netware @libmysqld_dirs@ \

			mysql-test support-files @tools_dirs@ \

			mysql-test support-files sql-bench @tools_dirs@ \

			win



DIST_SUBDIRS =		$(SUBDIRS) BUILD

client/mysql.cc

+0 −1
Original line number Diff line number Diff line
@@ -3437,7 +3437,6 @@ server_version_string(MYSQL *mysql) 
  {

    char *bufp = buf;

    MYSQL_RES *result;

    MYSQL_ROW cur;



    bufp = strnmov(buf, mysql_get_server_info(mysql), sizeof buf);

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -2149,7 +2149,7 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
    write_footer(sql_file);

    my_fclose(sql_file, MYF(MY_WME));

  }

  DBUG_RETURN(num_fields);

  DBUG_RETURN((uint) num_fields);

} /* get_table_structure */

client/mysqlslap.c

+2 −0
Original line number Diff line number Diff line
@@ -979,7 +979,9 @@ drop_schema(MYSQL *mysql, const char *db) 
static int

run_scheduler(stats *sptr, statement *stmts, uint concur, ulonglong limit)

{

#ifndef __WIN__

  uint x;

#endif

  File lock_file;

  struct timeval start_time, end_time;

  thread_context con;