From: drh <drh@noemail.net>
Date: Thu, 23 Oct 2014 01:01:26 +0000 (+0000)
Subject: Implement sqlite3_create_collation() by invoking
X-Git-Tag: version-3.8.8~228
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f81bbb5289cdd248c21775b9e4cdb92e110e139;p=thirdparty%2Fsqlite.git

Implement sqlite3_create_collation() by invoking
sqlite3_create_collation_v2() with a NULL destructor argument.  This saves
a little space.

FossilOrigin-Name: 9762ad0639cca2fc1ef0573113fb613ce9e7e83e
---

diff --git a/manifest b/manifest
index ae5d008c78..5b87a53662 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\suse\sof\sstrchrnul()\sunless\sspecifically\senabled\sby\scompile-time\noptions.
-D 2014-10-22T20:07:19.558
+C Implement\ssqlite3_create_collation()\sby\sinvoking\s\nsqlite3_create_collation_v2()\swith\sa\sNULL\sdestructor\sargument.\s\sThis\ssaves\na\slittle\sspace.
+D 2014-10-23T01:01:26.636
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -194,7 +194,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
-F src/main.c bbe872b0ac0007bed0ebe1936fc493b039ad4f51
+F src/main.c 8207ece1b4005b1efab55d1505d8ffb45bfced05
 F src/malloc.c 3c3ac67969612493d435e14b6832793209afd2ec
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@ -1205,7 +1205,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 ca3b00c44ec52d209642a5ba9ef82e085fac39db
-R 8aff7924cf3a3f93f4ee99fb545d1f5f
+P e580470db77d6da970c755102790e603fb26b3c6
+R f159389d59e4350424d5f438676d787b
 U drh
-Z c6210337ac863b7dfe5cbe19c541a0aa
+Z 177632e852e703fce9e831bfbe27f418
diff --git a/manifest.uuid b/manifest.uuid
index 857c7b0e10..b0a7f1f074 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e580470db77d6da970c755102790e603fb26b3c6
\ No newline at end of file
+9762ad0639cca2fc1ef0573113fb613ce9e7e83e
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index ea03f2639f..e6cb4cd3df 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2751,13 +2751,7 @@ int sqlite3_create_collation(
   void* pCtx,
   int(*xCompare)(void*,int,const void*,int,const void*)
 ){
-  int rc;
-  sqlite3_mutex_enter(db->mutex);
-  assert( !db->mallocFailed );
-  rc = createCollation(db, zName, (u8)enc, pCtx, xCompare, 0);
-  rc = sqlite3ApiExit(db, rc);
-  sqlite3_mutex_leave(db->mutex);
-  return rc;
+  return sqlite3_create_collation_v2(db, zName, enc, pCtx, xCompare, 0);
 }
 
 /*