Merge recent enhancements from trunk, including table-valued expressions.

FossilOrigin-Name: b9927c876c1d4e146cb6a603d82cd2489594084d
2015-08-20 23:45:59 +00:00
parent bcf40a7f12 0fee5969c8
commit c1bd84124b
30 changed files with 989 additions and 178 deletions
@@ -1184,8 +1184,9 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){
          zColl = "B";
          n = 1;
        }
-        if( i+n>nTemp-6 ){
+        if( i+n>nTemp-7 ){
          memcpy(&zTemp[i],",...",4);
+          i += 4;
          break;
        }
        zTemp[i++] = ',';