diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-01-24 17:02:09 -0500 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-01-24 17:02:09 -0500 |
commit | e3565fd61cee16414a682d2be0d44c112a80a30c (patch) | |
tree | 4e9cfa01c3ba898b932369b4bac3257e2fc0bbe1 /src/interfaces/ecpg/test/expected/thread-prep.c | |
parent | d5a1fde397269bd60b99e70a4eb2934b75fd31ec (diff) |
Remove _configthreadlocale() calls in ecpg test suite.
This essentially reverts commits a772624b1 and 04fbe0e45, which
added "_configthreadlocale(_ENABLE_PER_THREAD_LOCALE)" calls to the
thread-related ecpg test programs. That was nothing but a hack,
because we shouldn't expect that ecpg-using applications have
done that for us; and now that we've inserted such calls into
ecpglib, the tests should still pass without it.
(If they don't, it would be good to know that.)
HEAD only; there seems no big need to change this in the
back branches.
Discussion: https://postgr.es/m/22937.1548307384@sss.pgh.pa.us
Diffstat (limited to 'src/interfaces/ecpg/test/expected/thread-prep.c')
-rw-r--r-- | src/interfaces/ecpg/test/expected/thread-prep.c | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/src/interfaces/ecpg/test/expected/thread-prep.c b/src/interfaces/ecpg/test/expected/thread-prep.c index 94e02933cd8..98861d36f02 100644 --- a/src/interfaces/ecpg/test/expected/thread-prep.c +++ b/src/interfaces/ecpg/test/expected/thread-prep.c @@ -145,58 +145,52 @@ static void* fn(void* arg) #line 43 "prep.pgc" -#ifdef WIN32 -#ifdef _MSC_VER /* requires MSVC */ - _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); -#endif -#endif - value = (long)arg; sprintf(name, "Connection: %d", value); { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , name, 0); -#line 54 "prep.pgc" +#line 48 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 54 "prep.pgc" +#line 48 "prep.pgc" { ECPGsetcommit(__LINE__, "on", NULL); -#line 55 "prep.pgc" +#line 49 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 55 "prep.pgc" +#line 49 "prep.pgc" for (i = 1; i <= REPEATS; ++i) { { ECPGprepare(__LINE__, NULL, 0, "i", query); -#line 58 "prep.pgc" +#line 52 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 58 "prep.pgc" +#line 52 "prep.pgc" { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "i", ECPGt_int,&(value),(long)1,(long)1,sizeof(int), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); -#line 59 "prep.pgc" +#line 53 "prep.pgc" if (sqlca.sqlcode == ECPG_NOT_FOUND) sqlprint(); -#line 59 "prep.pgc" +#line 53 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 59 "prep.pgc" +#line 53 "prep.pgc" } { ECPGdeallocate(__LINE__, 0, NULL, "i"); -#line 61 "prep.pgc" +#line 55 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 61 "prep.pgc" +#line 55 "prep.pgc" { ECPGdisconnect(__LINE__, name); -#line 62 "prep.pgc" +#line 56 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 62 "prep.pgc" +#line 56 "prep.pgc" return 0; @@ -212,34 +206,34 @@ int main () #endif { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , NULL, 0); -#line 76 "prep.pgc" +#line 70 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 76 "prep.pgc" +#line 70 "prep.pgc" { ECPGsetcommit(__LINE__, "on", NULL); -#line 77 "prep.pgc" +#line 71 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 77 "prep.pgc" +#line 71 "prep.pgc" { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table if exists T", ECPGt_EOIT, ECPGt_EORT); -#line 78 "prep.pgc" +#line 72 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 78 "prep.pgc" +#line 72 "prep.pgc" { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table T ( i int )", ECPGt_EOIT, ECPGt_EORT); -#line 79 "prep.pgc" +#line 73 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 79 "prep.pgc" +#line 73 "prep.pgc" { ECPGdisconnect(__LINE__, "CURRENT"); -#line 80 "prep.pgc" +#line 74 "prep.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 80 "prep.pgc" +#line 74 "prep.pgc" #ifdef WIN32 |