~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Brian Aker
  • Date: 2009-02-02 23:10:18 UTC
  • mfrom: (779.3.40 devel)
  • Revision ID: brian@tangent.org-20090202231018-zlp0hka6kgwy1vfy
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
*/
25
25
 
26
26
#include <drizzled/server_includes.h>
27
 
#include <libdrizzle/libdrizzle.h>
 
27
#include <libdrizzleclient/libdrizzle.h>
28
28
#include <mysys/hash.h>
29
29
#include <drizzled/error.h>
30
30
#include <drizzled/gettext.h>
2286
2286
    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
2287
2287
               ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
2288
2288
    return;
2289
 
    break;
2290
2289
  default:
2291
2290
    {
2292
2291
      /* The error was "unknown" to this function.