← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/rpl_utility.cc

Removed my_vsnprintf and my_snprintf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/rpl_utility.cc
160
160
      DBUG_ASSERT(tsh->db.str && tsh->table_name.str);
161
161
      error= 1;
162
162
      char buf[256];
163
 
      my_snprintf(buf, sizeof(buf), "Column %d type mismatch - "
164
 
                  "received type %d, %s.%s has type %d",
165
 
                  col, type(col), tsh->db.str, tsh->table_name.str,
166
 
                  table->field[col]->type());
 
163
      snprintf(buf, sizeof(buf), "Column %d type mismatch - "
 
164
                "received type %d, %s.%s has type %d",
 
165
                col, type(col), tsh->db.str, tsh->table_name.str,
 
166
                table->field[col]->type());
167
167
      rli->report(ERROR_LEVEL, ER_BINLOG_ROW_WRONG_TABLE_DEF,
168
168
                  ER(ER_BINLOG_ROW_WRONG_TABLE_DEF), buf);
169
169
    }
175
175
    {
176
176
      error= 1;
177
177
      char buf[256];
178
 
      my_snprintf(buf, sizeof(buf), "Column %d size mismatch - "
179
 
                  "master has size %d, %s.%s on slave has size %d."
180
 
                  " Master's column size should be <= the slave's "
181
 
                  "column size.", col,
182
 
                  table->field[col]->pack_length_from_metadata(
183
 
                                       m_field_metadata[col]),
184
 
                  tsh->db.str, tsh->table_name.str, 
185
 
                  table->field[col]->row_pack_length());
 
178
      snprintf(buf, sizeof(buf), "Column %d size mismatch - "
 
179
               "master has size %d, %s.%s on slave has size %d."
 
180
               " Master's column size should be <= the slave's "
 
181
               "column size.", col,
 
182
               table->field[col]->pack_length_from_metadata(
 
183
                                    m_field_metadata[col]),
 
184
               tsh->db.str, tsh->table_name.str, 
 
185
               table->field[col]->row_pack_length());
186
186
      rli->report(ERROR_LEVEL, ER_BINLOG_ROW_WRONG_TABLE_DEF,
187
187
                  ER(ER_BINLOG_ROW_WRONG_TABLE_DEF), buf);
188
188
    }