← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/utility_functions/schema.cc

  • Committer: Stewart Smith
  • Author(s): Marko Mäkelä, Stewart Smith
  • Date: 2010-12-06 04:20:58 UTC
  • mto: (2021.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1986.
  • Revision ID: stewart@flamingspork.com-20101206042058-kgr10dbz5jut838t
Merge Revision revid:marko.makela@oracle.com-20100909112752-ac5w7zyzbv10nvi1 from MySQL InnoDB

Original revid:marko.makela@oracle.com-20100909112752-ac5w7zyzbv10nvi1

Original Authors: Marko Mkel <marko.makela@oracle.com>
Original commit message:
Remove ut0auxconf.h.
It was needed when InnoDB Plugin was distributed independently of MySQL.
Approved by Vasil Dimov.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/utility_functions/schema.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
 *  Copyright (C) 2010 Stewart Smith
6
6
 *
7
7
 *  This program is free software; you can redistribute it and/or modify
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
 
23
23
#include <drizzled/session.h>
24
 
#include <plugin/utility_functions/functions.h>
 
24
#include "plugin/utility_functions/functions.h"
25
25
 
26
26
namespace drizzled
27
27
{
32
32
String *Schema::val_str(String *str)
33
33
{
34
34
  assert(fixed == 1);
35
 
  util::string::const_shared_ptr schema= getSession().schema();
36
 
  if (not schema or schema->empty())
 
35
  Session *session= current_session;
 
36
  if (session->db.empty())
37
37
  {
38
38
    null_value= 1;
39
39
    return 0;
40
40
  }
41
 
 
42
 
  str->copy(*schema, system_charset_info);
43
 
 
 
41
  else
 
42
  {
 
43
    str->copy(session->db.c_str(), session->db.length(), system_charset_info);
 
44
  }
44
45
  return str;
45
46
}
46
47