diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
| commit | b1c4118a33f669f8be7131c7d37b34dbe63ff545 (patch) | |
| tree | 468fdf51066947dd8254753ee98163be97d0d0b8 /src/server/shared/Database/MySQLConnection.h | |
| parent | f237a57f51c0473bda90bae7a06bd5b9c187754b (diff) | |
| parent | 8d049545de87595a84e6e2c54d7b44b354644144 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/shared/Database/MySQLConnection.h')
| -rwxr-xr-x | src/server/shared/Database/MySQLConnection.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Database/MySQLConnection.h b/src/server/shared/Database/MySQLConnection.h index c05c4e62c96..c597476967d 100755 --- a/src/server/shared/Database/MySQLConnection.h +++ b/src/server/shared/Database/MySQLConnection.h @@ -33,7 +33,7 @@ enum ConnectionFlags { CONNECTION_ASYNC = 0x1, CONNECTION_SYNCH = 0x2, - CONNECTION_BOTH = CONNECTION_ASYNC | CONNECTION_SYNCH, + CONNECTION_BOTH = CONNECTION_ASYNC | CONNECTION_SYNCH }; struct MySQLConnectionInfo |