← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lock.cc

Merged from Felipe

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
1635
1635
{
1636
1636
  TABLE_LIST    *tlist;
1637
1637
  int           result= 0;
1638
 
  char          warn_buff[MYSQL_ERRMSG_SIZE];
 
1638
  char          warn_buff[DRIZZLE_ERRMSG_SIZE];
1639
1639
 
1640
1640
  for (tlist= table_list; tlist; tlist= tlist->next_global)
1641
1641
  {
1671
1671
    /* Warn about the conversion. */
1672
1672
    snprintf(warn_buff, sizeof(warn_buff), ER(ER_WARN_AUTO_CONVERT_LOCK),
1673
1673
             tlist->alias ? tlist->alias : tlist->table_name);
1674
 
    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
1674
    push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1675
1675
                 ER_WARN_AUTO_CONVERT_LOCK, warn_buff);
1676
1676
  }
1677
1677