Commit 422cbb74 authored by unknown's avatar unknown
Browse files

Merge production:my/mysql-4.1-build 

into mysql.com:/home/mysqldev/tulin/mysql-4.1
parents 4734f3f7 c83412f7

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -1677,8 +1677,8 @@ then 
elif test "$with_debug" = "full"

then

  # Full debug. Very slow in some cases

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CXXFLAGS"

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"

sql/mysqld.cc

+2 −0
Original line number Diff line number Diff line
@@ -5215,6 +5215,7 @@ The minimum value for this variable is 4096.", 
   (gptr*) &sync_binlog_period,

   (gptr*) &sync_binlog_period, 0, GET_ULONG, REQUIRED_ARG, 0, 0, ~0L, 0, 1,

   0},

#ifdef DOES_NOTHING_YET

  {"sync-replication", OPT_SYNC_REPLICATION,

   "Enable synchronous replication",

   (gptr*) &global_system_variables.sync_replication,
@@ -5230,6 +5231,7 @@ The minimum value for this variable is 4096.", 
   (gptr*) &global_system_variables.sync_replication_timeout,

   (gptr*) &global_system_variables.sync_replication_timeout,

   0, GET_ULONG, REQUIRED_ARG, 10, 0, ~0L, 0, 1, 0},

#endif

  {"sync-frm", OPT_SYNC_FRM, "Sync .frm to disk on create. Enabled by default",

   (gptr*) &opt_sync_frm, (gptr*) &opt_sync_frm, 0, GET_BOOL, NO_ARG, 1, 0,

   0, 0, 0, 0},

sql/sql_update.cc

+7 −6
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int mysql_update(THD *thd, 
  bool		safe_update= thd->options & OPTION_SAFE_UPDATES;

  bool		used_key_is_modified, transactional_table, log_delayed;

  int		error=0;

  uint		used_index= MAX_KEY;

  uint		used_index;

#ifndef NO_EMBEDDED_ACCESS_CHECKS

  uint		want_privilege;

#endif
@@ -159,10 +159,11 @@ int mysql_update(THD *thd, 
  init_ftfuncs(thd, &thd->lex->select_lex, 1);

  /* Check if we are modifying a key that we are used to search with */

  if (select && select->quick)

  {

    used_index=select->quick->index;

    used_key_is_modified= (!select->quick->unique_key_range() &&

			   check_if_key_used(table,

					     (used_index=select->quick->index),

					     fields));

			   check_if_key_used(table, used_index, fields));

  }

  else if ((used_index=table->file->key_used_on_scan) < MAX_KEY)

    used_key_is_modified=check_if_key_used(table, used_index, fields);

  else