Fix the shift operators so that they work with 64-bit quantities. (CVS 2752)

FossilOrigin-Name: 0d3357b5f65887f7db03db2ae021f28f480f90e4

diff --git a/manifest b/manifest
index e1528efc47d8c3ec96f6b4005700199a1707fbd3..176abeec217a155b8118bb3e5f58316fe0f91ec6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Report\san\serror\sif\sthe\sinput\sSQL\scontains\san\sunterminated\sstring.\nTicket\s#1497.\s(CVS\s2751)
-D 2005-10-23T11:29:40
+C Fix\sthe\sshift\soperators\sso\sthat\sthey\swork\swith\s64-bit\squantities.\s(CVS\s2752)
+D 2005-10-29T15:48:31
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -81,7 +81,7 @@ F src/update.c ac506fb7400158f826ec6c3a0dbe65e7ed3928d5
 F src/utf.c bda5eb85039ef16f2d17004c1e18c96e1ab0a80c
 F src/util.c 48fecbbef4391d102a23096d32f0d74173428406
 F src/vacuum.c 829d9e1a6d7c094b80e0899686670932eafd768c
-F src/vdbe.c 2a660920b059d66571d5965e9c9114faca1831af
+F src/vdbe.c 12cbad0abf1ad091e936fe269ba2d1a319f756b8
 F src/vdbe.h 8729a4ee16ff9aeab2af9667df3cf300ff978e13
 F src/vdbeInt.h 7bedbb9553a10e86b53f75d99e197f3f00a732bf
 F src/vdbeapi.c 85bbe1d0243a89655433d60711b4bd71979b59cd
@@ -145,7 +145,7 @@ F test/distinctagg.test 2b89d1c5220d966a30ba4b40430338669301188b
 F test/enc.test 7a03417a1051fe8bc6c7641cf4c8c3f7e0066d52
 F test/enc2.test 76c13b8c00beaf95b15c152e95dab51292eb1f0d
 F test/enc3.test f6a5f0b7b7f3a88f030d3143729b87cd5c86d837
-F test/expr.test 71b8cba7fe5c228147c93e530e098144565aaa46
+F test/expr.test 9698d7bbe4ded9ba66836a4fd50f3f4bf1c0c152
 F test/fkey1.test 153004438d51e6769fb1ce165f6313972d6263ce
 F test/func.test 431f8e07a30aadf2a2a0c8c32f918a497bc4331d
 F test/hook.test f8605cde4c77b2c6a4a73723bf6c507796a64dda
@@ -315,7 +315,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P e261b8b09a529a3e67dc27c3b83b660bcb32e195
-R da2542abcece6fe892c1523e2b100875
+P c9c476dd836c49255eabc6cce83064974c079ce3
+R dec9ff08495d988e05cdebca8c7d5cc0
 U drh
-Z e912748a7c659d42e56e6d163324056e
+Z 7195dd21fd04b843659e4b75633e96d2

diff --git a/manifest.uuid b/manifest.uuid
index f7dd99c58f1bcea00950c6e49e887850c6f7270e..886de427aaa2a1639b252fffccca0369d58f2cfb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c9c476dd836c49255eabc6cce83064974c079ce3
\ No newline at end of file
+0d3357b5f65887f7db03db2ae021f28f480f90e4
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 2bb56e4af3cf0aa3e30b880b359792b774a90c85..09cac04665c7e410657c7d370031070bd362ed2a 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.493 2005/10/20 07:28:19 drh Exp $
+** $Id: vdbe.c,v 1.494 2005/10/29 15:48:31 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1214,7 +1214,7 @@ case OP_BitOr:                  /* same as TK_BITOR, no-push */
 case OP_ShiftLeft:              /* same as TK_LSHIFT, no-push */
 case OP_ShiftRight: {           /* same as TK_RSHIFT, no-push */
   Mem *pNos = &pTos[-1];
-  int a, b;
+  i64 a, b;
 
   assert( pNos>=p->aStack );
   if( (pTos->flags | pNos->flags) & MEM_Null ){

diff --git a/test/expr.test b/test/expr.test
index 794de1e7b03f7e832d585919005de23e2532e565..b66d080fcbfcebcf4626bf855ee60db3a23fcd73 100644 (file)
--- a/test/expr.test
+++ b/test/expr.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing expressions.
 #
-# $Id: expr.test,v 1.45 2005/08/19 03:03:52 drh Exp $
+# $Id: expr.test,v 1.46 2005/10/29 15:48:32 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -132,6 +132,11 @@ test_expr expr-1.99 {i1=32, i2=NULL} {coalesce(i1&i2,99)} 99
 test_expr expr-1.100 {i1=1, i2=''} {i1=i2} 0
 test_expr expr-1.101 {i1=0, i2=''} {i1=i2} 0
 
+# Check for proper handling of 64-bit integer values.
+#
+test_expr expr-1.102 {i1=40, i2=1} {i2<<i1} 1099511627776
+
+
 test_expr expr-2.1 {r1=1.23, r2=2.34} {r1+r2} 3.57
 test_expr expr-2.2 {r1=1.23, r2=2.34} {r1-r2} -1.11
 test_expr expr-2.3 {r1=1.23, r2=2.34} {r1*r2} 2.8782
@@ -629,4 +634,6 @@ do_test expr-11.2 {
   execsql {SELECT typeof(9223372036854775808)}
 } {real}
 
+
+
 finish_test