← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/handler/handler0alter.cc

  • Committer: Mark Atwood
  • Date: 2009-01-05 04:37:22 UTC
  • mto: (758.1.1 devel)
  • mto: This revision was merged to the branch mainline in revision 759.
  • Revision ID: me@mark.atwood.name-20090105043722-03l4mzcxi4yjjjih
replace sql_print_error etc with errmsg_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/handler0alter.cc
232
232
                        const KEY&      key2 = key_info[i];
233
233
 
234
234
                        if (0 == strcmp(key.name, key2.name)) {
235
 
                                sql_print_error("InnoDB: key name `%s` appears"
 
235
                                errmsg_printf(ERRMSG_LVL_ERROR, "InnoDB: key name `%s` appears"
236
236
                                                " twice in CREATE INDEX\n",
237
237
                                                key.name);
238
238
 
273
273
                                        }
274
274
                                }
275
275
 
276
 
                                sql_print_error("InnoDB: MySQL is trying to"
 
276
                                errmsg_printf(ERRMSG_LVL_ERROR, "InnoDB: MySQL is trying to"
277
277
                                                " create a column prefix"
278
278
                                                " index field on an"
279
279
                                                " inappropriate data type."
293
293
                                        continue;
294
294
                                }
295
295
 
296
 
                                sql_print_error("InnoDB: column `%s`"
 
296
                                errmsg_printf(ERRMSG_LVL_ERROR, "InnoDB: column `%s`"
297
297
                                                " is not allowed to occur"
298
298
                                                " twice in index `%s`.\n",
299
299
                                                key_part1.field->field_name,
950
950
                        prebuilt->table, key->name);
951
951
 
952
952
                if (!index) {
953
 
                        sql_print_error("InnoDB could not find key n:o %u "
 
953
                        errmsg_printf(ERRMSG_LVL_ERROR, "InnoDB could not find key n:o %u "
954
954
                                        "with name %s for table %s",
955
955
                                        key_num[n_key],
956
956
                                        key ? key->name : "NULL",