bk commit into 5.2 tree (cbell:1.2553)

Below is the list of changes that have just been committed into a local 5.2 repository of cbell. When cbell 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.2553, 2007-06-30 22:15:07-04:00, cbell@mysql_cab_desk. +2 -0   WL#3570 : Default backup   

  Minor refactoring to cleanup code comprehension and avoid possible future   pitfalls. Removed unnecessary code left in a from previous patch.

  extra/yassl/yassl.vcproj@1.8, 2007-06-30 22:15:02-04:00, cbell@mysql_cab_desk. +215 -118     WL#3570 : Default backup     

    Minor refactoring to cleanup code comprehension and avoid possible future     pitfalls. Removed unnecessary code left in a from previous patch.

  sql/backup/be_default.cc@1.7, 2007-06-30 22:15:02-04:00, cbell@mysql_cab_desk. +3 -5     WL#3570 : Default backup     

    Minor refactoring to cleanup code comprehension and avoid possible future     pitfalls. Removed unnecessary code left in a from previous patch.

# 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: cbell
# Host: mysql_cab_desk.
# Root: C:/source/c++/mysql-5.2_WL_3776

• 1.6/sql/backup/be_default.cc 2007-06-30 22:15:14 -04:00 +++ 1.7/sql/backup/be_default.cc 2007-06-30 22:15:14 -04:00 @@ -435,6 +435,8 @@ size_t bb_size= 0;

Do you need help?

In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software: Learn more about Pantek's Technical Support offerings Place an order for 24/7/365 Technical Support here Learn more about Pantek, who we are, and what we do Chat with a Live Operator Related lists.mysql.com Links announce benchmarks bugs certification cluster commits dotnet gui-tools internals java maxdb myodbc mysql mysqldoc packagers perl plusplus replication win32 Request more information about Pantek

     bb_size= blob_buffer.get_next((byte **)&ptr, (buf.size - META_SIZE)); + memcpy((byte *)buf.data + META_SIZE, ptr, bb_size); + buf.size = bb_size + META_SIZE;

     if (blob_buffer.num_windows(buf.size - META_SIZE) == 0)
     {
       *buf.data= BLOB_LAST;
@@ -442,9 +444,7 @@
       blob_buffer.reset();     // dump the memory 
     }
     else
-      *buf.data= 1;

+      *buf.data= BLOB_DATA;
     break;

@@ -693,9 +693,7 @@

       {
         if (size == cur_table->s->reclength)
         {
-          ptr= (byte *)my_malloc(size, MYF(MY_WME));
           memcpy(cur_table->record[0], (byte *)buf.data + META_SIZE, size);
-          my_free(ptr, MYF(0));
           mode= CHECK_BLOBS;
           DBUG_RETURN(PROCESSING);
         }

--- 1.7/extra/yassl/yassl.vcproj	2007-06-30 22:15:14 -04:00
+++ 1.8/extra/yassl/yassl.vcproj	2007-06-30 22:15:14 -04:00

-
+
 
+	SccLocalPath=""
+	Keyword="Win32Proj">
 	
 		
@@ -12,197 +14,292 @@
 	
 		
 			
Do you need more help?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek