Commit 0f28f7a4 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

keep bk happy

parent 8a9b1e92

Docs/manual.texi

+5 −0
Original line number Diff line number Diff line
@@ -40712,6 +40712,11 @@ not yet 100 % confident in this code. 
@appendixsubsec Changes in release 3.23.32

@itemize @bullet

@item

Fixed bug in @code{SHOW LOGS} when there wheren't any BDB logs.

@item

Fixed a timing problem in replication that could delay sending an update

to the client until a new update was done.

@item

Don't convert field names when using @code{mysql_list_fields()}.  This is

to keep this code compatible with @code{SHOW FIELDS}.

@item

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov 
#--

wait_for_server_start ()

 {

   $MYSQL -e "select 1" --silent -w1 --host=127.0.0.1 --port=$1 \

   $MYSQL --no-defaults -u $DBUSER -e "select 1" --silent -w1 --host=127.0.0.1 --port=$1 \

    >/dev/null

 }
@@ -492,7 +492,7 @@ mysql_restart () { 


mysql_loadstd () {

    

    cp $STD_DATA/*.frm $STD_DATA/*.MRG $MASTER_MYDDIR/test  

    # cp $STD_DATA/*.frm $STD_DATA/*.MRG $MASTER_MYDDIR/test  

    return 1

}

sql/ha_berkeley.cc

+33 −27
Original line number Diff line number Diff line
@@ -253,15 +253,19 @@ int berkeley_show_logs(THD *thd) 
  {

    DBUG_PRINT("error", ("log_archive failed (error %d)", error));

    db_env->err(db_env, error, "log_archive: DB_ARCH_ABS");

    if (error== DB_NOTFOUND)

      error=0;					// No log files

    goto err;

  }



  /* Error is 0 here */

  if (all_logs)

  {

    for (a = all_logs, f = free_logs; *a; ++a)

    {

      packet->length(0);

      net_store_data(packet,*a);

      net_store_data(packet,"BDB");

    if (*f && strcmp(*a, *f) == 0)

      if (f && *f && strcmp(*a, *f) == 0)

      {

	++f;

	net_store_data(packet, SHOW_LOG_STATUS_FREE);
@@ -270,10 +274,12 @@ int berkeley_show_logs(THD *thd) 
	net_store_data(packet, SHOW_LOG_STATUS_INUSE);



      if (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))

      {

	error=1;

	goto err;

      }

  error=0;



    }

  }

err:

  free_root(&show_logs_root,MYF(0));

  my_pthread_setspecific_ptr(THR_MALLOC,old_root);
@@ -1042,6 +1048,7 @@ int ha_berkeley::update_row(const byte * old_row, byte * new_row) 
  ulong thd_options = table->in_use ? table->in_use->options : 0;

  bool primary_key_changed;

  DBUG_ENTER("update_row");

  LINT_INIT(error);



  statistic_increment(ha_update_count,&LOCK_status);

  if (table->time_stamp)
@@ -1066,7 +1073,6 @@ int ha_berkeley::update_row(const byte * old_row, byte * new_row) 
  }



  sub_trans = transaction;

  LINT_INIT(error);

  for (uint retry=0 ; retry < berkeley_trans_retry ; retry++)

  {

    key_map changed_keys = 0;

sql/item_func.cc

+11 −7
Original line number Diff line number Diff line
@@ -1399,6 +1399,7 @@ longlong Item_master_pos_wait::val_int() 
  String *log_name = args[0]->val_str(&value);

  int event_count;

  

  null_value=0;

  if (thd->slave_thread || !log_name || !log_name->length())

  {

    null_value = 1;
@@ -1406,7 +1407,10 @@ longlong Item_master_pos_wait::val_int() 
  }

  ulong pos = (ulong)args[1]->val_int();

  if ((event_count = glob_mi.wait_for_pos(thd, log_name, pos)) == -1)

    null_value = 1;;

  {

    null_value = 1;

    event_count=0;

  }

  return event_count;

}

sql/mini_client.cc

+4 −4
Original line number Diff line number Diff line
@@ -298,9 +298,9 @@ static int mc_sock_connect(my_socket s, const struct sockaddr *name, 
    return(-1);



  if (s_err)

  {						/* getsockopt() could suceed */

  {						// getsockopt() could succeed

    errno = s_err;

    return(-1);					/* but return an error... */

    return(-1);					// but return an error...

  }

  return(0);					/* It's all good! */

#endif
@@ -403,8 +403,8 @@ my_bool STDCALL mc_mysql_reconnect(MYSQL *mysql) 




int STDCALL

mc_simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,

	       uint length, my_bool skipp_check)

mc_simple_command(MYSQL *mysql,enum enum_server_command command,

		  const char *arg, uint length, my_bool skipp_check)

{

  NET *net= &mysql->net;

  int result= -1;