|
1 | 1 | /********************************************************************** |
2 | 2 | * plpython.c - python as a procedural language for PostgreSQL |
3 | 3 | * |
4 | | - *$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.137 2010/02/14 18:42:19 rhaas Exp $ |
| 4 | + *$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.138 2010/02/18 23:50:06 tgl Exp $ |
5 | 5 | * |
6 | 6 | ********************************************************************* |
7 | 7 | */ |
@@ -2763,7 +2763,7 @@ PLy_spi_prepare(PyObject *self, PyObject *args) |
2763 | 2763 | PyObject*volatileoptr=NULL; |
2764 | 2764 | char*query; |
2765 | 2765 | void*tmpplan; |
2766 | | -MemoryContextoldcontext; |
| 2766 | +volatileMemoryContextoldcontext; |
2767 | 2767 |
|
2768 | 2768 | /* Can't execute more if we have an unhandled error */ |
2769 | 2769 | if (PLy_error_in_progress) |
@@ -2934,7 +2934,7 @@ PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit) |
2934 | 2934 | inti, |
2935 | 2935 | rv; |
2936 | 2936 | PLyPlanObject*plan; |
2937 | | -MemoryContextoldcontext; |
| 2937 | +volatileMemoryContextoldcontext; |
2938 | 2938 |
|
2939 | 2939 | if (list!=NULL) |
2940 | 2940 | { |
@@ -3081,7 +3081,7 @@ static PyObject * |
3081 | 3081 | PLy_spi_execute_query(char*query,longlimit) |
3082 | 3082 | { |
3083 | 3083 | intrv; |
3084 | | -MemoryContextoldcontext; |
| 3084 | +volatileMemoryContextoldcontext; |
3085 | 3085 |
|
3086 | 3086 | oldcontext=CurrentMemoryContext; |
3087 | 3087 | PG_TRY(); |
@@ -3116,7 +3116,7 @@ static PyObject * |
3116 | 3116 | PLy_spi_execute_fetch_result(SPITupleTable*tuptable,introws,intstatus) |
3117 | 3117 | { |
3118 | 3118 | PLyResultObject*result; |
3119 | | -MemoryContextoldcontext; |
| 3119 | +volatileMemoryContextoldcontext; |
3120 | 3120 |
|
3121 | 3121 | result= (PLyResultObject*)PLy_result_new(); |
3122 | 3122 | Py_DECREF(result->status); |
|