~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/item_create.cc

browse files at revision 181
compare with another revision
compare with revision 2072
download diff
download tarball
view history from revision 181

Committer: Brian Aker
Date: 2008-07-18 19:59:04 UTC
mfrom: (177.3.3 drizzle-work)
Revision ID: brian@tangent.org-20080718195904-7zxlcav99bdsu1x5

Handling merge from mark.

files removed:
tests/r/have_dynamic_loading.require

files modified:
configure.ac

include/my_global.h

server/drizzled.cc

server/item_create.cc

server/item_create.h

server/item_func.h

server/item_sum.cc

server/item_sum.h

server/mysql_priv.h

server/set_var.cc

server/sql_plugin.cc

Show diffs side-by-side

added added

removed removed

server/item_create.cc

1502

}

1503

1504

1505

#ifdef HAVE_DLOPEN

1506

1505

Create_udf_func Create_udf_func::s_singleton;

1507

1506

1508

1507

Item*

1608

1607

}

1609

1608

return func;

1610

1609

}

1611

#endif

1612

1610

1613

1611

1614

1612

Item*

Older »