SQLite: Check-in [33c8b9c7]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Merge accidental fork.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	33c8b9c710db6a1a987c11ab6f3a6bc120257ce9
User & Date:	drh 2010-09-28 17:37:44

Context

2010-09-28
19:16		Fix some problems that can occur if a trigger has the same name as another database object. check-in: 655991ec user: dan tags: trunk
17:37		Merge accidental fork. check-in: 33c8b9c7 user: drh tags: trunk
17:34		Add tests to e_createtable.test. Allow a table to be created if there is an index of the same name in a different attached database. check-in: 6251e587 user: dan tags: trunk
17:34		Get ANALYZE working again with -DSQLITE_ENABLE_STAT2 and virtual tables. check-in: b7a26427 user: drh tags: trunk

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/analyze.c.

  int regFirst = iMem++;       /* Index of first sample to record */
#endif

  v = sqlite3GetVdbe(pParse);
  if( v==0 || NEVER(pTab==0) ){
    return;
  }
  if( pTab->pSelect ){
    /* Do not gather statistics on views */
    return;
  }
  if( memcmp(pTab->zName, "sqlite_", 7)==0 ){
    /* Do not gather statistics on system tables */
    return;
  }
  assert( sqlite3BtreeHoldsAllMutexes(db) );

|
|

  int regFirst = iMem++;       /* Index of first sample to record */
#endif

  v = sqlite3GetVdbe(pParse);
  if( v==0 || NEVER(pTab==0) ){
    return;
  }
  if( pTab->tnum==0 ){
    /* Do not gather statistics on views or virtual tables */
    return;
  }
  if( memcmp(pTab->zName, "sqlite_", 7)==0 ){
    /* Do not gather statistics on system tables */
    return;
  }
  assert( sqlite3BtreeHoldsAllMutexes(db) );