Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

Docs/manual.texi:
  Auto merged

Docs/manual.texi

@@ -25511,12 +25511,13 @@ system:
 
 @itemize @bullet
 @item
-Upgrade both slave and master to Version 3.23.15 or higher. We recommend that
-you always use the latest release of Version 3.23 on both the slave and the
-master. While Version 3.23 is in beta, the versions may be not backwards
-compatible. In addition, the newer version will fix some bugs and add
-new features. Please, do not report bugs until you have verified that
-the problem is present in the latest release.
+Upgrade both slave and master to Version 3.23.15 or higher. We recommend
+that you always use the latest release of Version 3.23 on both the slave
+and the master. The binary log format has also changed a couple of times
+during development (before 3.23.29) so you should delete old binary logs
+when upgrading @strong{MySQL}. In addition, the newer version will fix
+some bugs and add new features. Please, do not report bugs until you
+have verified that the problem is present in the latest release.
 @item
 Set up special replication user(s) on the master with the @code{FILE}
 privilege and permission to connect from all the slaves. If the user is
@@ -25524,16 +25525,18 @@ only doing replication, you don't need to grant him other privileges.
 @item
 Take a snapshot of all the tables/databases on the master that could
 possibly be involved in the update queries before taking the next step.
-Starting in Version 3.23.21, there is a command that allows you to
-take a snapshot of a table on the master and copy it to the slave, called
-@code{LOAD TABLE FROM MASTER}. Until Version 3.23.23, though, it has a serious
-bug, and we recommend that you do not use it until you have upgraded.
+Starting in Version 3.23.21, there is a command that allows you to take
+a snapshot of a table on the master and copy it to the slave, called
+@code{LOAD TABLE FROM MASTER}. Until Version 3.23.23, though, it has a
+serious bug, and we recommend that you do not use it until you have
+upgraded.
 
 @item
-In @code{my.cnf} on the master add @code{log-bin} and restart it. Make
-sure there are no important updates to the master between the time you
-have taken the snapshot and the time the master is restarted with
-@code{log-bin} option.
+In @code{my.cnf} on the master add @code{log-bin} and
+@code{server-id=unique number} and restart it. Make sure there are no
+important updates to the master between the time you have taken the
+snapshot and the time the master is restarted with @code{log-bin}
+option.
 @item
 Load the snapshot of the master to all the slaves.
 @item
@@ -25543,17 +25546,11 @@ Add the following to @code{my.cnf} on the slave(s):
 master-host=<hostname of the master>
 master-user=<replication user name>
 master-password=<replication user password>
+server-id=<some unique number between 1 and 2^32-1>
 @end example
 
 replacing the values in <> with what is relevant to your system.
 
-Starting in Version 3.23.26, you must also have on both master and
-slave
-
-@example
-server-id=<some unique number between 1 and 2^32-1>
-@end example
-
 @code{server-id} must be different for each server participating in
 replication.  If you don't specify a server-id, it will be set to
 1 if you have not defined @code{master-host}, else it will be set to 2.
@@ -25565,6 +25562,17 @@ replication.  If you don't specify a server-id, it will be set to
 After you have done the above, the master and the slave(s) should be in
 sync.
 
+If you have forgot to set server-id for the slave you will get the following
+error in the error log file:
+
+@example
+Warning: one should set server_id to a non-0 value if master_host is set.
+The server will not act as a slave.
+@end example
+
+If you have forgot to do this for the master, the slaves will not be able to
+connect to the master.
+
 @cindex options, replication
 @cindex @code{my.cnf} file
 @cindex files,@code{my.cnf}
@@ -33620,7 +33628,7 @@ Drop or rename @code{old_table}.
 
 @cindex replication
 @menu
-* Log Replication::             Database replication with  update log
+* Log Replication::             Database replication with update log
 * Backup::                      Database backups
 * Update log::                  The update log
 * Binary log::                  The binary log
