From 3d76b4348e84dd33fec297c71853e695e31e9e08 Mon Sep 17 00:00:00 2001
From: "sasha@mysql.sashanet.com" <>
Date: Wed, 11 Apr 2001 19:38:02 -0600
Subject: [PATCH] BitKeeper/triggers/post-commit     use REAL_EMAIL
 myisam/mi_search.c     merged the dropped lines ignore junk in libmysqld
 directory

---
 .bzrignore                     | 70 ++++++++++++++++++++++++++++++++++
 BitKeeper/triggers/post-commit |  9 ++++-
 myisam/mi_search.c             |  3 ++
 3 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index 719b30a518e..a340aadc657 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -244,3 +244,73 @@ bdb/build_win32/libdb.rc
 bdb/db/crdel_auto.c
 bdb/db/db_auto.c
 bdb/dist/config.hin
+libmysqld/convert.cc
+libmysqld/derror.cc
+libmysqld/errmsg.c
+libmysqld/field.cc
+libmysqld/field_conv.cc
+libmysqld/filesort.cc
+libmysqld/get_password.c
+libmysqld/ha_berkeley.cc
+libmysqld/ha_heap.cc
+libmysqld/ha_isam.cc
+libmysqld/ha_isammrg.cc
+libmysqld/ha_myisam.cc
+libmysqld/ha_myisammrg.cc
+libmysqld/handler.cc
+libmysqld/hostname.cc
+libmysqld/init.cc
+libmysqld/item.cc
+libmysqld/item_buff.cc
+libmysqld/item_cmpfunc.cc
+libmysqld/item_create.cc
+libmysqld/item_func.cc
+libmysqld/item_strfunc.cc
+libmysqld/item_sum.cc
+libmysqld/item_timefunc.cc
+libmysqld/item_uniq.cc
+libmysqld/key.cc
+libmysqld/lock.cc
+libmysqld/log.cc
+libmysqld/log_event.cc
+libmysqld/md5.c
+libmysqld/mini_client.cc
+libmysqld/net_pkg.cc
+libmysqld/net_serv.cc
+libmysqld/opt_ft.cc
+libmysqld/opt_range.cc
+libmysqld/opt_sum.cc
+libmysqld/password.c
+libmysqld/procedure.cc
+libmysqld/records.cc
+libmysqld/slave.cc
+libmysqld/sql_acl.cc
+libmysqld/sql_analyse.cc
+libmysqld/sql_base.cc
+libmysqld/sql_cache.cc
+libmysqld/sql_class.cc
+libmysqld/sql_crypt.cc
+libmysqld/sql_db.cc
+libmysqld/sql_delete.cc
+libmysqld/sql_insert.cc
+libmysqld/sql_lex.cc
+libmysqld/sql_list.cc
+libmysqld/sql_load.cc
+libmysqld/sql_manager.cc
+libmysqld/sql_map.cc
+libmysqld/sql_parse.cc
+libmysqld/sql_rename.cc
+libmysqld/sql_repl.cc
+libmysqld/sql_select.cc
+libmysqld/sql_show.cc
+libmysqld/sql_string.cc
+libmysqld/sql_table.cc
+libmysqld/sql_test.cc
+libmysqld/sql_udf.cc
+libmysqld/sql_update.cc
+libmysqld/sql_yacc.cc
+libmysqld/table.cc
+libmysqld/thr_malloc.cc
+libmysqld/time.cc
+libmysqld/unireg.cc
+linked_libmysqld_sources
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index b4b37742872..bb1f235204a 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -5,6 +5,13 @@ TO=dev@mysql.com
 FROM=$USER@mysql.com
 LIMIT=10000
 
+if [ "$REAL_EMAIL" = "" ]
+then
+ echo "Warning: you must set REAL_EMAIL in your profile"
+else
+ FROM=$REAL_EMAIL 
+fi
+
 BK_STATUS=$BK_STATUS$BK_COMMIT
 
 if [ "$BK_STATUS" = OK ]
@@ -15,7 +22,7 @@ then
 List-ID: <bk.mysql>
 From: $FROM
 To: $TO
-Subject: bk commit
+Subject: bk commit - 4.0 tree
 
 EOF
   bk changes -v -r+
diff --git a/myisam/mi_search.c b/myisam/mi_search.c
index 206a30c307e..972f7fc5093 100644
--- a/myisam/mi_search.c
+++ b/myisam/mi_search.c
@@ -1110,6 +1110,9 @@ uint _mi_get_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag,
 	  key+=length;
 	}
 	memcpy(key,page,rest_length);
+	page+=rest_length;
+	key+=rest_length;
+	continue;
       }
       else
       {