After merge fixes

Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'


client/client_priv.h:
  Added option 'create_options' for mysqldump
client/mysqldump.c:
  Changed '--all' to '--create-options' as the old name was meaningless
innobase/buf/buf0buf.c:
  After merge fixes
innobase/buf/buf0lru.c:
  After merge fixes
innobase/buf/buf0rea.c:
  After merge fixes
innobase/dict/dict0load.c:
  After merge fixes
innobase/fil/fil0fil.c:
  After merge fixes
innobase/ibuf/ibuf0ibuf.c:
  After merge fixes
innobase/include/fil0fil.h:
  After merge fixes
innobase/include/row0mysql.h:
  After merge fixes
innobase/include/ut0mem.h:
  After merge fixes
innobase/log/log0recv.c:
  After merge fixes
innobase/row/row0mysql.c:
  After merge fixes
innobase/row/row0sel.c:
  After merge fixes
innobase/srv/srv0start.c:
  After merge fixes
innobase/sync/sync0rw.c:
  After merge fixes
innobase/sync/sync0sync.c:
  After merge fixes
myisam/ft_boolean_search.c:
  After merge fixes
myisam/ft_nlq_search.c:
  After merge fixes
mysql-test/r/mysqldump.result:
  After merge fixes
mysql-test/t/mysqldump.test:
  Make result file smaller
  Some new tests
sql/ha_innodb.cc:
  After merge fixes
sql/set_var.cc:
  Removed compiler warning
sql/slave.cc:
  After merge fixes
sql/slave.h:
  After merge fixes
sql/sql_show.cc:
  Type -> Engine

1 files changed, 1 insertions, 28 deletions

diff --git a/sql/slave.h b/sql/slave.h
index 549ceb5d42c..c925831d1a5 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -291,34 +291,7 @@ typedef struct st_relay_log_info
     event_relay_log_pos+= val;
   }
 
-  void inc_group_relay_log_pos(ulonglong val, ulonglong log_pos, bool skip_lock=0)
-  {
-    if (!skip_lock)
-      pthread_mutex_lock(&data_lock);
-    inc_event_relay_log_pos(val);
-    group_relay_log_pos= event_relay_log_pos;
-    strmake(group_relay_log_name,event_relay_log_name,
-            sizeof(group_relay_log_name)-1);
-
-    notify_group_relay_log_name_update();
-        
-    /*
-      If the slave does not support transactions and replicates a transaction,
-      users should not trust group_master_log_pos (which they can display with
-      SHOW SLAVE STATUS or read from relay-log.info), because to compute
-      group_master_log_pos the slave relies on log_pos stored in the master's
-      binlog, but if we are in a master's transaction these positions are always
-      the BEGIN's one (excepted for the COMMIT), so group_master_log_pos does
-      not advance as it should on the non-transactional slave (it advances by
-      big leaps, whereas it should advance by small leaps).
-    */
-    if (log_pos) // 3.23 binlogs don't have log_posx
-      group_master_log_pos= log_pos+ val;
-    pthread_cond_broadcast(&data_cond);
-    if (!skip_lock)
-      pthread_mutex_unlock(&data_lock);
-  }
-
+  void inc_group_relay_log_pos(ulonglong val, ulonglong log_pos, bool skip_lock=0);
   int wait_for_pos(THD* thd, String* log_name, longlong log_pos, 
 		   longlong timeout);
   void close_temporary_tables();