← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ident.cc

Merged in latest plugin-slot-reorg.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ident.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
#include CSTDINT_H
21
22
#include <drizzled/show.h>
22
23
#include <drizzled/table.h>
23
24
#include <drizzled/current_session.h>
24
25
#include <drizzled/item/ident.h>
25
26
 
26
 
#include <cstdio>
27
 
 
28
27
using namespace std;
29
28
 
30
 
namespace drizzled
31
 
{
32
 
 
33
29
const uint32_t NO_CACHED_FIELD_INDEX= UINT32_MAX;
34
30
 
35
31
Item_ident::Item_ident(Name_resolution_context *context_arg,
66
62
 
67
63
void Item_ident::cleanup()
68
64
{
 
65
#ifdef CANT_BE_USED_AS_MEMORY_IS_FREED
 
66
                       db_name ? db_name : "(null)",
 
67
                       orig_db_name ? orig_db_name : "(null)",
 
68
                       table_name ? table_name : "(null)",
 
69
                       orig_table_name ? orig_table_name : "(null)",
 
70
                       field_name ? field_name : "(null)",
 
71
                       orig_field_name ? orig_field_name : "(null)"));
 
72
#endif
69
73
  Item::cleanup();
70
74
  db_name= orig_db_name;
71
75
  table_name= orig_table_name;
84
88
const char *Item_ident::full_name() const
85
89
{
86
90
  char *tmp;
87
 
        size_t tmp_len;
88
91
  if (!table_name || !field_name)
89
92
    return field_name ? field_name : name ? name : "tmp_field";
90
93
  if (db_name && db_name[0])
91
94
  {
92
 
    tmp_len= strlen(db_name)+strlen(table_name)+strlen(field_name)+3;
93
 
    tmp= (char*) memory::sql_alloc(tmp_len);
94
 
    snprintf(tmp, tmp_len, "%s.%s.%s",db_name,table_name,field_name);
 
95
    tmp=(char*) sql_alloc((uint32_t) strlen(db_name)+(uint32_t) strlen(table_name)+
 
96
                          (uint32_t) strlen(field_name)+3);
 
97
    sprintf(tmp,"%s.%s.%s",db_name,table_name,field_name);
95
98
  }
96
99
  else
97
100
  {
98
101
    if (table_name[0])
99
102
    {
100
 
      tmp_len=strlen(table_name)+strlen(field_name)+2;
101
 
      tmp= (char*) memory::sql_alloc(tmp_len);
102
 
      snprintf(tmp, tmp_len, "%s.%s", table_name, field_name);
 
103
      tmp= (char*) sql_alloc((uint32_t) strlen(table_name) +
 
104
                             (uint32_t) strlen(field_name) + 2);
 
105
      sprintf(tmp, "%s.%s", table_name, field_name);
103
106
    }
104
107
    else
105
108
      tmp= (char*) field_name;
174
177
 
175
178
String *Item_ident_for_show::val_str(String *str)
176
179
{
177
 
  return field->val_str_internal(str);
 
180
  return field->val_str(str);
178
181
}
179
182
 
180
183
 
191
194
  tmp_field->charsetnr= field->charset()->number;
192
195
  tmp_field->length=field->field_length;
193
196
  tmp_field->type=field->type();
194
 
  tmp_field->flags= field->getTable()->maybe_null ?
 
197
  tmp_field->flags= field->table->maybe_null ?
195
198
    (field->flags & ~NOT_NULL_FLAG) : field->flags;
196
199
  tmp_field->decimals= field->decimals();
197
200
}
198
201
 
199
 
} /* namespace drizzled */