Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0

#include "buffer.h"

#include <m_string.h>

const uint Buffer::BUFFER_INITIAL_SIZE= 4096;

const uint Buffer::MAX_BUFFER_SIZE= 16777216;

/*

  Puts the given string to the buffer.

class Buffer

{

private:

  enum { BUFFER_INITIAL_SIZE= 4096 };

  static const uint BUFFER_INITIAL_SIZE;

  /* maximum buffer size is 16Mb */

  enum { MAX_BUFFER_SIZE= 16777216 };

  static const uint MAX_BUFFER_SIZE;

  size_t buffer_size;

  /* Error flag. Triggered if we get an error of some kind */

  int error;

int Set_option::correct_file(int skip)

{

  int error;

  const static int mysys_to_im_error[]= { 0, ER_OUT_OF_RESOURCES,

  static const int mysys_to_im_error[]= { 0, ER_OUT_OF_RESOURCES,

                                             ER_ACCESS_OPTION_FILE };

  int error;

  error= modify_defaults_file(Options::config_file, option,

                              option_value, instance_name, skip);

  */

  if (password[strlen(password)-2] == '\r')

    line_ending_len= 2;

  if (strlen(password) != SCRAMBLED_PASSWORD_CHAR_LENGTH + line_ending_len)

  if (strlen(password) != (uint) (SCRAMBLED_PASSWORD_CHAR_LENGTH +

                                  line_ending_len))

    goto err;

  memcpy(user, name_begin, user_length);