← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ident.cc

Updated an include guard thanks to a nice catch during code review from Jay. Thanks Jay!

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>
25
26
 
26
27
using namespace std;
27
28
 
28
 
namespace drizzled
29
 
{
30
 
 
31
29
const uint32_t NO_CACHED_FIELD_INDEX= UINT32_MAX;
32
30
 
33
31
Item_ident::Item_ident(Name_resolution_context *context_arg,
82
80
const char *Item_ident::full_name() const
83
81
{
84
82
  char *tmp;
85
 
        size_t tmp_len;
86
83
  if (!table_name || !field_name)
87
84
    return field_name ? field_name : name ? name : "tmp_field";
88
85
  if (db_name && db_name[0])
89
86
  {
90
 
    tmp_len= strlen(db_name)+strlen(table_name)+strlen(field_name)+3;
91
 
    tmp= (char*) memory::sql_alloc(tmp_len);
92
 
    snprintf(tmp, tmp_len, "%s.%s.%s",db_name,table_name,field_name);
 
87
    tmp=(char*) sql_alloc((uint32_t) strlen(db_name)+(uint32_t) strlen(table_name)+
 
88
                          (uint32_t) strlen(field_name)+3);
 
89
    sprintf(tmp,"%s.%s.%s",db_name,table_name,field_name);
93
90
  }
94
91
  else
95
92
  {
96
93
    if (table_name[0])
97
94
    {
98
 
      tmp_len=strlen(table_name)+strlen(field_name)+2;
99
 
      tmp= (char*) memory::sql_alloc(tmp_len);
100
 
      snprintf(tmp, tmp_len, "%s.%s", table_name, field_name);
 
95
      tmp= (char*) sql_alloc((uint32_t) strlen(table_name) +
 
96
                             (uint32_t) strlen(field_name) + 2);
 
97
      sprintf(tmp, "%s.%s", table_name, field_name);
101
98
    }
102
99
    else
103
100
      tmp= (char*) field_name;
194
191
  tmp_field->decimals= field->decimals();
195
192
}
196
193
 
197
 
} /* namespace drizzled */