Commit 2e4b962d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 

into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype


sql/log_event.h:
  Auto merged
parents ee46cce8 d63b12d9

sql/log_event.h

+23 −12
Original line number Diff line number Diff line
@@ -403,27 +403,38 @@ enum Log_event_type 
    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, QUERY_EVENT, STOP_EVENT, ROTATE_EVENT,

  INTVAR_EVENT, LOAD_EVENT, SLAVE_EVENT, CREATE_FILE_EVENT,

  APPEND_BLOCK_EVENT, EXEC_LOAD_EVENT, DELETE_FILE_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,

  DELETE_FILE_EVENT= 11,

  /*

    NEW_LOAD_EVENT is like LOAD_EVENT except that it has a longer

    sql_ex, allowing multibyte TERMINATED BY etc; both types share the

    same class (Load_log_event)

  */

  NEW_LOAD_EVENT,

  RAND_EVENT, USER_VAR_EVENT,

  FORMAT_DESCRIPTION_EVENT,

  XID_EVENT,

  BEGIN_LOAD_QUERY_EVENT,

  EXECUTE_LOAD_QUERY_EVENT,

  NEW_LOAD_EVENT= 12,

  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 */

};



/*