MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Elliot Murphy Date:April 21 2006 5:20pm
Subject:bk commit into 5.1 tree (elliot:1.2348)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of emurphy. When emurphy 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.2348 06/04/21 13:20:15 elliot@stripped +8 -0
  Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2
  into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge

  sql/sql_class.h
    1.295 06/04/21 13:20:11 elliot@stripped +29 -25
    Manual merge 5.0 -> 5.1

  sql/set_var.cc
    1.183 06/04/21 13:20:11 elliot@stripped +39 -25
    Manual merge 5.0 -> 5.1

  sql/mysqld.cc
    1.558 06/04/21 13:20:11 elliot@stripped +59 -48
    Manual merge 5.0 -> 5.1

  sql/handler.h
    1.202 06/04/21 13:20:11 elliot@stripped +14 -13
    Manual merge 5.0 -> 5.1

  sql/handler.cc
    1.227 06/04/21 13:20:11 elliot@stripped +264 -36
    Manual merge 5.0 -> 5.1

  sql/ha_innodb.h
    1.119 06/04/21 13:20:11 elliot@stripped +3 -8
    Manual merge 5.0 -> 5.1

  sql/ha_innodb.cc
    1.269 06/04/21 13:20:11 elliot@stripped +133 -140
    Manual merge 5.0 -> 5.1

  sql/sql_repl.cc
    1.153 06/04/21 13:18:29 elliot@stripped +0 -0
    Auto merged

# 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:	elliot
# Host:	xan.(none)
# Root:	/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge/RESYNC

--- 1.152/sql/sql_repl.cc	2006-04-08 08:29:17 -04:00
+++ 1.153/sql/sql_repl.cc	2006-04-21 13:18:29 -04:00
@@ -694,7 +694,7 @@
 
       if (loop_breaker)
         break;
-      
+
       end_io_cache(&log);
       (void) my_close(file, MYF(MY_WME));
 
@@ -834,7 +834,7 @@
           /* Issuing warning then started without --skip-slave-start */
           if (!opt_skip_slave_start)
             push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
-                         ER_MISSING_SKIP_SLAVE, 
+                         ER_MISSING_SKIP_SLAVE,
                          ER(ER_MISSING_SKIP_SLAVE));
         }
 
@@ -860,7 +860,7 @@
     push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_SLAVE_WAS_RUNNING,
                  ER(ER_SLAVE_WAS_RUNNING));
   }
-  
+
   unlock_slave_threads(mi);
 
   if (slave_errno)
@@ -1023,7 +1023,7 @@
     slave_server_id     the slave's server id
 
 */
-  
+
 
 void kill_zombie_dump_threads(uint32 slave_server_id)
 {
@@ -1088,9 +1088,9 @@
   */
 
   /*
-    If the user specified host or port without binlog or position, 
+    If the user specified host or port without binlog or position,
     reset binlog's name to FIRST and position to 4.
-  */ 
+  */
 
   if ((lex_mi->host || lex_mi->port) && !lex_mi->log_file_name && !lex_mi->pos)
   {
@@ -1117,7 +1117,7 @@
     mi->port = lex_mi->port;
   if (lex_mi->connect_retry)
     mi->connect_retry = lex_mi->connect_retry;
- 
+
   if (lex_mi->ssl != LEX_MASTER_INFO::SSL_UNCHANGED)
     mi->ssl= (lex_mi->ssl == LEX_MASTER_INFO::SSL_ENABLE);
   if (lex_mi->ssl_ca)
@@ -1133,7 +1133,7 @@
 #ifndef HAVE_OPENSSL
   if (lex_mi->ssl || lex_mi->ssl_ca || lex_mi->ssl_capath ||
       lex_mi->ssl_cert || lex_mi->ssl_cipher || lex_mi->ssl_key )
-    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, 
+    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
                  ER_SLAVE_IGNORED_SSL_PARAMS, ER(ER_SLAVE_IGNORED_SSL_PARAMS));
 #endif
 
@@ -1500,7 +1500,7 @@
   }
 
   field_list.push_back(new Item_empty_string("Log_name", 255));
-  field_list.push_back(new Item_return_int("File_size", 20, 
+  field_list.push_back(new Item_return_int("File_size", 20,
                                            MYSQL_TYPE_LONGLONG));
   if (protocol->send_fields(&field_list,
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
Thread
bk commit into 5.1 tree (elliot:1.2348)Elliot Murphy21 Apr