diff options
Diffstat (limited to 'src/interfaces/ecpg/test/expected')
| -rw-r--r-- | src/interfaces/ecpg/test/expected/thread-thread.c | 26 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/expected/thread-thread_2.stdout (renamed from src/interfaces/ecpg/test/expected/thread-thread-thread.stdout) | 0 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/expected/thread-thread_implicit.c | 26 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/expected/thread-thread_implicit_2.stdout (renamed from src/interfaces/ecpg/test/expected/thread-thread_implicit-thread.stdout) | 0 |
4 files changed, 30 insertions, 22 deletions
diff --git a/src/interfaces/ecpg/test/expected/thread-thread.c b/src/interfaces/ecpg/test/expected/thread-thread.c index 9555a79bfa..36d920eb3c 100644 --- a/src/interfaces/ecpg/test/expected/thread-thread.c +++ b/src/interfaces/ecpg/test/expected/thread-thread.c @@ -153,15 +153,19 @@ void *test_thread(void *arg) /* build up connection name, and connect to database */ +#ifndef WIN32_ONLY_COMPILER snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum); +#else + _snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum); +#endif /* exec sql whenever sqlerror sqlprint ; */ -#line 107 "thread.pgc" +#line 111 "thread.pgc" { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , l_connection, 0); -#line 108 "thread.pgc" +#line 112 "thread.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 108 "thread.pgc" +#line 112 "thread.pgc" if( sqlca.sqlcode != 0 ) { @@ -169,10 +173,10 @@ if (sqlca.sqlcode < 0) sqlprint();} return( NULL ); } { ECPGtrans(__LINE__, l_connection, "begin transaction "); -#line 114 "thread.pgc" +#line 118 "thread.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 114 "thread.pgc" +#line 118 "thread.pgc" /* insert into test_thread table */ @@ -183,10 +187,10 @@ if (sqlca.sqlcode < 0) sqlprint();} ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_int,&(l_i),(long)1,(long)1,sizeof(int), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); -#line 119 "thread.pgc" +#line 123 "thread.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 119 "thread.pgc" +#line 123 "thread.pgc" if( sqlca.sqlcode != 0 ) printf("%s: ERROR: insert failed!\n", l_connection); @@ -194,16 +198,16 @@ if (sqlca.sqlcode < 0) sqlprint();} /* all done */ { ECPGtrans(__LINE__, l_connection, "commit"); -#line 125 "thread.pgc" +#line 129 "thread.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 125 "thread.pgc" +#line 129 "thread.pgc" { ECPGdisconnect(__LINE__, l_connection); -#line 126 "thread.pgc" +#line 130 "thread.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 126 "thread.pgc" +#line 130 "thread.pgc" return( NULL ); } diff --git a/src/interfaces/ecpg/test/expected/thread-thread-thread.stdout b/src/interfaces/ecpg/test/expected/thread-thread_2.stdout index a9d787cc55..a9d787cc55 100644 --- a/src/interfaces/ecpg/test/expected/thread-thread-thread.stdout +++ b/src/interfaces/ecpg/test/expected/thread-thread_2.stdout diff --git a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c index f48db90559..bf20c51bb5 100644 --- a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c +++ b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c @@ -154,15 +154,19 @@ void *test_thread(void *arg) /* build up connection name, and connect to database */ +#ifndef WIN32_ONLY_COMPILER snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum); +#else + _snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum); +#endif /* exec sql whenever sqlerror sqlprint ; */ -#line 108 "thread_implicit.pgc" +#line 112 "thread_implicit.pgc" { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , l_connection, 0); -#line 109 "thread_implicit.pgc" +#line 113 "thread_implicit.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 109 "thread_implicit.pgc" +#line 113 "thread_implicit.pgc" if( sqlca.sqlcode != 0 ) { @@ -170,10 +174,10 @@ if (sqlca.sqlcode < 0) sqlprint();} return( NULL ); } { ECPGtrans(__LINE__, NULL, "begin transaction "); -#line 115 "thread_implicit.pgc" +#line 119 "thread_implicit.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 115 "thread_implicit.pgc" +#line 119 "thread_implicit.pgc" /* insert into test_thread table */ @@ -184,10 +188,10 @@ if (sqlca.sqlcode < 0) sqlprint();} ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_int,&(l_i),(long)1,(long)1,sizeof(int), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); -#line 120 "thread_implicit.pgc" +#line 124 "thread_implicit.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 120 "thread_implicit.pgc" +#line 124 "thread_implicit.pgc" if( sqlca.sqlcode != 0 ) printf("%s: ERROR: insert failed!\n", l_connection); @@ -195,16 +199,16 @@ if (sqlca.sqlcode < 0) sqlprint();} /* all done */ { ECPGtrans(__LINE__, NULL, "commit"); -#line 126 "thread_implicit.pgc" +#line 130 "thread_implicit.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 126 "thread_implicit.pgc" +#line 130 "thread_implicit.pgc" { ECPGdisconnect(__LINE__, l_connection); -#line 127 "thread_implicit.pgc" +#line 131 "thread_implicit.pgc" if (sqlca.sqlcode < 0) sqlprint();} -#line 127 "thread_implicit.pgc" +#line 131 "thread_implicit.pgc" return( NULL ); } diff --git a/src/interfaces/ecpg/test/expected/thread-thread_implicit-thread.stdout b/src/interfaces/ecpg/test/expected/thread-thread_implicit_2.stdout index a9d787cc55..a9d787cc55 100644 --- a/src/interfaces/ecpg/test/expected/thread-thread_implicit-thread.stdout +++ b/src/interfaces/ecpg/test/expected/thread-thread_implicit_2.stdout |