~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/log_event.cc

  • Committer: Monty Taylor
  • Date: 2008-07-11 15:49:04 UTC
  • mto: (77.6.1 glibclient-merge)
  • mto: This revision was merged to the branch mainline in revision 134.
  • Revision ID: monty@inaugust.com-20080711154904-nrtkef3bo1jvzrds
A crapton more warning cleanups (I turned on more warnings) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
1056
1056
    */
1057
1057
    if (description_event->event_type_permutation)
1058
1058
    {
1059
 
      int new_event_type= description_event->event_type_permutation[event_type];
1060
1059
      event_type= description_event->event_type_permutation[event_type];
1061
1060
    }
1062
1061
 
1744
1743
}
1745
1744
 
1746
1745
 
1747
 
static char const *
1748
 
code_name(int code)
1749
 
{
1750
 
  static char buf[255];
1751
 
  switch (code) {
1752
 
  case Q_FLAGS2_CODE: return "Q_FLAGS2_CODE";
1753
 
  case Q_SQL_MODE_CODE: return "Q_SQL_MODE_CODE";
1754
 
  case Q_CATALOG_CODE: return "Q_CATALOG_CODE";
1755
 
  case Q_AUTO_INCREMENT: return "Q_AUTO_INCREMENT";
1756
 
  case Q_CHARSET_CODE: return "Q_CHARSET_CODE";
1757
 
  case Q_TIME_ZONE_CODE: return "Q_TIME_ZONE_CODE";
1758
 
  case Q_CATALOG_NZ_CODE: return "Q_CATALOG_NZ_CODE";
1759
 
  case Q_LC_TIME_NAMES_CODE: return "Q_LC_TIME_NAMES_CODE";
1760
 
  case Q_CHARSET_DATABASE_CODE: return "Q_CHARSET_DATABASE_CODE";
1761
 
  }
1762
 
  sprintf(buf, "CODE#%d", code);
1763
 
  return buf;
1764
 
}
1765
 
 
1766
1746
/**
1767
1747
   Macro to check that there is enough space to read from memory.
1768
1748
 
1862
1842
      break;
1863
1843
    case Q_SQL_MODE_CODE:
1864
1844
    {
1865
 
      char buff[22];
1866
1845
      CHECK_SPACE(pos, end, 8);
1867
1846
      sql_mode_inited= 1;
1868
1847
      sql_mode= (ulong) uint8korr(pos); // QQ: Fix when sql_mode is ulonglong
3856
3835
   pos(pos_arg),ident_len(ident_len_arg ? ident_len_arg :
3857
3836
                          (uint) strlen(new_log_ident_arg)), flags(flags_arg)
3858
3837
{
3859
 
  char buff[22];
3860
3838
  if (flags & DUP_NAME)
3861
3839
    new_log_ident= my_strndup(new_log_ident_arg, ident_len, MYF(MY_WME));
3862
3840
  return;
3918
3896
*/
3919
3897
int Rotate_log_event::do_update_pos(Relay_log_info *rli)
3920
3898
{
3921
 
  char buf[32];
3922
 
 
3923
3899
  pthread_mutex_lock(&rli->data_lock);
3924
3900
  rli->event_relay_log_pos= my_b_tell(rli->cur_log);
3925
3901
  /*