Commit 70cf8240 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue 

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
parents 8a7e206d 9668198e

VC++Files/client/mysql.dsp

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ SOURCE=.\readline.cpp 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_conio.c

# End Source File

# Begin Source File



SOURCE=.\sql_string.cpp

# End Source File

# End Target

VC++Files/client/mysql_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ SOURCE=.\readline.cpp 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_conio.c

# End Source File

# Begin Source File



SOURCE=.\sql_string.cpp

# End Source File

# End Target

extra/yassl/src/handshake.cpp

+4 −4
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ int sendData(SSL& ssl, const void* buffer, int sz) 
        ssl.SetError(no_error);



    ssl.verfiyHandShakeComplete();

    if (ssl.GetError()) return 0;

    if (ssl.GetError()) return -1;

    int sent = 0;



    for (;;) {
@@ -891,7 +891,7 @@ int sendData(SSL& ssl, const void* buffer, int sz) 
        buildMessage(ssl, out, data);

        ssl.Send(out.get_buffer(), out.get_size());



        if (ssl.GetError()) return 0;

        if (ssl.GetError()) return -1;

        sent += len;

        if (sent == sz) break;

    }
@@ -918,14 +918,14 @@ int receiveData(SSL& ssl, Data& data) 
        ssl.SetError(no_error);



    ssl.verfiyHandShakeComplete();

    if (ssl.GetError()) return 0;

    if (ssl.GetError()) return -1;



    if (!ssl.bufferedData())

        processReply(ssl);

    ssl.fillData(data);

    ssl.useLog().ShowData(data.get_length());



    if (ssl.GetError()) return 0;

    if (ssl.GetError()) return -1;



    if (data.get_length() == 0 && ssl.getSocket().WouldBlock()) {

        ssl.SetError(YasslError(SSL_ERROR_WANT_READ));

extra/yassl/src/socket_wrapper.cpp

+11 −2
Original line number Diff line number Diff line
@@ -113,13 +113,22 @@ uint Socket::get_ready() const 


uint Socket::send(const byte* buf, unsigned int sz, int flags) const

{

    const byte* pos = buf;

    const byte* end = pos + sz;



    assert(socket_ != INVALID_SOCKET);

    int sent = ::send(socket_, reinterpret_cast<const char *>(buf), sz, flags);



    while (pos != end) {

        int sent = ::send(socket_, reinterpret_cast<const char *>(pos),

                          static_cast<int>(end - pos), flags);



    if (sent == -1)

        return 0;



    return sent;

        pos += sent;

    }



    return sz;

}

myisam/mi_check.c

+16 −18
Original line number Diff line number Diff line
@@ -453,25 +453,24 @@ int chk_key(MI_CHECK *param, register MI_INFO *info) 
    if ((uint) share->base.auto_key -1 == key)

    {

      /* Check that auto_increment key is bigger than max key value */

      ulonglong save_auto_value=info->s->state.auto_increment;

      info->s->state.auto_increment=0;

      ulonglong auto_increment;

      info->lastinx=key;

      _mi_read_key_record(info, 0L, info->rec_buff);

      update_auto_increment(info, info->rec_buff);

      if (info->s->state.auto_increment > save_auto_value)

      auto_increment= retrieve_auto_increment(info, info->rec_buff);

      if (auto_increment > info->s->state.auto_increment)

      {

	mi_check_print_warning(param,

			       "Auto-increment value: %s is smaller than max used value: %s",

			       llstr(save_auto_value,buff2),

			       llstr(info->s->state.auto_increment, buff));

        mi_check_print_warning(param, "Auto-increment value: %s is smaller "

                               "than max used value: %s",

                               llstr(info->s->state.auto_increment,buff2),

                               llstr(auto_increment, buff));

      }

      if (param->testflag & T_AUTO_INC)

      {

        set_if_bigger(info->s->state.auto_increment,

                      auto_increment);

        set_if_bigger(info->s->state.auto_increment,

                      param->auto_increment_value);

      }

      else

	info->s->state.auto_increment=save_auto_value;



      /* Check that there isn't a row with auto_increment = 0 in the table */

      mi_extra(info,HA_EXTRA_KEYREAD,0);
@@ -481,8 +480,8 @@ int chk_key(MI_CHECK *param, register MI_INFO *info) 
      {

	/* Don't count this as a real warning, as myisamchk can't correct it */

	uint save=param->warning_printed;

	mi_check_print_warning(param,

			       "Found row where the auto_increment column has the value 0");

        mi_check_print_warning(param, "Found row where the auto_increment "

                               "column has the value 0");

	param->warning_printed=save;

      }

      mi_extra(info,HA_EXTRA_NO_KEYREAD,0);
@@ -4099,11 +4098,10 @@ void update_auto_increment_key(MI_CHECK *param, MI_INFO *info, 
  }

  else

  {

    ulonglong auto_increment= (repair_only ? info->s->state.auto_increment :

			       param->auto_increment_value);

    info->s->state.auto_increment=0;

    update_auto_increment(info, record);

    ulonglong auto_increment= retrieve_auto_increment(info, record);

    set_if_bigger(info->s->state.auto_increment,auto_increment);

    if (!repair_only)

      set_if_bigger(info->s->state.auto_increment, param->auto_increment_value);

  }

  mi_extra(info,HA_EXTRA_NO_KEYREAD,0);

  my_free((char*) record, MYF(0));