bk commit into 5.0 tree (lars:1.2030)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann 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.2030 05/10/24 23:09:14 lars@stripped +1 -0
  Fixed enum numbering, patch 2

  sql/log_event.h
    1.119 05/10/24 23:08:51 lars@stripped +21 -11
    One enum value per line
    Fixed a mistake
    Added values to every line for strange compilers

# 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:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.0-enum-logtype

--- 1.118/sql/log_event.h	2005-10-24 19:06:05 +02:00
+++ 1.119/sql/log_event.h	2005-10-24 23:08:51 +02:00
@@ -403,9 +403,17 @@
     Every time you update this enum (when you add a type), you have to
     fix Format_description_log_event::Format_description_log_event().
   */
-  UNKNOWN_EVENT= 0, START_EVENT_V3= 1, QUERY_EVENT= 2, STOP_EVENT= 3,
-  ROTATE_EVENT= 4, INTVAR_EVENT= 5, LOAD_EVENT= 6, SLAVE_EVENT= 7,
-  CREATE_FILE_EVENT= 8, APPEND_BLOCK_EVENT= 9, EXEC_LOAD_EVENT= 10,
+  UNKNOWN_EVENT= 0,
+  START_EVENT_V3= 1,
+  QUERY_EVENT= 2,
+  STOP_EVENT= 3,
+  ROTATE_EVENT= 4,
+  INTVAR_EVENT= 5,
+  LOAD_EVENT= 6,
+  SLAVE_EVENT= 7,
+  CREATE_FILE_EVENT= 8,
+  APPEND_BLOCK_EVENT= 9,
+  EXEC_LOAD_EVENT= 10,
   DELETE_FILE_EVENT= 11,
   /*
     NEW_LOAD_EVENT is like LOAD_EVENT except that it has a longer
@@ -413,18 +421,20 @@
     same class (Load_log_event)
   */
   NEW_LOAD_EVENT= 12,
-  RAND_EVENT, USER_VAR_EVENT= 13,
-  FORMAT_DESCRIPTION_EVENT= 14,
-  XID_EVENT= 15,
-  BEGIN_LOAD_QUERY_EVENT= 16,
-  EXECUTE_LOAD_QUERY_EVENT= 17,
+  RAND_EVENT= 13,
+  USER_VAR_EVENT= 14,
+  FORMAT_DESCRIPTION_EVENT= 15,
+  XID_EVENT= 16,
+  BEGIN_LOAD_QUERY_EVENT= 17,
+  EXECUTE_LOAD_QUERY_EVENT= 18,
 
   /*
-    add new events here - right above this comment!
-    existing events should never change their numbers
+    Add new events here - right above this comment!
+    And change the ENUM_END_EVENT_MARKER below.
+    Existing events should never change their numbers
   */
 
-  ENUM_END_EVENT /* end marker */
+  ENUM_END_EVENT= 19 /* end marker */
 };
 
 /*