diff options
| author | Andreas Rumpf <ar@kimeta.de> | 2014-04-10 01:47:20 +0200 |
|---|---|---|
| committer | Andreas Rumpf <ar@kimeta.de> | 2014-04-10 01:47:20 +0200 |
| commit | dcfc7a8896166563f6fd80fbab81bc50e0b5a217 (patch) | |
| tree | 4a247ec2d64bafec53e5ab24b0fda89642908a07 /lib/wrappers/mysql.nim | |
| parent | a86c774932afd8b6782df1925837df9df04ef381 (diff) | |
| parent | 8b82004359b8d852fa0107d79cc78b21eb35c028 (diff) | |
| download | Nim-dcfc7a8896166563f6fd80fbab81bc50e0b5a217.tar.gz | |
resolved conflict
Diffstat (limited to 'lib/wrappers/mysql.nim')
| -rw-r--r-- | lib/wrappers/mysql.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wrappers/mysql.nim b/lib/wrappers/mysql.nim index 5a8d4c98b..84d70287f 100644 --- a/lib/wrappers/mysql.nim +++ b/lib/wrappers/mysql.nim @@ -19,7 +19,7 @@ when defined(Windows): type my_bool* = bool Pmy_bool* = ptr my_bool - PVIO* = Pointer + PVIO* = pointer Pgptr* = ptr gptr gptr* = cstring Pmy_socket* = ptr my_socket @@ -645,7 +645,7 @@ type next_slave*: Pst_mysql last_used_slave*: Pst_mysql # needed for round-robin slave pick last_used_con*: Pst_mysql # needed for send/read/store/use result to work correctly with replication - stmts*: Pointer # was PList, list of all statements + stmts*: pointer # was PList, list of all statements methods*: Pst_mysql_methods thd*: pointer # Points to boolean flag in MYSQL_RES or MYSQL_STMT. We set this flag # from mysql_stmt_close if close had to cancel result set of this object. |