← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/item_create.cc

  • Committer: Brian Aker
  • Date: 2008-07-13 02:23:24 UTC
  • mfrom: (138.1.1 remove-uuid-short)
  • Revision ID: brian@tangent.org-20080713022324-ejablzhzc8vhtw5x
Merge from Mark to remove short UUID

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/item_create.cc
1420
1420
};
1421
1421
 
1422
1422
 
1423
 
class Create_func_uuid_short : public Create_func_arg0
1424
 
{
1425
 
public:
1426
 
  virtual Item *create(THD *thd);
1427
 
 
1428
 
  static Create_func_uuid_short s_singleton;
1429
 
 
1430
 
protected:
1431
 
  Create_func_uuid_short() {}
1432
 
  virtual ~Create_func_uuid_short() {}
1433
 
};
1434
 
 
1435
 
 
1436
1423
class Create_func_version : public Create_func_arg0
1437
1424
{
1438
1425
public:
3040
3027
}
3041
3028
 
3042
3029
 
3043
 
Create_func_uuid_short Create_func_uuid_short::s_singleton;
3044
 
 
3045
 
Item*
3046
 
Create_func_uuid_short::create(THD *thd)
3047
 
{
3048
 
  thd->lex->set_stmt_unsafe();
3049
 
  return new (thd->mem_root) Item_func_uuid_short();
3050
 
}
3051
 
 
3052
 
 
3053
3030
Create_func_version Create_func_version::s_singleton;
3054
3031
 
3055
3032
Item*
3239
3216
  { { C_STRING_WITH_LEN("UNIX_TIMESTAMP") }, BUILDER(Create_func_unix_timestamp)},
3240
3217
  { { C_STRING_WITH_LEN("UPPER") }, BUILDER(Create_func_ucase)},
3241
3218
  { { C_STRING_WITH_LEN("UUID") }, BUILDER(Create_func_uuid)},
3242
 
  { { C_STRING_WITH_LEN("UUID_SHORT") }, BUILDER(Create_func_uuid_short)},
3243
3219
  { { C_STRING_WITH_LEN("VERSION") }, BUILDER(Create_func_version)},
3244
3220
  { { C_STRING_WITH_LEN("WEEKDAY") }, BUILDER(Create_func_weekday)},
3245
3221
  { { C_STRING_WITH_LEN("WEEKOFYEAR") }, BUILDER(Create_func_weekofyear)},