← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/schema.cc

new date/time additions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/schema.cc
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 <assert.h>
24
24
 
25
 
#include <drizzled/identifier.h>
26
 
#include <drizzled/session.h>
27
 
#include <drizzled/internal/my_sys.h>
 
25
#include "drizzled/identifier.h"
 
26
#include "drizzled/session.h"
 
27
#include "drizzled/current_session.h"
 
28
#include "drizzled/internal/my_sys.h"
28
29
 
29
 
#include <drizzled/util/tablename_to_filename.h>
30
 
#include <drizzled/util/backtrace.h>
 
30
#include "drizzled/util/tablename_to_filename.h"
 
31
#include "drizzled/util/backtrace.h"
31
32
 
32
33
#include <algorithm>
33
34
#include <sstream>
44
45
{
45
46
 
46
47
extern string drizzle_tmpdir;
 
48
extern pid_t current_pid;
47
49
 
48
50
static size_t build_schema_filename(string &path, const string &db)
49
51
{
53
55
  conversion_error= util::tablename_to_filename(db, path);
54
56
  if (conversion_error)
55
57
  {
56
 
    errmsg_printf(error::ERROR,
 
58
    errmsg_printf(ERRMSG_LVL_ERROR,
57
59
                  _("Schema name cannot be encoded and fit within filesystem "
58
60
                    "name length restrictions."));
59
61
    return 0;