@@ -33637,12 +33645,13 @@ Now that master-slave internal replication is available starting in
 Version 3.23.15, this is the recommended way. @xref{Replication}.
 
 However, it is still possible to replicate a database by using the
-update log. @xref{Update log}. This requires one database that acts as a
-master (to which data changes are made) and one or more other databases
-that act as slaves. To update a slave, just run @code{mysql <
-update_log}.  Supply host, user, and password options that are
-appropriate for the slave database, and use the update log from the
-master database as input.
+update log or the binary log. @xref{Update log}. This requires one
+database that acts as a master (to which data changes are made) and one
+or more other databases that act as slaves. To update a slave, just run
+@code{mysql < update_log.*} or @code{mysqlbinlog binary_log.* | mysql}.
+Supply host, user, and password options that are appropriate for the
+slave database, and use the update log from the master database as
+input.
 
 If you never delete anything from a table, you can use a @code{TIMESTAMP}
 column to find out which rows have been inserted or changed in the table
@@ -33736,6 +33745,10 @@ a unique key value.
 @node Update log, Binary log, Backup, Common problems
 @section The Update Log
 
+@strong{NOTE}: The update log is replaced by the binary
+log. @xref{Binary log}.  With this you can do anything that you can do
+with the update log.
+
 When started with the @code{--log-update[=file_name]} option,
 @code{mysqld} writes a log file containing all SQL commands that update
 data. If no filename is given, it defaults to the name of the host
@@ -40005,6 +40018,9 @@ though, so Version 3.23 is not released as a stable version yet.
 @appendixsubsec Changes in release 3.23.30
 @itemize @bullet
 @item
+Changed BDB tables to not use internal subtransactions and reuse open files to
+get more speed.
+@item
 Added option @code{--mysqld=#} to @code{safe_mysqld}
 @item
 Allow hex constants in the @code{--fields-*-by} and

myisam/mi_info.c

@@ -57,7 +57,6 @@ int mi_status(MI_INFO *info, register MI_ISAMINFO *x, uint flag)
     x->index_file_length=info->state->key_file_length;
 
     x->keys	 	= share->state.header.keys;
-    x->key_map	 	= share->state.key_map;
     x->check_time	= share->state.check_time;
     x->mean_reclength	= info->state->records ?
       (ulong) (info->state->data_file_length-info->state->empty)/
@@ -87,6 +86,7 @@ int mi_status(MI_INFO *info, register MI_ISAMINFO *x, uint flag)
     x->raid_type= share->base.raid_type;
     x->raid_chunks= share->base.raid_chunks;
     x->raid_chunksize= share->base.raid_chunksize;
+    x->key_map	 	= share->state.key_map;
   }
   if ((flag & HA_STATUS_TIME) && !my_fstat(info->dfile,&state,MYF(0)))
     x->update_time=state.st_mtime;

scripts/safe_mysqld.sh

@@ -149,8 +149,10 @@ then
   fi
 fi
 
+USER=""
 if test -w /
 then
+  USER_OPTION="--user=$user"
   # If we are root, change the err log to the right user.
   touch $err_log; chown $user $err_log
   if test -n "$open_files"
@@ -211,9 +213,9 @@ do
   rm -f $MYSQL_UNIX_PORT $pid_file	# Some extra safety
   if test -z "$args"
   then
-    $NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR --user=$user --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1
+    $NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1
   else
-    eval "$NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR --user=$user --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ $args >> $err_log 2>&1"
+    eval "$NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ $args >> $err_log 2>&1"
   fi
   if test ! -f $pid_file		# This is removed if normal shutdown
   then

sql/ha_berkeley.cc

