From: Hakan Kuecuekyilmaz
Date: April 14 2009 9:14pm
Subject: bzr commit into mysql-6.0-falcon-team branch (hky:3125)
List-Archive: http://lists.mysql.com/commits/72071
Message-Id: <20090414211414.80ABF123889@lu0011.efendi.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_ip0FSced+7k1m+66vEd5aw)"

--Boundary_(ID_ip0FSced+7k1m+66vEd5aw)
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/hakan/work/mysql/mysql-6.0-falcon-team/ based on revid:hky@stripped

 3125 Hakan Kuecuekyilmaz	2009-04-14 [merge]
      Applying Kevin's changes.

    modified:
      storage/falcon/Record.cpp
=== modified file 'storage/falcon/Record.cpp'
--- a/storage/falcon/Record.cpp	2009-04-09 15:40:11 +0000
+++ b/storage/falcon/Record.cpp	2009-04-14 21:02:07 +0000
@@ -903,8 +903,6 @@ void Record::deleteData(bool now)
 {
 	if (data.record)
 		{
-		data.record = NULL;
-
 		switch (encoding)
 			{
 			case valueVector:
@@ -922,6 +920,8 @@ void Record::deleteData(bool now)
 				else
 					format->table->queueForDelete((char *) data.record);
 			}
+
+		data.record = NULL;
 		}
 }
 


--Boundary_(ID_ip0FSced+7k1m+66vEd5aw)
MIME-version: 1.0
Content-type: text/bzr-bundle;
 name="bzr/hky@stripped"; charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/hky@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: hky@stripped
# target_branch: file:///home/hakan/work/mysql/mysql-6.0-falcon-team/
# testament_sha1: 4719bc207c468ab9295501facbe0dbdc15e04188
# timestamp: 2009-04-14 23:14:14 +0200
# source_branch: file:///home/hakan/work/mysql/mysql-6.0-falcon-team-\
#   local-master/
# base_revision_id: hky@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbJDaRkAAqtfgEAwWeP//39P
lgC////wUAWe5sAUGzKSUAUElIyj1KeYmhono9IynqT01GepHlHqBmoN6UDmATATIwAjExMJhMEN
MTTASp6k9NVMj9KekGgyZNAGjQHqNGjIeoNDmATATIwAjExMJhMENMTTASSBGgTI0MgJNqPUnqeJ
pPTU0HqANPUtHvbRjsw3rP12HmUyfITkwpjKtn6pPiGTSYVcXE5G/efT9TNsK5qCRozQsYclPZdM
YkRcqUV6G5mmYuYsvdff60XbRb0jZ/jeCpoltOTjqyZ20CEgbWiGCF7sNpQayz13NbYx8GNg2lBG
2BpGgjs9TgUMzso7TAlmmAJB/hTegzLi84HuWJipGcyGwnVZs30JBSmSOJrB3Fml+AhqifwoAeeQ
5xyZRcaBhIxYckaYlIItGNSrNJqITQUGAwIr1EigerOpA63IKK71S02Hspg4mWILGVjRYRccCyuu
WgYR6K7BNJILrAdoZT1P6zfwjODVjBC1WLjqIn9oHhtHjzBXbr9LpYAJ5pQRQWsNFOS1XkigNbqi
URXjiwJmRy2nI/5V1CoMCkvIIr0jsmvIEywqKVuNprpoGeTYgSZ62M5IKnJ7IIDJTiNeeVZYTPgo
mKYHjqhi0PsV33OzDByhoQc5Mo4lLFoXUcYpzGMeZwreQNUxWnkz3bjaayqG3RQ1xUUl4MRN5ccT
Sa12K1VXWZsg0MaHnYK8wN1KtPMrHGPMqWsqR8liPMdYcnH3mWguBzjE1jjUbls0oLzMloHjqtLq
wRtTgczDix7xi1xkUlJSg1lEJLnEL6CScqUStVYqPHuDmeQdRkj5jI0mrsGoBtoyvWpHxYXuPqup
3jygcDORKBiiEmhAUIU0jpAkvahWVSpdq9r7ektDGK8jDpf1wtwdRmLMlpiQRLPzboGD2FY0W4qL
TlV1k5EgbEr5PgvpjeZk4ueZp1klERLuRttG5k27ig8DxGL0Kyk4no/qlsLTvPA2DDhioorPXkZU
m6XzMnhV8kgiXqwXoggnbxqrvKCkauhQSKykMSSIjEUcccyRN0c5jJ6TsI46Vrn5mCvVZFM4Nbou
0fV8lkCUIe280DFAbDcZdG6L1CviYDNbC5MLVA6BYg7jWfRhp68jvyOtC6ESFH3PuJewmQflkEct
J4cgKN4MIbBOKTL/ixImEHNyRkB57dyqDaRG4ykRBBYbTCcriIHpw9dPHxWoNZvjlYj3mn2KQwFP
BIcH9nJB2htNYchMvC03jcD+oPPUcVfZe5ZBPEvNxxSIBae9bjijnEN+xmBWitjH7cyBQbUA/vBM
QE6tTZmG/Wu42kIQIAyIqVIuAFv5JS4NwNG21cTFlM9EjedCUBnEa+gxidPNIMqTNEnLYcSoOFB8
ZlBmrNfidFh/BZS0xhlBIHJDjadg4AuXiUKQoDJyd3HAySiyBhO+EFNBtwQiQyZGCYReZRQT9qkq
RPFF4qizkqrZKxFC2mBmZmSH9xFcwtAvQPr1M9e2c7CwGLk/mTePcXhZlNPLlinEQOAyXYQO1UiM
NB8S28ZJ61WU71Yja+oCtSCLAwsvbT2xUwYikO1hugMq1FANMkiMF1WDQWREIsYzF4JA3aXxO40D
w5fUcsE0njVFpkUjGGwHBBppVCsTIixGBTGjY4PLyYS8e3w+9x3l84IrWVmngsOcWouJkkuR9UDz
gveWYHCkFseEQzgGRIzcQTzzAeP5oH6PEeTNg4uy+ic5cjEicleu+R/4u5IpwoSFkhtIyA==


--Boundary_(ID_ip0FSced+7k1m+66vEd5aw)--