← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_locking.c

Merging trunk changes from over weekend.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_locking.c
20
20
  isamdatabase.
21
21
*/
22
22
 
23
 
#include "ftdefs.h"
 
23
#include "myisamdef.h"
 
24
#include <m_ctype.h>
 
25
#include <my_tree.h>
 
26
#include <queues.h>
 
27
#include <mysql/plugin.h>
24
28
 
25
29
        /* lock table by F_UNLCK, F_RDLCK or F_WRLCK */
26
30
 
55
59
  {
56
60
    switch (lock_type) {
57
61
    case F_UNLCK:
58
 
      ftparser_call_deinitializer(info);
59
62
      if (info->lock_type == F_RDLCK)
60
63
        count= --share->r_locks;
61
64
      else