Index: src/sqlite.h.in
==================================================================
--- src/sqlite.h.in
+++ src/sqlite.h.in
@@ -28,11 +28,11 @@
 ** The name of this file under configuration management is "sqlite.h.in".
 ** The makefile makes some minor changes to this file (such as inserting
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite.h.in,v 1.303 2008/04/10 13:38:18 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.304 2008/04/10 17:14:07 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
 #include <stdarg.h>     /* Needed for the definition of va_list */
 
@@ -3944,11 +3944,12 @@
 ** routines make a copy private copy of the error message text before
 ** they return.  Hence, the calling function can deallocate or
 ** modify the text after they return without harm.
 ** The sqlite3_result_error_code() function changes the error code
 ** returned by SQLite as a result of an error in a function.  By default,
-** the error code is SQLITE_ERROR. 
+** the error code is SQLITE_ERROR.  A subsequent call to sqlite3_result_error()
+** or sqlite3_result_error16() resets the error code to SQLITE_ERROR.
 **
 ** The sqlite3_result_toobig() interface causes SQLite
 ** to throw an error indicating that a string or BLOB is to long
 ** to represent.  The sqlite3_result_nomem() interface
 ** causes SQLite to throw an exception indicating that the a

Index: src/test_func.c
==================================================================
--- src/test_func.c
+++ src/test_func.c
@@ -10,11 +10,11 @@
 **
 *************************************************************************
 ** Code for testing all sorts of SQLite interfaces.  This code
 ** implements new SQL functions used by the test scripts.
 **
-** $Id: test_func.c,v 1.3 2008/03/19 19:01:22 drh Exp $
+** $Id: test_func.c,v 1.4 2008/04/10 17:14:07 drh Exp $
 */
 #include "sqlite3.h"
 #include "tcl.h"
 #include <stdlib.h>
 #include <string.h>
@@ -188,18 +188,22 @@
   sqlite3_result_text(pCtx, zRet, 2*nArg-1, free_test_auxdata);
 }
 
 /*
 ** A function to test error reporting from user functions. This function
-** returns a copy of its first argument as an error.
+** returns a copy of its first argument as the error message.  If the
+** second argument exists, it becomes the error code.
 */
 static void test_error(
   sqlite3_context *pCtx, 
   int nArg,
   sqlite3_value **argv
 ){
-  sqlite3_result_error(pCtx, (char*)sqlite3_value_text(argv[0]), 0);
+  sqlite3_result_error(pCtx, (char*)sqlite3_value_text(argv[0]), -1);
+  if( nArg==2 ){
+    sqlite3_result_error_code(pCtx, sqlite3_value_int(argv[1]));
+  }
 }
 
 static int registerTestFunctions(sqlite3 *db){
   static const struct {
      char *zName;
@@ -211,10 +215,11 @@
     { "test_destructor",       1, SQLITE_UTF8, test_destructor},
     { "test_destructor16",     1, SQLITE_UTF8, test_destructor16},
     { "test_destructor_count", 0, SQLITE_UTF8, test_destructor_count},
     { "test_auxdata",         -1, SQLITE_UTF8, test_auxdata},
     { "test_error",            1, SQLITE_UTF8, test_error},
+    { "test_error",            2, SQLITE_UTF8, test_error},
   };
   int i;
   extern int Md5_Register(sqlite3*);
 
   for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){

Index: test/capi3c.test
==================================================================
--- test/capi3c.test
+++ test/capi3c.test
@@ -11,11 +11,11 @@
 # This file implements regression tests for SQLite library.  
 #
 # This is a copy of the capi3.test file that has been adapted to
 # test the new sqlite3_prepare_v2 interface.
 #
-# $Id: capi3c.test,v 1.16 2008/03/19 13:03:34 drh Exp $
+# $Id: capi3c.test,v 1.17 2008/04/10 17:14:07 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
@@ -85,10 +85,11 @@
   sqlite3_errcode $DB
 } {SQLITE_ERROR}
 do_test capi3c-1.7 {
   sqlite3_errmsg $DB
 } {no such column: namex}
+
 
 ifcapable {utf16} {
   do_test capi3c-2.1 {
     set sql16 [utf16 {SELECT name FROM sqlite_master}]
     set STMT [sqlite3_prepare16_v2  $DB $sql16 -1 ::TAIL]
@@ -1241,8 +1242,29 @@
     sqlite3_finalize $STMT
   } {SQLITE_INTERRUPT}
   do_test capi3c-21.7 {
     sqlite3_errcode $DB
   } {SQLITE_INTERRUPT}
-}  
+}
+
+# Make sure sqlite3_result_error_code() returns the correct error code.
+# See ticket #2940
+#
+do_test capi3c-22.1 {
+  db progress 0 {}
+  set STMT [sqlite3_prepare_v2 db {SELECT test_error('the message',3)} -1 TAIL]
+  sqlite3_step $STMT
+} {SQLITE_PERM}
+sqlite3_finalize $STMT
+do_test capi3c-22.2 {
+  set STMT [sqlite3_prepare_v2 db {SELECT test_error('the message',4)} -1 TAIL]
+  sqlite3_step $STMT
+} {SQLITE_ABORT}
+sqlite3_finalize $STMT
+do_test capi3c-22.3 {
+  set STMT [sqlite3_prepare_v2 db {SELECT test_error('the message',16)} -1 TAIL]
+  sqlite3_step $STMT
+} {SQLITE_EMPTY}
+sqlite3_finalize $STMT
+
 
 finish_test

Index: test/func.test
==================================================================
--- test/func.test
+++ test/func.test
@@ -9,11 +9,11 @@
 #
 #***********************************************************************
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing built-in functions.
 #
-# $Id: func.test,v 1.75 2008/03/21 17:13:13 drh Exp $
+# $Id: func.test,v 1.76 2008/04/10 17:14:07 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
 # Create a table to work with.
@@ -533,14 +533,21 @@
     db function [string repeat X 256] {return "hello"}
   }
 } {1}
 
 do_test func-15.1 {
-  catchsql {
-    select test_error(NULL);
-  }
+  catchsql {select test_error(NULL)}
 } {1 {}}
+do_test func-15.2 {
+  catchsql {select test_error('this is the error message')}
+} {1 {this is the error message}}
+do_test func-15.3 {
+  catchsql {select test_error('this is the error message',12)}
+} {1 {this is the error message}}
+do_test func-15.4 {
+  db errorcode
+} {12}
 
 # Test the quote function for BLOB and NULL values.
 do_test func-16.1 {
   execsql {
     CREATE TABLE tbl2(a, b);