← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/status_dictionary/status.cc

Committer: Brian Aker
Date: 2010-03-24 19:45:37 UTC
mfrom: (1377.3.20 pandora-build)
Revision ID: brian@gaz-20100324194537-hf3tpibznhozvwl1

Merge monty

files added:
m4/pandora_have_boost.m4

plugin/blackhole/tests/t/create_max_fields-master.opt

files removed:
m4/ax_boost_base.m4

files renamed:
tests/r/create_max_fields.result => plugin/blackhole/tests/r/create_max_fields.result

tests/t/create_max_fields.test => plugin/blackhole/tests/t/create_max_fields.test

files modified:
Makefile.am

config/pandora-plugin

configure.ac

drizzled/plugin/loader.cc

m4/pandora_canonical.m4

m4/pandora_drizzle_build.m4

m4/pandora_have_libdrizzle.m4

plugin/blackhole/plugin.ini

plugin/blackhole/tests/r/blackhole.result

plugin/blackhole/tests/t/blackhole.test

plugin/innobase/tests/r/innodb_cmpmem.result

plugin/innobase/tests/r/innodb_cmpmem_reset.result

plugin/innobase/tests/t/innodb_cmpmem.test

plugin/innobase/tests/t/innodb_cmpmem_reset.test

plugin/md5/md5.cc

plugin/md5/plugin.ac

plugin/md5/plugin.ini

plugin/status_dictionary/status.cc

tests/test-run.pl

tests/valgrind.supp

Show diffs side-by-side

added added

removed removed

plugin/status_dictionary/status.cc

154

154

value= ((char *) status_var + (ulong) value);

155

155

/* fall through */

156

156

case SHOW_LONG:

157

oss << *(int64_t*) value;

157

oss << *(long*) value;

158

158

return_value= oss.str();

159

159

break;

160

160

case SHOW_LONGLONG_STATUS:

Older »