Commit 0bbd660c authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

merged

parents c0b4b236 42712018

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
Sinisa@sinisa.nasamreza.org

davida@isil.mysql.com

heikki@donna.mysql.fi

jani@hynda.mysql.fi

jani@janikt.pp.saunalahti.fi

Docs/manual.texi

+382 −258

File changed.

Preview size limit exceeded, changes collapsed.

myisam/ft_update.c

+4 −0
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ int _mi_ft_cmp(MI_INFO *info, uint keynr, const byte *rec1, const byte *rec2) 
      memcpy_fixed(&pos2,pos2+keyseg->bit_start,sizeof(char*));

      set_if_smaller(len2,keyseg->length);

    }

    else /* fixed length key */

    {

      len1=len2=keyseg->length;

    }

    if ((len1 != len2) || memcmp(pos1, pos2, len1))

      return THOSE_TWO_DAMN_KEYS_ARE_REALLY_DIFFERENT;

  }

sql/log.cc

+4 −1
Original line number Diff line number Diff line
@@ -820,10 +820,13 @@ bool MYSQL_LOG::write(Load_log_event* event_info) 
	VOID(pthread_cond_broadcast(&COND_binlog_update));

      }

    }

    

    if(should_rotate)

      new_file(1); // inside mutex

    

    VOID(pthread_mutex_unlock(&LOCK_log));

  }



  return error;

}

sql/mysqld.cc

+1 −1

File changed.

Contains only whitespace changes.

sql/sql_class.h

+1 −1

File changed.

Contains only whitespace changes.