diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-07 19:12:45 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-07 19:12:45 +0200 |
commit | f835588cc2e32da97269cc58e97ee77b5927498a (patch) | |
tree | 8e5c53593e7e3a9db0892afefb118fd0d581e23a /storage/connect/connect.cc | |
parent | 0219ac1e98cc53250a8e165c4b37e83529932256 (diff) | |
parent | b81b6d3f836feb682b963c9489f00ca1ee6a6a95 (diff) | |
download | mariadb-git-f835588cc2e32da97269cc58e97ee77b5927498a.tar.gz |
- Commiting merge files
Diffstat (limited to 'storage/connect/connect.cc')
-rw-r--r-- | storage/connect/connect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc index 8b0aadd52c5..e495a0f62b9 100644 --- a/storage/connect/connect.cc +++ b/storage/connect/connect.cc @@ -197,7 +197,7 @@ PTDB CntGetTDB(PGLOBAL g, LPCSTR name, MODE mode, PHC h) PTDB tdbp; PTABLE tabp; PDBUSER dup= PlgGetUser(g); - PCATLG cat= (dup) ? dup->Catalog : NULL; // Safe over longjmp + volatile PCATLG cat= (dup) ? dup->Catalog : NULL; // Safe over longjmp if (trace) printf("CntGetTDB: name=%s mode=%d cat=%p\n", name, mode, cat); |