@@ -796,7 +796,8 @@ int ha_berkeley::write_row(byte * record)
   else
   {
     DB_TXN *sub_trans = transaction;
-    ulong thd_options = table->in_use->options;
+    /* Don't use sub transactions in temporary tables (in_use == 0) */
+    ulong thd_options = table->in_use ? table->in_use->options : 0;
     for (uint retry=0 ; retry < berkeley_trans_retry ; retry++)
     {
       key_map changed_keys = 0;
@@ -1014,7 +1015,7 @@ int ha_berkeley::update_row(const byte * old_row, byte * new_row)
   DBT prim_key, key, old_prim_key;
   int error;
   DB_TXN *sub_trans;
-  ulong thd_options = table->in_use->options;
+  ulong thd_options = table->in_use ? table->in_use->options : 0;
   bool primary_key_changed;
   DBUG_ENTER("update_row");
 
@@ -1112,23 +1113,6 @@ int ha_berkeley::update_row(const byte * old_row, byte * new_row)
 	  break;
 	}
       }
-#ifdef BROKEN_CODE_HERE
-      int new_error;
-      DBUG_PRINT("error",("Got error %d",error));
-      if (using_ignore && (thd_options & OPTION_INTERNAL_SUBTRANSACTIONS))
-      {
-	DBUG_PRINT("trans",("aborting subtransaction"));
-        new_error=txn_abort(sub_trans);
-      }
-      else if (changed_keys)
-	new_error=restore_keys(changed_keys, primary_key,
-			       old_row, old_prim_key, new_row, prim_key);
-      if (new_error)
-      {
-	error=new_error;			// This shouldn't happen
-	break;
-      }
-#endif
     }
     else if (using_ignore && (thd_options & OPTION_INTERNAL_SUBTRANSACTIONS))
     {
@@ -1227,7 +1211,7 @@ int ha_berkeley::delete_row(const byte * record)
   int error;
   DBT row, prim_key;
   key_map keys=table->keys_in_use;
-  ulong thd_options = table->in_use->options;
+  ulong thd_options = table->in_use ? table->in_use->options : 0;
   DBUG_ENTER("delete_row");
   statistic_increment(ha_delete_count,&LOCK_status);
 

sql/mysql_priv.h

@@ -164,7 +164,7 @@ void kill_one_thread(THD *thd, ulong id);
 #define OPTION_INTERNAL_SUBTRANSACTIONS OPTION_QUOTE_SHOW_CREATE*2
 
 /* Set if we are updating a non-transaction safe table */
-#define OPTION_STATUS_NO_TRANS_UPDATE OPTION_QUOTE_SHOW_CREATE*2
+#define OPTION_STATUS_NO_TRANS_UPDATE OPTION_INTERNAL_SUBTRANSACTIONS*2
 
 /* The following is set when parsing the query */
 #define QUERY_NO_INDEX_USED		OPTION_STATUS_NO_TRANS_UPDATE*2

sql/mysqld.cc

@@ -1120,8 +1120,8 @@ terribly wrong\n");
 	    *(ebp+17) : *(ebp+1));
     if (new_ebp <= ebp )
     {
-      fprintf(stderr, "New value of ebp failed sanity check\
-terminating backtrace\n");
+      fprintf(stderr, "\
+New value of ebp failed sanity check terminating backtrace\n");
       return;
     }
     ebp = new_ebp;
@@ -1626,14 +1626,14 @@ int main(int argc, char **argv)
 #ifdef EXTRA_DEBUG
     case 1:
       sql_print_error("\
-Warning: one should set server_id to a non-0 value if log-bin is enabled.\n\
-Will log updates to binary log, but will not accept connections from slaves");
+Warning: one should set server-id to a non-0 value if log-bin is enabled.\n\
+Will log updates to binary log, but will not accept connections from slaves.");
       break;
 #endif
     case 2:
       sql_print_error("\
-Warning: one should set server_id to a non-0 value if master_host is set.\n\
-The server will not act as a slave");
+Warning: one should set server-id to a non-0 value if master_host is set.\n\
+The server will not act as a slave.");
       break;
     }
   }