← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/user_var_entry.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-09-17 00:08:20 UTC
  • mto: (1126.9.3 captain-20090915-01)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: osullivan.padraig@gmail.com-20090917000820-urd6p46qngi1okjp
Updated calls to some dtrace probes to cast the parameter to const char *
appropriately. Also, removed the additional variable in places that I was
using.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/user_var_entry.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
 
20
#include <drizzled/server_includes.h>
21
21
#include <drizzled/session.h>
22
 
#include "drizzled/internal/m_string.h"
23
 
 
24
 
namespace drizzled
25
 
{
 
22
#include CSTDINT_H
26
23
 
27
24
/** Get the value of a variable as a double. */
28
25
 
43
40
    return result;
44
41
  }
45
42
  case STRING_RESULT:
46
 
    return internal::my_atof(value);                      // This is null terminated
 
43
    return my_atof(value);                      // This is null terminated
47
44
  case ROW_RESULT:
48
45
    assert(1);                          // Impossible
49
46
    break;
73
70
  case STRING_RESULT:
74
71
  {
75
72
    int error;
76
 
    return internal::my_strtoll10(value, (char**) 0, &error);// String is null terminated
 
73
    return my_strtoll10(value, (char**) 0, &error);// String is null terminated
77
74
  }
78
75
  case ROW_RESULT:
79
76
    assert(1);                          // Impossible
161
158
    true    failure
162
159
*/
163
160
 
 
161
#define extra_size sizeof(double)
 
162
 
164
163
bool user_var_entry::update_hash(bool set_null, void *ptr, uint32_t arg_length,
165
164
                                 Item_result arg_type, const CHARSET_INFO * const cs, Derivation dv,
166
165
                                 bool unsigned_arg)
207
206
 
208
207
  return false;
209
208
}
210
 
 
211
 
} /* namespace drizzled */