← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/discover_xt.cc

  • Committer: lbieber
  • Date: 2010-09-22 13:48:54 UTC
  • mfrom: (1784.1.3 build)
  • Revision ID: lbieber@orisndriz08-20100922134854-y7mae2taqhn73vsx
Merge Paul M. - latest changes from PBXT 1.0.11-7
Merge Paul M. - fix bug 641038 - pbxt rollback not working (tables reported as non-transactional)
Merge Andrew - fix show stoppers for new drizzledump

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/discover_xt.cc
1147
1147
    goto err;
1148
1148
  }
1149
1149
 
1150
 
  LOCK_open.lock;
 
1150
  MYSQL_LOCK(LOCK_open);
1151
1151
  if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
1152
1152
  {
1153
1153
    if (!access(path,F_OK))
1261
1261
   */
1262
1262
  error= FALSE;
1263
1263
unlock_and_end:
1264
 
  LOCK_open.unlock;
 
1264
  MYSQL_UNLOCK(LOCK_open);
1265
1265
 
1266
1266
err:
1267
1267
  thd_proc_info(thd, "After create");
1325
1325
                                COLUMN_FORMAT_TYPE_FIXED,
1326
1326
#endif
1327
1327
                       NULL /*default_value*/, NULL /*on_update_value*/, &comment, NULL /*change*/, 
1328
 
                       NULL /*interval_list*/, info->field_charset, 0 /*uint_geom_type*/)) 
 
1328
                       NULL /*interval_list*/, info->field_charset, 0 /*uint_geom_type*/
 
1329
#ifdef MARIADB_BASE_VERSION
 
1330
                       , NULL /*vcol_info*/, NULL /* create options */
 
1331
#endif
 
1332
                       )) 
1329
1333
                        goto error;
1330
1334
 
1331
1335
 
1349
1353
        }
1350
1354
        
1351
1355
        /* Create an internal temp table */
 
1356
#ifdef WITH_PARTITION_STORAGE_ENGINE
 
1357
        partition_info *part_info;
 
1358
 
 
1359
        part_info = thd->work_part_info;
 
1360
#endif
1352
1361
        if (mysql_create_table_no_lock(thd, db, name, &mylex.create_info, &mylex.alter_info, 1, 0)) 
1353
1362
                goto error;
 
1363
#ifdef WITH_PARTITION_STORAGE_ENGINE
 
1364
        thd->work_part_info = part_info;
 
1365
#endif
1354
1366
 
1355
1367
        noerror:
1356
1368
        err = 0;