← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: brian
  • Date: 2008-08-01 17:27:37 UTC
  • mfrom: (261.1.6 drizzle)
  • Revision ID: brian@localhost.localdomain-20080801172737-v6f9pau23un0bwfl
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
1027
1027
    else
1028
1028
      llstr(val, buf);
1029
1029
 
1030
 
    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
1030
    push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1031
1031
                        ER_TRUNCATED_WRONG_VALUE,
1032
1032
                        ER(ER_TRUNCATED_WRONG_VALUE), name, buf);
1033
1033
  }
2005
2005
  {
2006
2006
    if (key_cache == dflt_key_cache)
2007
2007
    {
2008
 
      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 
2008
      push_warning_printf(thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
2009
2009
                          ER_WARN_CANT_DROP_DEFAULT_KEYCACHE,
2010
2010
                          ER(ER_WARN_CANT_DROP_DEFAULT_KEYCACHE));
2011
2011
      goto end;                                 // Ignore default key cache
2753
2753
 
2754
2754
  if (opt_sql_bin_update)
2755
2755
  {
2756
 
    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
2756
    push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
2757
2757
                 ER_UPDATE_LOG_DEPRECATED_TRANSLATED,
2758
2758
                 ER(ER_UPDATE_LOG_DEPRECATED_TRANSLATED));
2759
2759
  }
2760
2760
  else
2761
 
    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 
2761
    push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
2762
2762
                 ER_UPDATE_LOG_DEPRECATED_IGNORED,
2763
2763
                 ER(ER_UPDATE_LOG_DEPRECATED_IGNORED));
2764
2764
  set_option_bit(thd, var);
2776
2776
static uchar *get_warning_count(THD *thd)
2777
2777
{
2778
2778
  thd->sys_var_tmp.long_value=
2779
 
    (thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_NOTE] +
2780
 
     thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_ERROR] +
2781
 
     thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_WARN]);
 
2779
    (thd->warn_count[(uint) DRIZZLE_ERROR::WARN_LEVEL_NOTE] +
 
2780
     thd->warn_count[(uint) DRIZZLE_ERROR::WARN_LEVEL_ERROR] +
 
2781
     thd->warn_count[(uint) DRIZZLE_ERROR::WARN_LEVEL_WARN]);
2782
2782
  return (uchar*) &thd->sys_var_tmp.long_value;
2783
2783
}
2784
2784
 
2785
2785
static uchar *get_error_count(THD *thd)
2786
2786
{
2787
2787
  thd->sys_var_tmp.long_value= 
2788
 
    thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_ERROR];
 
2788
    thd->warn_count[(uint) DRIZZLE_ERROR::WARN_LEVEL_ERROR];
2789
2789
  return (uchar*) &thd->sys_var_tmp.long_value;
2790
2790
}
2791
2791