← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/utility_dictionary/environmental.cc

  • Committer: lbieber
  • Date: 2010-10-06 16:34:16 UTC
  • mfrom: (1816.1.3 build)
  • Revision ID: lbieber@orisndriz08-20101006163416-ea0sl59qgpglk21y
Merge Monty - Change the requirement from either libinnodb to libhaildb. Also, tied it to version 2.2
Merge Andrew - fix bug 650935: remove --compress from all clients
Merge Andrew - fix bug 653471: Add -A to drizzle client
Merge Travis - 621861 = To change C structs to C++ classes in Drizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/utility_dictionary/environmental.cc
51
51
  if (not *position)
52
52
    return false;
53
53
 
 
54
  std::string substring(*position, 0, LARGEST_ENV_STRING);
 
55
  push(substring);
 
56
 
54
57
  char *value= NULL;
55
58
  if ((value= strchr(*position, '=')))
56
59
  {
59
62
 
60
63
  if (value)
61
64
  {
62
 
    std::string substring(*position, 0, (size_t)(value - *position -1)); // The additional -1 is for the = 
63
 
    push(substring);
64
 
 
65
65
    substring.assign(value, 0, LARGEST_ENV_STRING);
66
66
    push(substring);
67
67
  }
68
68
  else
69
69
  {
70
 
    std::string substring(*position, 0, LARGEST_ENV_STRING);
71
70
    push(false);
72
71
  }
73
72