← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

https://launchpad.net/bugs/697984
init_read_record_idx return result should be checked now that it checks startIndexScan result.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
45
45
#include <drizzled/lock.h>
46
46
#include <drizzled/plugin/listen.h>
47
47
#include "drizzled/cached_directory.h"
48
 
#include <drizzled/field/timestamp.h>
 
48
#include <drizzled/field/epoch.h>
49
49
#include <drizzled/field/null.h>
50
50
#include "drizzled/sql_table.h"
51
51
#include "drizzled/global_charset_info.h"
669
669
  /*
670
670
    Note that we need to hold table::Cache::singleton().mutex() while changing the
671
671
    open_tables list. Another thread may work on it.
672
 
    (See: table::Cache::singleton().removeTable(), mysql_wait_completed_table())
 
672
    (See: table::Cache::singleton().removeTable(), wait_completed_table())
673
673
    Closing a MERGE child before the parent would be fatal if the
674
674
    other thread tries to abort the MERGE lock in between.
675
675
  */
1504
1504
  /*
1505
1505
    Note that we need to hold table::Cache::singleton().mutex() while changing the
1506
1506
    open_tables list. Another thread may work on it.
1507
 
    (See: table::Cache::singleton().removeTable(), mysql_wait_completed_table())
 
1507
    (See: table::Cache::singleton().removeTable(), wait_completed_table())
1508
1508
    Closing a MERGE child before the parent would be fatal if the
1509
1509
    other thread tries to abort the MERGE lock in between.
1510
1510
  */