← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Brian Aker
  • Date: 2008-11-13 02:56:15 UTC
  • mfrom: (575.4.10 devel)
  • Revision ID: brian@tangent.org-20081113025615-snhsi52yb2ivmx6f
Merging Monty's code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
52
52
*/
53
53
 
54
54
#include <drizzled/server_includes.h>
55
 
#include "rpl_mi.h"
 
55
#include <drizzled/replication/mi.h>
56
56
#include <mysys/my_getopt.h>
57
57
#include <mysys/thr_alarm.h>
58
58
#include <storage/myisam/myisam.h>
2437
2437
 
2438
2438
  This is necessary because if the user does not specify a temporary
2439
2439
  directory via the command line, one is chosen based on the environment
2440
 
  or system defaults.  But we can't just always use mysql_tmpdir, because
 
2440
  or system defaults.  But we can't just always use drizzle_tmpdir, because
2441
2441
  that is actually a call to my_tmpdir() which cycles among possible
2442
2442
  temporary directories.
2443
2443
 
2448
2448
*/
2449
2449
static unsigned char *get_tmpdir(Session *)
2450
2450
{
2451
 
  if (opt_mysql_tmpdir)
2452
 
    return (unsigned char *)opt_mysql_tmpdir;
2453
 
  return (unsigned char*)mysql_tmpdir;
 
2451
  if (opt_drizzle_tmpdir)
 
2452
    return (unsigned char *)opt_drizzle_tmpdir;
 
2453
  return (unsigned char*)drizzle_tmpdir;
2454
2454
}
2455
2455
 
2456
2456
/****************************************************************************