← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Brian Aker
  • Date: 2011-02-09 21:34:20 UTC
  • mfrom: (2148.5.17 alter-table)
  • mto: This revision was merged to the branch mainline in revision 2154.
  • Revision ID: brian@tangent.org-20110209213420-r7xcd8uulyvvtv2q
Merge parser tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
431
431
{
432
432
  if (fixed)
433
433
  {
434
 
    char buf[22];
 
434
    char buf[DECIMAL_LONGLONG_DIGITS];
435
435
 
436
436
    if (unsignd)
437
437
      internal::ullstr((uint64_t) val, buf);
1244
1244
  {
1245
1245
    if (!(locale_match= my_locale_by_number((uint32_t) var->value->val_int())))
1246
1246
    {
1247
 
      char buf[20];
 
1247
      char buf[DECIMAL_LONGLONG_DIGITS];
1248
1248
      internal::int10_to_str((int) var->value->val_int(), buf, -10);
1249
1249
      my_printf_error(ER_UNKNOWN_ERROR, "Unknown locale: '%s'", MYF(0), buf);
1250
1250
      return 1;