~maria-captains/maria/5.2

« back to all changes in this revision

Viewing changes to storage/xtradb/row/row0mysql.c

  • Committer: Sergei Golubchik
  • Date: 2014-02-13 07:25:33 UTC
  • mfrom: (2643.137.75 5.1)
  • Revision ID: sergii@pisem.net-20140213072533-gkbllmcu4qkp9024
5.1 merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
1084
1084
        ins_node_t*     node            = prebuilt->ins_node;
1085
1085
 
1086
1086
        ut_ad(trx);
1087
 
        ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
1088
1087
 
1089
1088
        if (prebuilt->table->ibd_file_missing) {
1090
1089
                ut_print_timestamp(stderr);
1326
1325
        trx_t*          trx             = prebuilt->trx;
1327
1326
 
1328
1327
        ut_ad(prebuilt && trx);
1329
 
        ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
1330
1328
        UT_NOT_USED(mysql_rec);
1331
1329
 
1332
1330
        if (prebuilt->table->ibd_file_missing) {
1497
1495
        trx_t*          trx             = prebuilt->trx;
1498
1496
 
1499
1497
        ut_ad(prebuilt && trx);
1500
 
        ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
1501
1498
 
1502
1499
        if (UNIV_UNLIKELY
1503
1500
            (!srv_locks_unsafe_for_binlog
2830
2827
        redo log records on the truncated tablespace, we will assign
2831
2828
        a new tablespace identifier to the truncated tablespace. */
2832
2829
 
2833
 
        ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
2834
2830
        ut_ad(table);
2835
2831
 
2836
2832
        if (srv_created_new_raw) {