← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/field.cc

  • Committer: Stewart Smith
  • Date: 2008-12-18 23:54:47 UTC
  • mto: This revision was merged to the branch mainline in revision 719.
  • Revision ID: stewart@flamingspork.com-20081218235447-qf6dofgd6guwefo2
fix RENAME TABLE

(problem was missing hton to mysql_rename_table)

If engine implements table_exists_in_engine we get the hton from there.

Else, we reintroduce the mysql_frm_type hackery (temporarily, it *will* go away again with FRM removal).

also fix rename test: no views, plus current FLUSH LOCKS bug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/field.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
22
22
#include <drizzled/function/field.h>
23
23
#include <drizzled/item/cmpfunc.h>
24
24
 
25
25
// Conversion functions
26
26
 
27
 
namespace drizzled
28
 
{
29
 
 
30
27
int64_t Item_func_field::val_int()
31
28
{
32
29
  assert(fixed == 1);
56
53
  }
57
54
  else if (cmp_type == DECIMAL_RESULT)
58
55
  {
59
 
    type::Decimal dec_arg_buf, *dec_arg,
 
56
    my_decimal dec_arg_buf, *dec_arg,
60
57
               dec_buf, *dec= args[0]->val_decimal(&dec_buf);
61
58
    if (args[0]->null_value)
62
59
      return 0;
63
60
    for (uint32_t i=1; i < arg_count; i++)
64
61
    {
65
62
      dec_arg= args[i]->val_decimal(&dec_arg_buf);
66
 
      if (!args[i]->null_value && !class_decimal_cmp(dec_arg, dec))
 
63
      if (!args[i]->null_value && !my_decimal_cmp(dec_arg, dec))
67
64
        return (int64_t) (i);
68
65
    }
69
66
  }
90
87
  if (cmp_type == STRING_RESULT)
91
88
    agg_arg_charsets(cmp_collation, args, arg_count, MY_COLL_CMP_CONV, 1);
92
89
}
93
 
 
94
 
} /* namespace drizzled */