Commit 22a73084 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/my/mysql-4.1
parents 23095e27 d2810c56

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -2370,7 +2370,7 @@ static int do_show_master_status(MYSQL *mysql_con) 
    {

      /* SHOW MASTER STATUS reports nothing and --force is not enabled */

      my_printf_error(0, "Error: Binlogging on server not active", 

		      MYF(0), mysql_error(mysql_con));

		      MYF(0));

      mysql_free_result(master);

      return 1;

    }

client/mysqltest.c

+1 −0
Original line number Diff line number Diff line
@@ -2654,6 +2654,7 @@ 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 */

      LINT_INIT(affected_rows);



      if (res)

      {

myisam/ft_boolean_search.c

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) 
  MI_INFO *info=ftb->info;

  uint off, extra=HA_FT_WLEN+info->s->base.rec_reflength;

  byte *lastkey_buf=ftbw->word+ftbw->off;

  LINT_INIT(off);



  if (ftbw->flags & FTB_FLAG_TRUNC)

    lastkey_buf+=ftbw->len;

myisammrg/myrg_static.c

+1 −1
Original line number Diff line number Diff line
@@ -27,4 +27,4 @@ LIST *myrg_open_list=0; 
static const char *merge_insert_methods[] =

{ "FIRST", "LAST", NullS };

TYPELIB merge_insert_method= { array_elements(merge_insert_methods)-1,"",

			       merge_insert_methods};
 
			       merge_insert_methods, 0};

mysql-test/r/rpl_drop_temp.result

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ create temporary table mysqltest.t2 (n int); 
show status like 'Slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	0

drop database mysqltest;