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

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 15823a0b 5218404b

ndb/src/common/util/SocketClient.cpp

+2 −0
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ SocketClient::connect() 
  if (m_sockfd < 0)

  {

    if (!init()) {

#ifdef VM_TRACE

      ndbout << "SocketClient::connect() failed " << m_server_name << " " << m_port << endl;

#endif

      return -1;

    }

  }

scripts/mysql_install_db.sh

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ then 
fi

mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \

--skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \

--skip-bdb $args --max_allowed_packet=8M"

--skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M"

if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \

   | eval "$mysqld_install_cmd_line" 

then

sql/ha_ndbcluster.cc

+5 −6
Original line number Diff line number Diff line
@@ -1526,11 +1526,6 @@ int ha_ndbcluster::write_row(byte *record) 
  if (table->timestamp_default_now)

    update_timestamp(record+table->timestamp_default_now-1);

  has_auto_increment= (table->next_number_field && record == table->record[0]);

  skip_auto_increment=

    table->next_number_field &&

    table->next_number_field->val_int() != 0 ||

    table->auto_increment_field_not_null &&

    current_thd->variables.sql_mode & MODE_NO_AUTO_VALUE_ON_ZERO;



  if (!(op= trans->getNdbOperation((const NDBTAB *) m_table)))

    ERR_RETURN(trans->getNdbError());
@@ -1551,7 +1546,11 @@ int ha_ndbcluster::write_row(byte *record) 
    int res;



    if (has_auto_increment) 

    {

      skip_auto_increment= false;

      update_auto_increment();

      skip_auto_increment= !auto_increment_column_changed;

    }



    if ((res= set_primary_key(op)))

      return res;

sql/item.cc

+3 −1
Original line number Diff line number Diff line
@@ -1415,7 +1415,9 @@ void Item::init_make_field(Send_field *tmp_field, 
  tmp_field->table_name=	empty_name;

  tmp_field->col_name=		name;

  tmp_field->charsetnr=         collation.collation->number;

  tmp_field->flags=maybe_null ? 0 : NOT_NULL_FLAG;

  tmp_field->flags=             (maybe_null ? 0 : NOT_NULL_FLAG) | 

                                (my_binary_compare(collation.collation) ?

                                 BINARY_FLAG : 0);

  tmp_field->type=field_type;

  tmp_field->length=max_length;

  tmp_field->decimals=decimals;