List:Commits« Previous MessageNext Message »
From:tomas Date:January 2 2006 11:13am
Subject:bk commit into 5.1 tree (tomas:1.1982)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1982 06/01/02 12:13:05 tomas@stripped +2 -0
  correction of previous merge

  mysql-test/mysql-test-run.sh
    1.285 06/01/02 12:12:56 tomas@stripped +0 -1
    correction of previous merge

  include/my_base.h
    1.78 06/01/02 12:12:56 tomas@stripped +2 -2
    correction of previous merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-v5

--- 1.77/include/my_base.h	2005-12-29 22:43:08 +01:00
+++ 1.78/include/my_base.h	2006-01-02 12:12:56 +01:00
@@ -153,9 +153,9 @@
     to overwrite entire row.
   */
   HA_EXTRA_KEYREAD_PRESERVE_FIELDS,
+  HA_EXTRA_MMAP,
   HA_EXTRA_IGNORE_NO_KEY,		/* Tuple not found don't rollback everything*/
-  HA_EXTRA_NO_IGNORE_NO_KEY,
-  HA_EXTRA_MMAP
+  HA_EXTRA_NO_IGNORE_NO_KEY
 };
 
 	/* The following is parameter to ha_panic() */

--- 1.284/mysql-test/mysql-test-run.sh	2005-12-29 21:16:17 +01:00
+++ 1.285/mysql-test/mysql-test-run.sh	2006-01-02 12:12:56 +01:00
@@ -745,7 +745,6 @@
  fi
  MYSQL_TEST="$CLIENT_BINDIR/mysqltest"
  MYSQL_CHECK="$CLIENT_BINDIR/mysqlcheck"
- MYSQL_DUMP="$CLIENT_BINDIR/mysqldump"
  MYSQL_SLAP="$CLIENT_BINDIR/mysqlslap"
  MYSQL_SHOW="$CLIENT_BINDIR/mysqlshow"
  MYSQL_IMPORT="$CLIENT_BINDIR/mysqlimport"
Thread
bk commit into 5.1 tree (tomas:1.1982)tomas2 Jan