cbq_engine panics when creating primary index

Build : 5.0.0-2124 onwards

The test 2i.indexscans_2i.SecondaryIndexingScanTests.test_multi_create_query_explain_drop_index fails with the following error when creating a primary index

CBQError: CBQError: host 172.23.105.158: ERROR:{u'status': u'stopped', u'errors': [

{u'msg': u'Panic: runtime error: invalid memory address or nil pointer dereference - cause: runtime error: invalid memory address or nil pointer dereference', u'code': 5001}

], u'results': [], u'metrics':

{u'elapsedTime': u'2.976301ms', u'executionTime': u'2.30303ms', u'resultSize': 0, u'resultCount': 0, u'errorCount': 1}

, u'requestID': u'1b7db4b8-4ce6-45b1-bb53-cb3912071199', u'signature': {u'': u''}}

This looks to be related to the fix for MB-22860 which was merged yesterday.

Testcase : ./testrunner -i node_conf.ini get-cbcollect-info=True,get-couch-dbinfo=True,skip_cleanup=False -t 2i.indexscans_2i.SecondaryIndexingScanTests.test_multi_create_query_explain_drop_index,groups=simple,doc-per-day=1,dataset=default,use_gsi_for_primary=True

Jenkins Job : http://server.jenkins.couchbase.com/job/build_sanity_matrix/DISTRO=centos7,TYPE=4node/2769/consoleText

Logs attached