Upgrade from 2.5.3 fails

Related to JRA-6669....

I get this error during upgrade on top of an existing Jira 2.5.3 database.....

[GC 106872K->95184K(129728K), 0.0017150 secs]
2005-05-14 16:58:25,540 ERROR [jira.action.admin.DataExport] Error exporting: org.ofbiz.core.entity.GenericDataSourceException: SQL Exception while executing the following:SELECT ID, CUSTOMFIELD, CUSTOMFIELDCONFIG, PARENTOPTIONID, SEQUENCE, customvalue, optiontype FROM customfieldoption (Invalid column name 'CUSTOMFIELDCONFIG'.)
org.ofbiz.core.entity.GenericDataSourceException: SQL Exception while executing the following:SELECT ID, CUSTOMFIELD, CUSTOMFIELDCONFIG, PARENTOPTIONID, SEQUENCE, customvalue, optiontype FROM customfieldoption (Invalid column name 'CUSTOMFIELDCONFIG'.)
at org.ofbiz.core.entity.jdbc.SQLProcessor.executeQuery(SQLProcessor.java:336)
at org.ofbiz.core.entity.GenericDAO.selectListIteratorByCondition(GenericDAO.java:1050)
at org.ofbiz.core.entity.GenericHelperDAO.findListIteratorByCondition(GenericHelperDAO.java:178)
at org.ofbiz.core.entity.GenericDelegator.findListIteratorByCondition(GenericDelegator.java:995)
at org.ofbiz.core.entity.GenericDelegator.findListIteratorByCondition(GenericDelegator.java:968)
at com.atlassian.jira.action.admin.export.DefaultSaxEntityExporter.exportEntities(DefaultSaxEntityExporter.java:49)
at com.atlassian.jira.action.admin.DataExport.execute(DataExport.java:69)
at webwork.dispatcher.GenericDispatcher.executeAction(GenericDispatcher.java:131)
at com.atlassian.core.action.DefaultActionDispatcher.execute(DefaultActionDispatcher.java:34)
at com.atlassian.jira.bean.export.AutoExportImpl.exportData(AutoExportImpl.java:55)
at com.atlassian.jira.upgrade.UpgradeManagerImpl.doUpgradeIfNeeded(UpgradeManagerImpl.java:322)
at com.atlassian.jira.upgrade.UpgradeManagerImpl.doUpgradeIfNeededAndAllowed(UpgradeManagerImpl.java:301)
at com.atlassian.jira.upgrade.UpgradeLauncher.contextInitialized(UpgradeLauncher.java:65)
at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:3271)
at org.apache.catalina.core.StandardContext.start(StandardContext.java:3613)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1188)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:754)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1188)
at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:363)
at org.apache.catalina.core.StandardService.start(StandardService.java:497)
at org.apache.catalina.core.StandardServer.start(StandardServer.java:2190)
at org.apache.catalina.startup.Catalina.start(Catalina.java:512)
at org.apache.catalina.startup.Catalina.execute(Catalina.java:400)
at org.apache.catalina.startup.Catalina.process(Catalina.java:180)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:203)
com.jnetdirect.jsql.x: Invalid column name 'CUSTOMFIELDCONFIG'.
at com.jnetdirect.jsql.x.a(Unknown Source)
at com.jnetdirect.jsql.ay.a(Unknown Source)
at com.jnetdirect.jsql.ah.g(Unknown Source)
at com.jnetdirect.jsql.ah.new(Unknown Source)
at com.jnetdirect.jsql.ah.do(Unknown Source)
at com.jnetdirect.jsql.as.executeQuery(Unknown Source)
at org.apache.commons.dbcp.DelegatingPreparedStatement.executeQuery(DelegatingPreparedStatement.java:205)
at org.ofbiz.core.entity.jdbc.SQLProcessor.executeQuery(SQLProcessor.java:334)
at org.ofbiz.core.entity.GenericDAO.selectListIteratorByCondition(GenericDAO.java:1050)
at org.ofbiz.core.entity.GenericHelperDAO.findListIteratorByCondition(GenericHelperDAO.java:178)
at org.ofbiz.core.entity.GenericDelegator.findListIteratorByCondition(GenericDelegator.java:995)
at org.ofbiz.core.entity.GenericDelegator.findListIteratorByCondition(GenericDelegator.java:968)
at com.atlassian.jira.action.admin.export.DefaultSaxEntityExporter.exportEntities(DefaultSaxEntityExporter.java:49)
at com.atlassian.jira.action.admin.DataExport.execute(DataExport.java:69)
at webwork.dispatcher.GenericDispatcher.executeAction(GenericDispatcher.java:131)
at com.atlassian.core.action.DefaultActionDispatcher.execute(DefaultActionDispatcher.java:34)
at com.atlassian.jira.bean.export.AutoExportImpl.exportData(AutoExportImpl.java:55)
at com.atlassian.jira.upgrade.UpgradeManagerImpl.doUpgradeIfNeeded(UpgradeManagerImpl.java:322)
at com.atlassian.jira.upgrade.UpgradeManagerImpl.doUpgradeIfNeededAndAllowed(UpgradeManagerImpl.java:301)
at com.atlassian.jira.upgrade.UpgradeLauncher.contextInitialized(UpgradeLauncher.java:65)
at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:3271)
at org.apache.catalina.core.StandardContext.start(StandardContext.java:3613)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1188)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:754)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1188)
at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:363)
at org.apache.catalina.core.StandardService.start(StandardService.java:497)
at org.apache.catalina.core.StandardServer.start(StandardServer.java:2190)
at org.apache.catalina.startup.Catalina.start(Catalina.java:512)
at org.apache.catalina.startup.Catalina.execute(Catalina.java:400)
at org.apache.catalina.startup.Catalina.process(Catalina.java:180)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:203)
2005-05-14 16:58:27,024 ERROR [atlassian.jira.upgrade.UpgradeManagerImpl] Error occurred during export before upgrade: com.atlassian.core.AtlassianCoreException: Error in action: com.atlassian.jira.action.admin.DataExport@101e178, result: error
Error exporting: org.ofbiz.core.entity.GenericDataSourceException: SQL Exception while executing the following:SELECT ID, CUSTOMFIELD, CUSTOMFIELDCONFIG, PARENTOPTIONID, SEQUENCE, customvalue, optiontype FROM customfieldoption (Invalid column name 'CUSTOMFIELDCONFIG'.). If necessary, auto-export can be disabled; see http://www.atlassian.com/software/jira/docs/latest/upgrade/autoexport.html
com.atlassian.core.AtlassianCoreException: Error in action: com.atlassian.jira.action.admin.DataExport@101e178, result: error
Error exporting: org.ofbiz.core.entity.GenericDataSourceException: SQL Exception while executing the following:SELECT ID, CUSTOMFIELD, CUSTOMFIELDCONFIG, PARENTOPTIONID, SEQUENCE, customvalue, optiontype FROM customfieldoption (Invalid column name 'CUSTOMFIELDCONFIG'.)
at com.atlassian.core.action.ActionUtils.checkForErrors(ActionUtils.java:53)
at com.atlassian.jira.bean.export.AutoExportImpl.exportData(AutoExportImpl.java:64)
at com.atlassian.jira.upgrade.UpgradeManagerImpl.doUpgradeIfNeeded(UpgradeManagerImpl.java:322)
at com.atlassian.jira.upgrade.UpgradeManagerImpl.doUpgradeIfNeededAndAllowed(UpgradeManagerImpl.java:301)
at com.atlassian.jira.upgrade.UpgradeLauncher.contextInitialized(UpgradeLauncher.java:65)
at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:3271)
at org.apache.catalina.core.StandardContext.start(StandardContext.java:3613)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1188)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:754)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1188)
at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:363)
at org.apache.catalina.core.StandardService.start(StandardService.java:497)
at org.apache.catalina.core.StandardServer.start(StandardServer.java:2190)
at org.apache.catalina.startup.Catalina.start(Catalina.java:512)
at org.apache.catalina.startup.Catalina.execute(Catalina.java:400)
at org.apache.catalina.startup.Catalina.process(Catalina.java:180)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:203)
[INFO] QuartzScheduler - -Scheduler JiraQuartzScheduler_$_NON_CLUSTERED started.
[Filter: profiling] Using parameter [jira_profile]
[Filter: profiling] defaulting to off [autostart=false]
[Filter: profiling] Turning filter off [jira_profile=off]
[GC 106960K->95710K(129728K), 0.0060712 secs]
[WARN] ServletDispatcher - -Unable to find 'webwork.multipart.saveDir' property setting. Defaulting to javax.servlet.context.tempdir
[INFO] ServletDispatcher - -Action dispatcher initialized
[INFO] Http11Protocol - -Starting Coyote HTTP/1.1 on port 8280
Stopping service Tomcat-Standalone
[INFO] Http11Protocol - -Stoping http11 protocol on 8280 null
[INFO] QuartzScheduler - -Scheduler JiraQuartzScheduler_$_NON_CLUSTERED shutting down.
[INFO] QuartzScheduler - -Scheduler JiraQuartzScheduler_$_NON_CLUSTERED paused.
[INFO] QuartzScheduler - -Scheduler JiraQuartzScheduler_$_NON_CLUSTERED shutdown complete.
Terminate batch job (Y/N)? y