← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.cc

  • Committer: Monty Taylor
  • Date: 2008-10-04 18:42:30 UTC
  • Revision ID: monty@inaugust.com-20081004184230-j2j1uottu2d0yl0m
Removed NullS. bu-bye.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log_event.cc
1759
1759
                                 const Format_description_log_event
1760
1760
                                 *description_event,
1761
1761
                                 Log_event_type event_type)
1762
 
  :Log_event(buf, description_event), data_buf(0), query(NullS),
1763
 
   db(NullS), catalog_len(0), status_vars_len(0),
 
1762
  :Log_event(buf, description_event), data_buf(0), query(NULL),
 
1763
   db(NULL), catalog_len(0), status_vars_len(0),
1764
1764
   flags2_inited(0), sql_mode_inited(0), charset_inited(0),
1765
1765
   auto_increment_increment(1), auto_increment_offset(1),
1766
1766
   time_zone_len(0), lc_time_names_number(0), charset_database_number(0)
4339
4339
      }
4340
4340
      else
4341
4341
      {
4342
 
        char *p= strxmov(buf + val_offset, "_", cs->csname, " ", NullS);
 
4342
        char *p= strxmov(buf + val_offset, "_", cs->csname, " ", NULL);
4343
4343
        p= str_to_hex(p, val, val_len);
4344
 
        p= strxmov(p, " COLLATE ", cs->name, NullS);
 
4344
        p= strxmov(p, " COLLATE ", cs->name, NULL);
4345
4345
        event_len= p-buf;
4346
4346
      }
4347
4347
      break;
6910
6910
                                     &m_dbnam, (uint) m_dblen + 1,
6911
6911
                                     &m_tblnam, (uint) m_tbllen + 1,
6912
6912
                                     &m_coltype, (uint) m_colcnt,
6913
 
                                     NullS);
 
6913
                                     NULL);
6914
6914
 
6915
6915
  if (m_memory)
6916
6916
  {
6975
6975
                                &table_list, (uint) sizeof(RPL_TableList),
6976
6976
                                &db_mem, (uint) NAME_LEN + 1,
6977
6977
                                &tname_mem, (uint) NAME_LEN + 1,
6978
 
                                NullS)))
 
6978
                                NULL)))
6979
6979
    return(HA_ERR_OUT_OF_MEM);
6980
6980
 
6981
6981
  memset(table_list, 0, sizeof(*table_list));