Update to requirements marks related to changes in the memory allocation

interface and enhancement of the documentation regarding DEFAULT clauses
in CREATE TABLE.

FossilOrigin-Name: 440705b98a3429b830ea85e71cc1e414bc6d8058

diff --git a/manifest b/manifest
index fe8f3f84fe47ba6346e2ab825e886bd4ea7d5c3d..3abf1e8c7b862f1dcdfc0312ad9f74b19a5acbd8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sa\sNULL\spointer\sdeference\swhen\sprocessing\sthe\sIS\soperator\sif\sthe\nright-hand\sside\sis\san\sillegal\s"#ID"\sstyle\svariable.\nFix\sfor\sticket\s[8c32a33a53092c85a15b]
-D 2014-10-02T21:52:35.759
+C Update\sto\srequirements\smarks\srelated\sto\schanges\sin\sthe\smemory\sallocation\ninterface\sand\senhancement\sof\sthe\sdocumentation\sregarding\sDEFAULT\sclauses\nin\sCREATE\sTABLE.
+D 2014-10-03T14:54:47.347
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -195,7 +195,7 @@ F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
 F src/main.c 4a507a467cc20979579e4320ca6466b8ed0be268
-F src/malloc.c 5bb99ee1e08ad58e457063cf79ce521db0e24195
+F src/malloc.c 7cf86b4f2310898675d8a962342e5650779dfb3f
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
 F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
@@ -448,7 +448,7 @@ F test/descidx3.test 09ddbe3f5295f482d2f8b687cf6db8bad7acd9a2
 F test/diskfull.test 106391384780753ea6896b7b4f005d10e9866b6e
 F test/distinct.test 086e70c765f172e8974e9f83b9ac5ca03c154e77
 F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
-F test/e_createtable.test 181653f6f45e3adde73f8686600ce5ad7515466b
+F test/e_createtable.test c7e67b49e6cf92473c8fb30ab26143e9e2128cf7
 F test/e_delete.test d5186e2f5478b659f16a2c8b66c09892823e542a
 F test/e_droptrigger.test 3cd080807622c13e5bbb61fc9a57bd7754da2412
 F test/e_dropview.test 0c9f7f60989164a70a67a9d9c26d1083bc808306
@@ -1201,7 +1201,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 07c89940c49a5dca3205a4b6fa8290f23bcb6e10
-R 3ff78086c12aaca80a7d944710785692
+P ffe7573636c8057614b02f0a85559e1857fd04e4
+R aa87a5e90d62a634fb6995b4f5b80a7f
 U drh
-Z 3bce8c89e00f85ac67bad3c4bc80b65e
+Z fba6f65828fcf9ec8fdba2a5c0c0fdb8

diff --git a/manifest.uuid b/manifest.uuid
index 839ebd889d5c62a66ec48b6f75c26ac574a7bca4..4fde6cabd292aa198c7ad906469645a4d666b922 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ffe7573636c8057614b02f0a85559e1857fd04e4
\ No newline at end of file
+440705b98a3429b830ea85e71cc1e414bc6d8058
\ No newline at end of file

diff --git a/src/malloc.c b/src/malloc.c
index 8ba5fa0a842ccd0c1b884834be245213c818ac11..7562ce2c412b48e866b1cb51cf9bb62762686566 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -310,7 +310,7 @@ void *sqlite3Malloc(u64 n){
   }else{
     p = sqlite3GlobalConfig.m.xMalloc((int)n);
   }
-  assert( EIGHT_BYTE_ALIGNMENT(p) );  /* IMP: R-04675-44850 */
+  assert( EIGHT_BYTE_ALIGNMENT(p) );  /* IMP: R-11148-40995 */
   return p;
 }
 
@@ -533,10 +533,10 @@ void *sqlite3Realloc(void *pOld, u64 nBytes){
   int nOld, nNew, nDiff;
   void *pNew;
   if( pOld==0 ){
-    return sqlite3Malloc(nBytes); /* IMP: R-28354-25769 */
+    return sqlite3Malloc(nBytes); /* IMP: R-04300-56712 */
   }
   if( nBytes==0 ){
-    sqlite3_free(pOld); /* IMP: R-31593-10574 */
+    sqlite3_free(pOld); /* IMP: R-26507-47431 */
     return 0;
   }
   if( nBytes>=0x7fffff00 ){
@@ -573,7 +573,7 @@ void *sqlite3Realloc(void *pOld, u64 nBytes){
   }else{
     pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
   }
-  assert( EIGHT_BYTE_ALIGNMENT(pNew) ); /* IMP: R-04675-44850 */
+  assert( EIGHT_BYTE_ALIGNMENT(pNew) ); /* IMP: R-11148-40995 */
   return pNew;
 }
 
@@ -585,7 +585,7 @@ void *sqlite3_realloc(void *pOld, int n){
 #ifndef SQLITE_OMIT_AUTOINIT
   if( sqlite3_initialize() ) return 0;
 #endif
-  if( n<0 ) n = 0;
+  if( n<0 ) n = 0;  /* IMP: R-26507-47431 */
   return sqlite3Realloc(pOld, n);
 }
 void *sqlite3_realloc64(void *pOld, sqlite3_uint64 n){

diff --git a/test/e_createtable.test b/test/e_createtable.test
index 08f606f65b36f9402d7595e404fbd5053c18d360..2921d86c6f3e81eeb721b2dbdbbeddd7926a8e45 100644 (file)
--- a/test/e_createtable.test
+++ b/test/e_createtable.test
@@ -862,11 +862,11 @@ do_createtable_tests 3.2.3 -query {
   3   "INSERT INTO t1 DEFAULT VALUES"               {NULL NULL NULL}
 }
 
-# EVIDENCE-OF: R-62940-43005 An explicit DEFAULT clause may specify that
+# EVIDENCE-OF: R-07343-35026 An explicit DEFAULT clause may specify that
 # the default value is NULL, a string constant, a blob constant, a
-# signed-number, or any constant expression enclosed in parentheses. An
-# explicit default value may also be one of the special case-independent
-# keywords CURRENT_TIME, CURRENT_DATE or CURRENT_TIMESTAMP.
+# signed-number, or any constant expression enclosed in parentheses. A
+# default value may also be one of the special case-independent keywords
+# CURRENT_TIME, CURRENT_DATE or CURRENT_TIMESTAMP.
 #
 do_execsql_test e_createtable-3.3.1 {
   CREATE TABLE t4(
@@ -884,9 +884,9 @@ do_execsql_test e_createtable-3.3.1 {
   );
 } {}
 
-# EVIDENCE-OF: R-36381-62919 For the purposes of the DEFAULT clause, an
-# expression is considered constant provided that it does not contain
-# any sub-queries, column or table references, or string literals
+# EVIDENCE-OF: R-18415-27776 For the purposes of the DEFAULT clause, an
+# expression is considered constant if it does contains no sub-queries,
+# column or table references, bound parameters, or string literals
 # enclosed in double-quotes instead of single-quotes.
 #
 do_createtable_tests 3.4.1 -error {
@@ -896,6 +896,7 @@ do_createtable_tests 3.4.1 -error {
   2   {CREATE TABLE t5(x DEFAULT ( "abc" ))}  {}
   3   {CREATE TABLE t5(x DEFAULT ( 1 IN (SELECT 1) ))}  {}
   4   {CREATE TABLE t5(x DEFAULT ( EXISTS (SELECT 1) ))}  {}
+  5   {CREATE TABLE t5(x DEFAULT ( x!=?1 ))}  {}
 }
 do_createtable_tests 3.4.2 -repair {
   catchsql { DROP TABLE t5 }