← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/memcached_stats/analysis_table.cc

[patch 112/129] Merge patch for revision 1925 from InnoDB SVN:
revno: 1925
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6169
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6163
committer: calvin
timestamp: Thu 2009-11-12 12:40:43 +0000
message:
  branches/zip: add test case for bug#46676
  
  This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
  But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
  Add test case to catch future regression.
added:
  mysql-test/innodb_bug46676.result 6169@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46676.result
  mysql-test/innodb_bug46676.test 6169@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46676.test
diff:
=== added file 'mysql-test/innodb_bug46676.result'

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/memcached_stats/analysis_table.cc
37
37
#include <libmemcached/memcached.h>
38
38
#include <libmemcached/server.h>
39
39
 
40
 
namespace drizzle_plugin
41
 
{
 
40
using namespace std;
 
41
using namespace drizzled;
42
42
 
43
43
AnalysisTableTool::AnalysisTableTool() :
44
44
  plugin::TableFunction("DATA_DICTIONARY", "MEMCACHED_ANALYSIS")
68
68
  }
69
69
  is_done= true;
70
70
 
71
 
  drizzled::sys_var *servers_var= drizzled::find_sys_var("memcached_stats_servers");
72
 
  assert(servers_var != NULL);
73
 
 
74
 
  const string servers_string(static_cast<char *>(servers_var.value_ptr(NULL, 0, NULL)));
 
71
  SysvarHolder &sysvar_holder= SysvarHolder::singleton();
 
72
  const string servers_string= sysvar_holder.getServersString();
75
73
 
76
74
  if (servers_string.empty()) 
77
75
  {       
111
109
 
112
110
  return true;
113
111
}
114
 
 
115
 
} /* namespace drizzle_plugin */