Update of /cvsroot/monetdb/sql/src/test/BugTracker/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9464/src/test/BugTracker/Tests
Modified Files:
crash_on_concurrent_use.SF-1411926.py
Log Message:
propagated changes of Thursday Jun 28 2007 - Sunday Jul 01 2007
from the SQL_2-18 branch to the development trunk
NOTE:
I hope, I resolved the conflicts in
src/backends/monet4/sql_server.mx
src/backends/monet5/sql.mx
src/backends/monet5/sql_optimizer.mx
src/test/Dependencies/Tests/Dependencies.stable.out
correctly --- please double-check!
Index: crash_on_concurrent_use.SF-1411926.py
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/crash_on_concurrent_use.SF-1411926.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- crash_on_concurrent_use.SF-1411926.py 22 Jun 2007 07:09:15 -0000
1.2
+++ crash_on_concurrent_use.SF-1411926.py 1 Jul 2007 14:34:37 -0000
1.3
@@ -10,6 +10,7 @@
return srv
def server_stop(srv):
+ time.sleep(5) # give server time to start
srv.close()
def clients(client, runs, clmd):
@@ -34,7 +35,11 @@
clients(self.client, 20, clcmd)
def main():
- srv = server_start('include sql;')
+ check_version = os.system('%s --version' % os.getenv('MSERVER'))
+ if check_version == 0:
+ srv = server_start('include sql;')
+ else:
+ srv = server_start('module(sql_server);')
client_0 = Client(0)
client_1 = Client(1)
client_0.start()
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
