← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/falcon/ImageManager.cpp

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/ImageManager.cpp
233
233
                heightId = table->getFieldId ("HEIGHT");
234
234
                }
235
235
 
236
 
        Record *record = (recordVersion->hasRecord()) ? recordVersion : recordVersion->priorVersion;
 
236
        Record *record = (recordVersion->hasRecord()) ? recordVersion : recordVersion->getPriorVersion();
237
237
        ValueEx application (record, applicationId);
238
238
        Table *images = database->findTable (application.getString(), "IMAGES");
239
239
        Transaction *transaction = recordVersion->transaction;