← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/falcon/Protocol.cpp

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/Protocol.cpp
247
247
                        }
248
248
                        break;
249
249
                        
250
 
#ifdef ENGINE
 
250
#ifdef FALCONDB
251
251
                default:
252
252
                        ASSERT (false);
253
253
#endif
389
389
                        }
390
390
                        break;
391
391
                        
392
 
#ifdef ENGINE
 
392
#ifdef FALCONDB
393
393
                default:
394
394
                        ASSERT (false);
395
395
#endif