bk commit into 5.0 tree (patg:1.1938)

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.0 repository of patg. When patg 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.1938 05/07/13 23:25:55 patg@stripped +1 -0
  Federated: Trying to commit resoutions

  sql/ha_federated.cc
    1.31 05/07/13 22:16:35 patg@stripped +12 -10
    Changes to the order of declaration that I saw needed to be made during a 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:	patg
# Host:	radha.local
# Root:	/Users/patg/mysql-5.0

--- 1.30/sql/ha_federated.cc	2005-07-13 02:19:33 +02:00
+++ 1.31/sql/ha_federated.cc	2005-07-13 22:16:35 +02:00
@@ -1547,23 +1547,22 @@
   uint all_fields_have_same_query_id= 1;
   ulong current_query_id= 1;
   ulong tmp_query_id= 1;
-  Field **field;
-
   char error_buffer[FEDERATED_QUERY_BUFFER_SIZE];
   char insert_buffer[FEDERATED_QUERY_BUFFER_SIZE];
   char values_buffer[FEDERATED_QUERY_BUFFER_SIZE];
   char insert_field_value_buffer[STRING_BUFFER_USUAL_SIZE];
+  Field **field;
 
   /* The main insert query string */
   String insert_string(insert_buffer, sizeof(insert_buffer), &my_charset_bin);
-  insert_string.length(0);
   /* The string containing the values to be added to the insert */
   String values_string(values_buffer, sizeof(values_buffer), &my_charset_bin);
-  values_string.length(0);
   /* The actual value of the field, to be added to the values_string */
   String insert_field_value_string(insert_field_value_buffer,
                                    sizeof(insert_field_value_buffer),
                                    &my_charset_bin);
+  values_string.length(0);
+  insert_string.length(0);
   insert_field_value_string.length(0);
 
   DBUG_ENTER("ha_federated::write_row");
@@ -1939,18 +1938,21 @@
 int ha_federated::index_read_idx(byte *buf, uint index, const byte *key,
                                  uint key_len, enum ha_rkey_function find_flag)
 {
+  int retval;
   char error_buffer[FEDERATED_QUERY_BUFFER_SIZE];
   char index_value[STRING_BUFFER_USUAL_SIZE];
   char key_value[STRING_BUFFER_USUAL_SIZE];
   char test_value[STRING_BUFFER_USUAL_SIZE];
-  int retval;
-  String index_string(index_value, sizeof(index_value), &my_charset_bin);
-  index_string.length(0);
-
   char sql_query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
-  String sql_query(sql_query_buffer, sizeof(sql_query_buffer), &my_charset_bin);
+  String index_string(index_value, 
+                      sizeof(index_value),
+                      &my_charset_bin);
+  String sql_query(sql_query_buffer,
+                   sizeof(sql_query_buffer),
+                   &my_charset_bin);
+
+  index_string.length(0);
   sql_query.length(0);
-  key_range range;
 
   DBUG_ENTER("ha_federated::index_read_idx");