Merge lp:~jan-kneschke/mysql-proxy/prep-stmt-codecs into lp:mysql-proxy/0.8

[Jan Kneschke]

* added a network_mysqld_type_t infrastructure that can store and convert types that are known to the binary row type (network_mysqld_type.[ch])
* added encoders and decoders for the binary row format (network_mysqld_proto_binary.[ch])
* added encoders and decoders for COM_STMT_PREPARE, COM_STMT_EXECUTE, COM_STMT_CLOSE and its special response packets
* added a example on how to use them examples/tutorial-prep-stmt.lua

[lp:~jan-kneschke/mysql-proxy/prep-stmt-codecs]

1158. By <email address hidden> on 2010-09-22

handle invalid type gracefully instead of causing a g_error()

1159. By <email address hidden> on 2010-09-22

moved the protocol dumps to doc/protocol.txt

1160. By <email address hidden> on 2010-09-22

removed unnecessary use of G_STMT_START and _END

1161. By <email address hidden> on 2010-09-22

cleaned up the code and the comments a bit

  * removed bogus comments
  * use wrapper functions like network_mysqld_type_set_* instead of type->set_*()
  * use a switch(type) instead of if'ing each value one by one

1162. By <email address hidden> on 2010-09-22

split the packet into reasonible pieces

1163. By <email address hidden> on 2010-09-22

added test-case for network_mysqld_type.c

  * expose the min-buf-len's for the _get_string() functions that use a fixed buffer

1164. By <email address hidden> on 2010-09-22

check the length of the date and time fields before we add them to the strings

  * use the _MIN_BUF_LEN's instead of counting the min-buf-lengths by hand

1165. By <email address hidden> on 2010-09-22

cosmetic changes

  * use 'param' instead of 'type' here
  * removed bogus comments

1166. By <email address hidden> on 2010-09-22

if we can't get the double, don't try to append it

1167. By <email address hidden> on 2010-09-23

restructed the file into a valid reST file and added infos about MYSQL_TYPE_* and COM_*

  * see http://docutils.sourceforge.net/

1168. By <email address hidden> on 2010-09-23

streamlined the payload description

  * described the possible types of the payload
  * adjusted the payload descriptions of the packets to follow it strictly

1169. By <email address hidden> on 2010-09-23

allow COM_STMT_PREPAREs to fail and linked its OK packet

1170. By <email address hidden> on 2010-09-23

document COM_SLEEP, COM_INIT_DB, _CREATE_DB and _DROP_DB

1171. By <email address hidden> on 2010-09-23

moved OK and ERR into the Generic Packets section and EOF into the text resultset

1172. By <email address hidden> on 2010-09-23

added 'COM_STMT_EXECUTE Response' and added a few more 'response:' fields to the packet definitions

1173. By <email address hidden> on 2010-09-23

added LOCAL INFILE handling

1174. By <email address hidden> on 2010-09-23

added links to the external documents describing the protocol

1175. By <email address hidden> on 2010-09-23

documented the packets of the auth phase

1176. By <email address hidden> on 2010-09-23

added COM_STMT_RESET and _STMT_SEND_LONG_DATA

1177. By <email address hidden> on 2010-09-23

added the pre-4.1 column definition

1178. By <email address hidden> on 2010-09-23

COM_STMT_RESET has a response: OK or ERR

1179. By <email address hidden> on 2010-09-23

_SEND_LONG_DATA is 18

1180. By <email address hidden> on 2010-09-27

added COM_FIELD_LIST

1181. By <email address hidden> on 2010-09-27

added COM_PROCESS_INFO, _PROCESS_KILL and _PING

1182. By <email address hidden> on 2010-09-27

documented the commands that are not handled by the server

1183. By <email address hidden> on 2010-09-27

added COM_SET_OPTION

1184. By <email address hidden> on 2010-09-27

added COM_DEBUG, _STATISTICS and _SHUTDOWN

1185. By <email address hidden> on 2010-09-27

TABLE_DUMP and CONNECT_OUT are undefined in 5.x

1186. By <email address hidden> on 2010-09-27

added COM_CHANGE_USER

1187. By <email address hidden> on 2010-09-27

documented multi-resultsets and all the server-status flags

1188. By <email address hidden> on 2010-09-27

moved the status flags to the OK packet

1189. By <email address hidden> on 2010-09-27

added the capability flags

1190. By <email address hidden> on 2010-09-27

added some more cross-references

1191. By <email address hidden> on 2010-09-27

fixed section indention to put the COM_* responses as sub-section of the command

1192. By <email address hidden> on 2010-09-27

added the COM_STMT_EXECUTE flags and did some cosmetic changes and typo fixes

1193. By <email address hidden> on 2010-09-27

replaced doxygen version of scripting.txt by a reST version

  * added the basic structure
  * documented the mysql.proto module

1194. By <email address hidden> on 2010-09-27

removed the document headings

1195. By <email address hidden> on 2010-09-27

moved the protocol.txt and scripting.txt into the chapter/ dir

  * allow to include them into standalone documents and into the
    full book

1196. By <email address hidden> on 2010-09-27

added rules to generate a full book and standalone pieces of protocol and scripting

1197. By <email address hidden> on 2010-09-27

removed the use of the gnu-make extension

1198. By <email address hidden> on 2010-09-27

use AC_MISSING() to let "make html" fail nicely if rst2html.py isn't installed

Unmerged revisions

=== modified file 'doc/protocol.txt'
--- doc/protocol.txt	2009-06-29 16:39:46 +0000
+++ doc/protocol.txt	2010-09-22 15:13:16 +0000
@@ -1,123 +1,478 @@
-/** 
-@page protocol MySQL Protocol
-
-The MySQL Protocol is spilt into the four phases:
-
-@dot
-digraph {
-connect -> auth;
-auth -> command;
-command -> disconnect;
-command -> command;
-connect -> disconnect;
-auth -> disconnect;
-}
-@enddot
-
-The client and the server send and receive packets as documented in http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol 
-
-@dot
-digraph states {
-  graph [rankdir=LR];
-  node [fontname=Helvetica, fontsize=10];
-
-  connect [ shape=record ];
-  disconnect [ shape=record ];
-
-  subgraph cluster_client { 
-    label = "client";
-    style = filled;
-    node [ style=filled, fillcolor=lightblue ];
-    connect; 
-    auth_response; 
-    auth_old; 
-    command; 
-    command_local;
-  }
-
-  subgraph cluster_server { 
-    label = "server";
-    style = filled;
-    node [ style=filled, fillcolor=orange ];
-    auth_challenge; 
-    auth_result; 
-    command_result; 
-    command_infile;
-  }
-  
-  subgraph { 
-    edge [ fontcolor=blue, color=blue, fontsize=10, fontname=Helvetica ];
-
-    connect->auth_challenge [ label = "connecting server" ];
-    auth_response->auth_result [ label = "capabilities, password, default-db", URL="http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Client_Authentication_Packet" ]; 
-    auth_old->auth_result [ label = "scrambled password" ] ; 
-    command->command_result [ label = "command (COM_*)", URL="http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Command_Packet" ] ;
-    command->command_infile [ label = "LOAD DATA INFILE LOCAL" ];
-    command_local->command_result [ label = "file content"];
-  }
-
-  subgraph {
-    edge [ fontcolor=red, color=red, fontsize=10, fontname=Helvetica ];
-    auth_challenge->disconnect [ label = "ERR: host denied", URL="http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Error_Packet" ];
-    auth_challenge->auth_response [ label = "0x10: auth_challenge", URL="http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Handshake_Initialization_Packet" ];
-    auth_result->auth_old [ label = "EOF: old password reauth" ];
-    auth_result->command [ label = "OK: auth done", URL="http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#OK_Packet" ];
-    auth_result->disconnect [ label = "ERR: auth failed", URL="http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Error_Packet" ];
-    command_result->command [ label = "OK|ERR|Resultset", URL="http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Result_Set_Header_Packet" ] ;
-    command_result->disconnect [ label = "command = COM_QUIT" ];
-    command_result->command_result [ label = "command = COM_BINLOG_DUMP" ];
-    command_infile->command_local [ label = "EOF: filename" ];
-  }
-}
-@enddot
-
-The @ref page-core exposes all the states to the @ref page-plugins.
-
-@section section-protocol-use-cases Use Cases
-
--# the client connects to the server and waits for data to return @msc
-  client, backend;
-  --- [ label = "connect to backend" ];
-  client->backend  [ label = "INIT" ];
-@endmsc
--# the auth-phase handles the new SHA1-style passwords and the old scramble() passwords 
-  -# 4.1+ passwords @msc
-  client, backend;
-  --- [ label = "authenticate" ];
-  backend->client [ label = "HANDSHAKE" ];
-  client->backend [ label = "AUTH" ];
-  backend->client [ label = "AUTH_RESULT" ];
-@endmsc
-  -# pre-4.1 passwords @msc
-  client, backend;
-  --- [ label = "authenticate" ];
-  backend->client [ label = "HANDSHAKE" ];
-  client->backend [ label = "AUTH" ];
-  backend->client [ label = "OLD_PASSWORD_SCRAMBLE" ];
-  client->backend [ label = "OLD_PASSWORD_AUTH" ];
-  backend->client [ label = "AUTH_RESULT" ];
-@endmsc
--# the query-phase repeats 
-  -# COM_QUERY and friends @msc
-  client, backend;
-  --- [ label = "query result phase" ];
-  client->backend [ label = "QUERY" ];
-  backend->client [ label = "QUERY_RESULT" ];
-@endmsc
-  -# COM_QUIT @msc
-  client, backend;
-  --- [ label = "query result phase" ];
-  client->backend [ label = "QUERY" ];
-  backend->client [ label = "connection close" ];
-@endmsc
-  -# COM_BINLOG_DUMP @msc
-  client, backend;
-  --- [ label = "query result phase" ];
-  client->backend [ label = "QUERY" ];
-  backend->client [ label = "QUERY_RESULT" ];
-  ... [ label = "more binlog entries" ];
-  backend->client [ label = "QUERY_RESULT"];
-@endmsc
- */
+
+
+
+The packets
+===========
+
+All the examples here are captured with:
+
+  $ ngrep -x -q -d lo0 '' 'port 3306'
+
+The packets that are exchanged between client and server look like:
+
+  ...
+  T 127.0.0.1:51656 -> 127.0.0.1:3306 [AP]
+    01 00 00 00 01 
+
+The example shows a COM_QUIT packet. It starts (like all packets) with a 4 byte packet header:
+
+* 3 byte length
+* 1 byte sequence-id
+
+The length is the length of the payload of the packet. If the payload is larger than 2^24-2 bytes the length is set to 2^24-1
+and a additional packets are sent with the rest of the payload until the payload of a packet is less than 2^24-2 bytes.
+
+The sequence-id is incremented with each packet for a sequence of packets. It is reset, when a new command begins.
+
+A mysql client logs in
+----------------------
+
+Taking a look at the packet dump when a mysql-client logs in:
+
+  client -> server 
+    <connect>
+
+The client initiates the communication by connecting to the server.
+
+  server -> client
+    36 00 00 00 0a 35 2e 35    2e 32 2d 6d 32 00 03 00    6....5.5.2-m2...
+    00 00 27 75 3e 6f 38 66    79 4e 00 ff f7 08 02 00    ..'u>o8fyN......
+    00 00 00 00 00 00 00 00    00 00 00 00 00 57 4d 5d    .............WM]
+    6a 7c 53 68 32 5c 59 2e    73 00                      j|Sh2\Y.s.      
+  
+which responds with a handshake packet which contains the version, some flags and a password challenge.
+
+  client -> server
+    3a 00 00 01 05 a6 03 00    00 00 00 01 08 00 00 00    :...............
+    00 00 00 00 00 00 00 00    00 00 00 00 00 00 00 00    ................
+    00 00 00 00 72 6f 6f 74    00 14 cb b5 ea 68 eb 6b    ....root.....h.k
+    3b 03 cb ae fb 9b df 5a    cb 0f 6d b5 de fd          ;......Z..m...  
+
+The client answers with username, some flags and the response to the challenge.
+
+  server -> client
+    07 00 00 02 00 00 00 02    00 00 00                   ...........     
+  
+As the client provided the right password and the flags are fine, the server responds with a OK packet. That closes auth-phase
+and switches to the command-phase.
+
+  client -> server
+    21 00 00 00 03 73 65 6c    65 63 74 20 40 40 76 65    !....select @@ve
+    72 73 69 6f 6e 5f 63 6f    6d 6d 65 6e 74 20 6c 69    rsion_comment li
+    6d 69 74 20 31                                        mit 1           
+ 
+The mysql client first checks the version string of the server and sends a COM_QUERY packet.
+
+  server -> client
+    01 00 00 01 01 27 00 00    02 03 64 65 66 00 00 00    .....'....def...
+    11 40 40 76 65 72 73 69    6f 6e 5f 63 6f 6d 6d 65    .@@version_comme
+    6e 74 00 0c 08 00 1c 00    00 00 fd 00 00 1f 00 00    nt..............
+    05 00 00 03 fe 00 00 02    00 1d 00 00 04 1c 4d 79    ..............My
+    53 51 4c 20 43 6f 6d 6d    75 6e 69 74 79 20 53 65    SQL Community Se
+    72 76 65 72 20 28 47 50    4c 29 05 00 00 05 fe 00    rver (GPL)......
+    00 02 00                                              ...             
+
+The server responds with a resultset containing the version-string.
+
+  client -> server
+    0e 00 00 00 03 73 65 6c    65 63 74 20 55 53 45 52    .....select USER
+    28 29                                                 ()              
+
+For the prompt (\u ...) the mysql client also asks for the current username.  
+
+  server -> client
+    01 00 00 01 01 1c 00 00    02 03 64 65 66 00 00 00    ..........def...
+    06 55 53 45 52 28 29 00    0c 08 00 4d 00 00 00 fd    .USER()....M....
+    01 00 1f 00 00 05 00 00    03 fe 00 00 02 00 0f 00    ................
+    00 04 0e 72 6f 6f 74 40    6c 6f 63 61 6c 68 6f 73    ...root@localhos
+    74 05 00 00 05 fe 00 00    02 00                      t.........      
+
+which is 'root@localhost' in this example.
+
+You can also see how the sequence-id starts with 00 for each new sequence of packets.
+
+Describing packets
+------------------
+
+In this document we describe the packets by first defining their payload and provide examples with packet header and payload as 
+you would see it on the wire.
+
+  COM_QUIT
+    <description>
+
+    direction: client -> server
+    response: ...
+    
+    payload:
+      <type>        <description>
+
+    Example:
+      01 00 00 00 01
+
+The payload types
+.................
+
+The MySQL Protocol has a set of possible encodings for integers:
+
+  * fixed length intergers
+  * length encoded integers
+
+The fixed length integers are described by their byte-length (1, 2, 3, 4, 8) and send their first byte first as seen in the packet length
+above:
+
+  01 00 00 00 01
+
+is the packet length 1 as it is a 3-byte fixed length integer.
+
+In other places integers have a variable size if (1, 3, 4, 9) bytes depending on their value and are described as 'lenenc-int'.
+
+  < 251 - 1 byte
+  >= 251 < (2^16 - 1) - 3 byte
+  >= (2^16) < (2^24 - 1) - 4 byte
+  >= (2^24) - 9 byte
+
+The 1-byte values from 251 to 255 have a special meaning and aren't used for integers:
+
+  * 0xfb -> 251 - NULL
+  * 0xfc -> 252 - next is a 2-byte integer
+  * 0xfd -> 253 - next is a 3-byte integer
+  * 0xfe -> 254 - next is a 8-byte integer or a EOF packet
+  * 0xff -> 255 - ERR packet
+
+The auth phase
+--------------
+
+  * auth-challenge
+  * auth-response
+  * old-password
+  * ok, err
+
+The command phase
+-----------------
+
+In the command phase the client sends a command packet with the sequence-id 0:
+
+   13 00 00 00 03 53 ... 
+   01 00 00 00 01 
+            ^^
+
+The first byte of the payload describes the command-type like:
+
+* COM_QUERY
+* COM_QUIT 
+* ...
+
+COM_QUIT
+--------
+
+  COM_QUIT
+    tells the server that the client wants to close the connection
+
+    direction: client -> server
+    response: either a connection close or a OK packet
+    
+    payload:
+      \x01          command-byte: COM_QUIT
+
+    Example:
+      01 00 00 00 01
+
+
+COM_QUERY
+---------
+
+  COM_QUERY
+    tells the server to execute a text-based query
+
+    direction: client -> server
+    response: a query-response packet
+    
+    payload:
+      1          command-byte: COM_QUERY
+      n          the query the server shall execute
+
+    Example:
+
+Query-Response packet
+---------------------
+
+The query-response packet is a meta packet which can be one of
+
+  * a ERR packet
+  * a OK packet
+  * a LOCAL INFILE packet
+  * a resultset
+
+The type of the packet is defined by the type-identifier:
+
+  COM_QUERY response
+    response to a COM_QUERY packet
+
+    payload
+      lenenc-int     number of columns in the resultset
+
+If the number of columns in the resultset is 0, this is a OK packet.
+
+If it is not a valid lenenc-int (ERR, EOF) it is a either a ERR packet or a LOCAL INFILE packet. 
+ 
+OK packet
+---------
+
+  OK
+    
+    direction: server -> client
+
+    payload:
+      1              [00] the OK header
+      lenenc-int     affected rows
+      lenenc-int     last-insert-id
+      2              flags
+        if capabilities & PROTOCOL_41:
+      2              warnings 
+
+    example:
+      07 00 00 02 00 00 00 02    00 00 00                   ...........     
+
+ERR packet
+----------
+
+  ERR
+    
+    direction: server -> client
+
+    payload:
+      1              [ff] the ERR header
+      2              error code 
+        if capabilities & PROTOCOL_41:
+      1              '#' the sql-state marker
+      string[5]      sql-state
+        all protocols:
+      string*        error-message
+
+    example:
+      17 00 00 01 ff 48 04 23    48 59 30 30 30 4e 6f 20    .....H.#HY000No 
+      74 61 62 6c 65 73 20 75    73 65 64                   tables used 
+
+
+EOF packet
+----------
+
+  EOF
+  
+    direction: server -> client
+
+    payload:
+      1              [fe] the EOF header
+        if capabilities & PROTOCOL_41:
+      2              warning count
+      2              server-status
+
+    example:
+      ... 05 00 00 05 fe 00 00 02 00
+      
+The server-status is a bit-field:
+
+  * _AUTOCOMMIT == 2
+
+The prepare statement protocol
+------------------------------
+
+  COM_STMT_PREPARE
+    create a prepared statement 
+
+    payload:
+      1              [16] the COM_STMT_PREPARE command
+      string         the query to prepare
+
+    example:
+      1c 00 00 00 16 53 45 4c    45 43 54 20 43 4f 4e 43    .....SELECT CONC
+      41 54 28 3f 2c 20 3f 29    20 41 53 20 63 6f 6c 31    AT(?, ?) AS col1
+
+
+COM_STMT_PREPARE response
+-------------------------
+
+* COM_STMT_PREPARE OK
+* num-params * <param-defs> <EOF packet> if num-params > 0
+* num-colums * <column-defs> <EOF packet> if num-columns > 0
+
+Example:
+  
+   0c 00 00 01 00 01 00 00    00 01 00 02 00 00 00 00|   ................
+   17 00 00 02 03 64 65 66    00 00 00 01 3f 00 0c 3f    .....def....?..?
+   00 00 00 00 00 fd 80 00    00 00 00|17 00 00 03 03    ................
+   64 65 66 00 00 00 01 3f    00 0c 3f 00 00 00 00 00    def....?..?.....
+   fd 80 00 00 00 00|05 00    00 04 fe 00 00 02 00|1a    ................
+   00 00 05 03 64 65 66 00    00 00 04 63 6f 6c 31 00    ....def....col1.
+   0c 3f 00 00 00 00 00 fd    80 00 1f 00 00|05 00 00    .?..............
+   06 fe 00 00 02 00                                     ...... 
+  
+for a query without parameters and resultset like "DO 1" it is:
+  
+   0c 00 00 01 00 01 00 00    00 00 00 00 00 00 00 00
+
+COM_STMT_PREPARE OK packet
+--------------------------   
+
+  COM_STMT_PREPARE OK
+    OK response to a COM_STMT_PREPARE packet 
+
+    direction: server -> client
+
+    payload:
+      4              statement-id
+      2              num columns
+      2              num params
+      1              filler
+      2              warning count
+
+
+COM_STMT_EXECUTE
+----------------
+  
+  COM_STMT_EXECUTE
+    execute a prepared statement
+
+    direction: client -> server
+
+    payload:
+      1              [17] COM_STMT_EXECUTE
+      4              stmt-id
+      1              flags
+      4              iteration-count
+      nul-bit-map
+      1              new-params-bound-flag
+        if new-params-bound-flag == 1:
+      param-count*2  type of each parameter               
+      data<n>        value of each parameter, see Binary Resultset value format
+ 
+    example: 
+
+Binary Resultset value format
+---------------------------
+
+  Strings
+    lenenc-int       length of the string
+    string<len>      string
+
+    example:
+      03 66 6f 6f -- string = "foo"
+
+  int64
+    8                integer least significant byte first
+
+    example:
+      01 00 00 00 00 00 00 00 -- int64 = 1
+
+  int32
+    4                integer least significant byte first
+
+    example:
+      01 00 00 00 -- int32 = 1
+
+  int16
+    2                integer least significant byte first
+
+    example:
+      01 00 -- int16 = 1
+
+  int8
+    1                integer
+
+    example:
+      01 -- int8 = 1
+
+   double
+    8                double
+
+    example:
+      66 66 66 66 66 66 24 40 -- double = 10.2
+
+   float
+    4                float
+
+    example:
+      33 33 23 41 -- float = 10.2
+
+   date
+     1               length == [04]
+     2               year
+     1               month
+     1               day
+
+     example: 
+       04 da 07 0a 11 -- date = 2010-10-17
+
+   datetime
+     1               length == [0b]
+     2               year
+     1               month
+     1               day
+     1               hour
+     1               minutes
+     1               seconds
+     4               nseconds
+
+     example: 
+       0b da 07 0a 11 13 1b 1e 01 00 00 00 -- datetime 2010-10-17 19:27:30.000 000 001
+
+   time
+     1               length == [0c]
+     1               sign (1 if minus, 0 for plus)
+     4               days
+     1               hour
+     1               minutes
+     1               seconds
+     4               nseconds
+
+     example: 
+       0c 01 78 00 00 00 13 1b 1e 01 00 00 00 -- time  -120d 19:27:30.000 000 001
+
+   timestamp
+     1               length == [0b]
+     2               year
+     1               month
+     1               day
+     1               hour
+     1               minutes
+     1               seconds
+     4               nseconds
+
+     example: 
+       0b da 07 0a 11 13 1b 1e 01 00 00 00 -- timestamp 
+  
+COM_STMT_EXECUTE resultset
+--------------------------
+
+COM_STMT_EXECUTE resultset is similar the COM_QUERY resulset. It just contains the rows in 
+Binary Row Format.
+
+    lenenc field-count
+    field-count * fielddef
+    <EOF>
+    <rows>
+    <EOF>
+
+  example:
+    01 00 00 01 01|1a 00 00    02 03 64 65 66 00 00 00    ..........def...
+    04 63 6f 6c 31 00 0c 08    00 06 00 00 00 fd 00 00    .col1...........
+    1f 00 00|05 00 00 03 fe    00 00 02 00|09 00 00 04    ................
+    00 00 06 66 6f 6f 62 61    72|05 00 00 05 fe 00 00    ...foobar.......
+    02 00                                                 ..     
+
+
+COM_STMT_CLOSE
+--------------
+  
+  COM_STMT_CLOSE
+    payload:
+      1              [19]
+      4              statement-id
+ 
+    example: 
+      05 00 00 00 19 01 00 00    00                         ......... 
+  
+  
+  
 
 

=== modified file 'examples/Makefile.am'
--- examples/Makefile.am	2009-07-03 12:28:02 +0000
+++ examples/Makefile.am	2010-09-22 15:13:16 +0000
@@ -8,6 +8,7 @@
 	tutorial-monitor.lua \
 	tutorial-packets.lua \
 	tutorial-query-time.lua \
+	tutorial-prep-stmts.lua \
 	tutorial-resultset.lua \
 	tutorial-rewrite.lua \
 	tutorial-routing.lua \

=== added file 'examples/tutorial-prep-stmts.lua'
--- examples/tutorial-prep-stmts.lua	1970-01-01 00:00:00 +0000
+++ examples/tutorial-prep-stmts.lua	2010-09-22 15:13:16 +0000
@@ -0,0 +1,74 @@
+--[[ $%BEGINLICENSE%$
+ Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA
+
+ $%ENDLICENSE%$ --]]
+
+local proto = require("mysql.proto")
+
+local prep_stmts = { }
+
+function read_query( packet )
+	local cmd_type = packet:byte()
+	if cmd_type == proxy.COM_STMT_PREPARE then
+		proxy.queries:append(1, packet, { resultset_is_needed = true } )
+		return proxy.PROXY_SEND_QUERY
+	elseif cmd_type == proxy.COM_STMT_EXECUTE then
+		proxy.queries:append(2, packet, { resultset_is_needed = true } )
+		return proxy.PROXY_SEND_QUERY
+	elseif cmd_type == proxy.COM_STMT_CLOSE then
+		proxy.queries:append(3, packet, { resultset_is_needed = true } )
+		return proxy.PROXY_SEND_QUERY
+	end
+end
+
+function read_query_result(inj) 
+	if inj.id == 1 then
+		-- print the query we sent
+		local stmt_prepare = assert(proto.from_stmt_prepare_packet(inj.query))
+		print(("> PREPARE: %s"):format(stmt_prepare.stmt_text))
+
+		-- and the stmt-id we got for it
+		if inj.resultset.raw:byte() == 0 then
+			local stmt_prepare_ok = assert(proto.from_stmt_prepare_ok_packet(inj.resultset.raw))
+			print(("< PREPARE: stmt-id = %d (resultset-cols = %d, params = %d)"):format(
+				stmt_prepare_ok.stmt_id,
+				stmt_prepare_ok.num_columns,
+				stmt_prepare_ok.num_params))
+
+			prep_stmts[stmt_prepare_ok.stmt_id] = {
+				num_columns = stmt_prepare_ok.num_columns,
+				num_params = stmt_prepare_ok.num_params,
+			}
+		end
+	elseif inj.id == 2 then
+		local stmt_id = assert(proto.stmt_id_from_stmt_execute_packet(inj.query))
+		local stmt_execute = assert(proto.from_stmt_execute_packet(inj.query, prep_stmts[stmt_id].num_params))
+		print(("> EXECUTE: stmt-id = %d"):format(stmt_execute.stmt_id))
+		if stmt_execute.new_params_bound then
+			for ndx, v in ipairs(stmt_execute.params) do
+				print((" [%d] %s (type = %d)"):format(ndx, tostring(v.value), v.type))
+			end
+		end
+	elseif inj.id == 3 then
+		local stmt_close = assert(proto.from_stmt_close_packet(inj.query))
+		print(("> CLOSE: stmt-id = %d"):format(stmt_close.stmt_id))
+
+		prep_stmts[stmt_close.stmt_id] = nil -- cleanup
+	end
+end
+

=== modified file 'lib/mysql-proto.c'
--- lib/mysql-proto.c	2010-04-06 14:26:51 +0000
+++ lib/mysql-proto.c	2010-09-22 15:13:16 +0000
@@ -30,6 +30,7 @@
 
 #include "network-mysqld-proto.h"
 #include "network-mysqld-packet.h"
+#include "network_mysqld_type.h"
 #include "network-mysqld-masterinfo.h"
 #include "glib-ext.h"
 #include "lua-env.h"
@@ -57,6 +58,10 @@
 	lua_pushinteger(L, x->y); \
 	lua_setfield(L, -2, G_STRINGIFY(y)); 
 
+#define LUA_EXPORT_BOOL(x, y) \
+	lua_pushboolean(L, x->y); \
+	lua_setfield(L, -2, G_STRINGIFY(y)); 
+
 #define LUA_EXPORT_STR(x, y) \
 	if (x->y->len) { \
 		lua_pushlstring(L, S(x->y)); \
@@ -466,6 +471,266 @@
 	return 1;
 }
 
+static int lua_proto_get_stmt_prepare_packet (lua_State *L) {
+	size_t packet_len;
+	const char *packet_str = luaL_checklstring(L, 1, &packet_len);
+	network_mysqld_stmt_prepare_packet_t *cmd;
+	network_packet packet;
+	GString s;
+	int err = 0;
+
+	s.str = (char *)packet_str;
+	s.len = packet_len;
+
+	packet.data = &s;
+	packet.offset = 0;
+
+	cmd = network_mysqld_stmt_prepare_packet_new();
+
+	err = err || network_mysqld_proto_get_stmt_prepare_packet(&packet, cmd);
+	if (err) {
+		network_mysqld_stmt_prepare_packet_free(cmd);
+
+		luaL_error(L, "%s: network_mysqld_proto_get_stmt_prepare_packet() failed", G_STRLOC);
+		return 0;
+	}
+
+	lua_newtable(L);
+
+	LUA_EXPORT_STR(cmd, stmt_text);
+
+	network_mysqld_stmt_prepare_packet_free(cmd);
+
+	return 1;
+}
+
+/**
+ * transform the OK packet of a COM_STMT_PREPARE result into a table
+ */
+static int lua_proto_get_stmt_prepare_ok_packet (lua_State *L) {
+	size_t packet_len;
+	const char *packet_str = luaL_checklstring(L, 1, &packet_len);
+	network_mysqld_stmt_prepare_ok_packet_t *cmd;
+	network_packet packet;
+	GString s;
+	int err = 0;
+
+	s.str = (char *)packet_str;
+	s.len = packet_len;
+
+	packet.data = &s;
+	packet.offset = 0;
+
+	cmd = network_mysqld_stmt_prepare_ok_packet_new();
+
+	err = err || network_mysqld_proto_get_stmt_prepare_ok_packet(&packet, cmd);
+	if (err) {
+		network_mysqld_stmt_prepare_ok_packet_free(cmd);
+
+		luaL_error(L, "%s: network_mysqld_proto_get_stmt_prepare_ok_packet() failed", G_STRLOC);
+		return 0;
+	}
+
+	lua_newtable(L);
+
+	LUA_EXPORT_INT(cmd, stmt_id);
+	LUA_EXPORT_INT(cmd, num_columns);
+	LUA_EXPORT_INT(cmd, num_params);
+	LUA_EXPORT_INT(cmd, warnings);
+
+	network_mysqld_stmt_prepare_ok_packet_free(cmd);
+
+	return 1;
+}
+
+/**
+ * get the stmt-id from the com-stmt-execute packet 
+ */
+static int lua_proto_get_stmt_execute_packet (lua_State *L) {
+	size_t packet_len;
+	const char *packet_str = luaL_checklstring(L, 1, &packet_len);
+	int param_count = luaL_checkint(L, 2);
+	network_mysqld_stmt_execute_packet_t *cmd;
+	network_packet packet;
+	GString s;
+	int err = 0;
+
+	s.str = (char *)packet_str;
+	s.len = packet_len;
+
+	packet.data = &s;
+	packet.offset = 0;
+
+	cmd = network_mysqld_stmt_execute_packet_new();
+
+	err = err || network_mysqld_proto_get_stmt_execute_packet(&packet, cmd, param_count);
+	if (err) {
+		network_mysqld_stmt_execute_packet_free(cmd);
+
+		luaL_error(L, "%s: network_mysqld_proto_get_stmt_execute_packet() failed", G_STRLOC);
+		return 0;
+	}
+
+	lua_newtable(L);
+
+	LUA_EXPORT_INT(cmd, stmt_id);
+	LUA_EXPORT_INT(cmd, flags);
+	LUA_EXPORT_INT(cmd, iteration_count);
+	LUA_EXPORT_BOOL(cmd, new_params_bound);
+
+	if (cmd->new_params_bound) {
+		guint i;
+
+		lua_newtable(L);
+		for (i = 0; i < cmd->params->len; i++) {
+			network_mysqld_type_t *param = g_ptr_array_index(cmd->params, i);
+
+			lua_newtable(L);
+			lua_pushnumber(L, param->type);
+			lua_setfield(L, -2, "type");
+
+			if (param->is_null) {
+				lua_pushnil(L);
+			} else {
+				const char *const_s;
+				char *_s;
+				gsize s_len;
+				guint64 _i;
+				gboolean is_unsigned;
+				double d;
+
+				switch (param->type) {
+				case MYSQL_TYPE_BLOB:
+				case MYSQL_TYPE_MEDIUM_BLOB:
+				case MYSQL_TYPE_LONG_BLOB:
+				case MYSQL_TYPE_STRING:
+				case MYSQL_TYPE_VARCHAR:
+				case MYSQL_TYPE_VAR_STRING:
+					if (0 != network_mysqld_type_get_string_const(param, &const_s, &s_len)) {
+						return luaL_error(L, "%s: _get_string_const() failed for type = %d",
+								G_STRLOC,
+								param->type);
+					}
+
+					lua_pushlstring(L, const_s, s_len);
+					break;
+				case MYSQL_TYPE_TINY:
+				case MYSQL_TYPE_SHORT:
+				case MYSQL_TYPE_LONG:
+				case MYSQL_TYPE_LONGLONG:
+					if (0 != network_mysqld_type_get_int(param, &_i, &is_unsigned)) {
+						return luaL_error(L, "%s: _get_int() failed for type = %d",
+								G_STRLOC,
+								param->type);
+					}
+
+					lua_pushinteger(L, _i);
+					break;
+				case MYSQL_TYPE_DOUBLE:
+				case MYSQL_TYPE_FLOAT:
+					if (0 != network_mysqld_type_get_double(param, &d)) {
+						return luaL_error(L, "%s: _get_double() failed for type = %d",
+								G_STRLOC,
+								param->type);
+					}
+
+					lua_pushnumber(L, d);
+					break;
+				case MYSQL_TYPE_DATETIME:
+				case MYSQL_TYPE_TIMESTAMP:
+				case MYSQL_TYPE_DATE:
+				case MYSQL_TYPE_TIME:
+					_s = NULL;
+					s_len = 0;
+
+					if (0 != network_mysqld_type_get_string(param, &_s, &s_len)) {
+						return luaL_error(L, "%s: _get_string() failed for type = %d",
+								G_STRLOC,
+								param->type);
+					}
+
+					lua_pushlstring(L, _s, s_len);
+
+					if (NULL != _s) g_free(_s);
+					break;
+				default:
+					luaL_error(L, "%s: can't decode type %d yet",
+							G_STRLOC,
+							param->type); /* we don't have that value yet */
+					break;
+				}
+			}
+			lua_setfield(L, -2, "value");
+			lua_rawseti(L, -2, i + 1);
+		}
+		lua_setfield(L, -2, "params"); 
+	}
+
+	network_mysqld_stmt_execute_packet_free(cmd);
+
+	return 1;
+}
+
+static int lua_proto_get_stmt_execute_packet_stmt_id (lua_State *L) {
+	size_t packet_len;
+	const char *packet_str = luaL_checklstring(L, 1, &packet_len);
+	network_packet packet;
+	GString s;
+	int err = 0;
+	guint32 stmt_id;
+
+	s.str = (char *)packet_str;
+	s.len = packet_len;
+
+	packet.data = &s;
+	packet.offset = 0;
+
+	err = err || network_mysqld_proto_get_stmt_execute_packet_stmt_id(&packet, &stmt_id);
+	if (err) {
+		luaL_error(L, "%s: network_mysqld_proto_get_stmt_execute_packet_stmt_id() failed", G_STRLOC);
+		return 0;
+	}
+
+	lua_pushinteger(L, stmt_id);
+
+	return 1;
+}
+
+
+static int lua_proto_get_stmt_close_packet (lua_State *L) {
+	size_t packet_len;
+	const char *packet_str = luaL_checklstring(L, 1, &packet_len);
+	network_mysqld_stmt_close_packet_t *cmd;
+	network_packet packet;
+	GString s;
+	int err = 0;
+
+	s.str = (char *)packet_str;
+	s.len = packet_len;
+
+	packet.data = &s;
+	packet.offset = 0;
+
+	cmd = network_mysqld_stmt_close_packet_new();
+
+	err = err || network_mysqld_proto_get_stmt_close_packet(&packet, cmd);
+	if (err) {
+		network_mysqld_stmt_close_packet_free(cmd);
+
+		luaL_error(L, "%s: network_mysqld_proto_get_stmt_close_packet() failed", G_STRLOC);
+		return 0;
+	}
+
+	lua_newtable(L);
+
+	LUA_EXPORT_INT(cmd, stmt_id);
+
+	network_mysqld_stmt_close_packet_free(cmd);
+
+	return 1;
+}
+
+
 
 
 /*
@@ -497,6 +762,11 @@
 	{"to_response_packet", lua_proto_append_response_packet},
 	{"from_masterinfo_string", lua_proto_get_masterinfo_string},
         {"to_masterinfo_string", lua_proto_append_masterinfo_string},
+	{"from_stmt_prepare_packet", lua_proto_get_stmt_prepare_packet},
+	{"from_stmt_prepare_ok_packet", lua_proto_get_stmt_prepare_ok_packet},
+	{"from_stmt_execute_packet", lua_proto_get_stmt_execute_packet},
+	{"stmt_id_from_stmt_execute_packet", lua_proto_get_stmt_execute_packet_stmt_id},
+	{"from_stmt_close_packet", lua_proto_get_stmt_close_packet},
 	{NULL, NULL},
 };
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2010-04-06 15:18:47 +0000
+++ src/CMakeLists.txt	2010-09-22 15:13:16 +0000
@@ -69,6 +69,8 @@
 	network-mysqld.c 
 	network-mysqld-lua.c 
 	network-mysqld-proto.c 
+	network_mysqld_type.c 
+	network_mysqld_proto_binary.c 
 	network-mysqld-binlog.c 
 	network-mysqld-packet.c 
 	network-mysqld-masterinfo.c 
@@ -206,6 +208,8 @@
 	network-mysqld.h
 	network-mysqld-lua.h
 	network-mysqld-proto.h
+	network_mysqld_type.h
+	network_mysqld_proto_binary.h
 	network-mysqld-binlog.h
 	network-mysqld-packet.h
 	network-mysqld-masterinfo.h

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-05-03 14:26:32 +0000
+++ src/Makefile.am	2010-09-22 15:13:16 +0000
@@ -109,6 +109,8 @@
 	network-mysqld-proto.c \
 	network-mysqld-binlog.c \
 	network-mysqld-packet.c \
+	network_mysqld_type.c \
+	network_mysqld_proto_binary.c \
 	network-mysqld-masterinfo.c \
 	network-conn-pool.c  \
 	network-conn-pool-lua.c  \
@@ -137,6 +139,8 @@
 	network-mysqld-proto.h \
 	network-mysqld-binlog.h \
 	network-mysqld-packet.h \
+	network_mysqld_type.h \
+	network_mysqld_proto_binary.h \
 	network-mysqld-masterinfo.h \
 	network-conn-pool.h \
 	network-conn-pool-lua.h \

=== modified file 'src/network-mysqld-packet.c'
--- src/network-mysqld-packet.c	2010-05-10 10:31:45 +0000
+++ src/network-mysqld-packet.c	2010-09-22 15:13:16 +0000
@@ -23,8 +23,11 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "network-mysqld-packet.h"
+#include "network_mysqld_type.h"
+#include "network_mysqld_proto_binary.h"
 
 #include "glib-ext.h"
 
@@ -668,6 +671,57 @@
 	return is_finished;
 }
 
+int network_mysqld_proto_get_fielddef(network_packet *packet, network_mysqld_proto_fielddef_t *field, guint32 capabilities) {
+	int err = 0;
+
+	if (capabilities & CLIENT_PROTOCOL_41) {
+		err = err || network_mysqld_proto_get_lenenc_string(packet, &field->catalog, NULL);
+		err = err || network_mysqld_proto_get_lenenc_string(packet, &field->db, NULL);
+		err = err || network_mysqld_proto_get_lenenc_string(packet, &field->table, NULL);
+		err = err || network_mysqld_proto_get_lenenc_string(packet, &field->org_table, NULL);
+		err = err || network_mysqld_proto_get_lenenc_string(packet, &field->name, NULL);
+		err = err || network_mysqld_proto_get_lenenc_string(packet, &field->org_name, NULL);
+        
+		err = err || network_mysqld_proto_skip(packet, 1); /* filler */
+        
+		err = err || network_mysqld_proto_get_int16(packet, (guint16 *)&field->charsetnr);
+		err = err || network_mysqld_proto_get_int32(packet, (guint32 *)&field->length);
+		err = err || network_mysqld_proto_get_int8(packet, (guint8 *)&field->type);
+		err = err || network_mysqld_proto_get_int16(packet, (guint16 *)&field->flags);
+		err = err || network_mysqld_proto_get_int8(packet, (guint8 *)&field->decimals);
+        
+		err = err || network_mysqld_proto_skip(packet, 2); /* filler */
+	} else {
+		guint8 len;
+
+		/* see protocol.cc Protocol::send_fields */
+
+		err = err || network_mysqld_proto_get_lenenc_string(packet, &field->table, NULL);
+		err = err || network_mysqld_proto_get_lenenc_string(packet, &field->name, NULL);
+		err = err || network_mysqld_proto_get_int8(packet, &len);
+		err = err || (len != 3);
+		err = err || network_mysqld_proto_get_int24(packet, (guint32 *)&field->length);
+		err = err || network_mysqld_proto_get_int8(packet, &len);
+		err = err || (len != 1);
+		err = err || network_mysqld_proto_get_int8(packet, (guint8 *)&field->type);
+		err = err || network_mysqld_proto_get_int8(packet, &len);
+		if (len == 3) { /* the CLIENT_LONG_FLAG is set */
+			err = err || network_mysqld_proto_get_int16(packet, (guint16 *)&field->flags);
+			err = err || network_mysqld_proto_get_int8(packet, (guint8 *)&field->decimals);
+		} else if (len == 2) {
+			guint8 flags = 0;
+			err = err || network_mysqld_proto_get_int8(packet, &flags);
+			err = err || network_mysqld_proto_get_int8(packet, (guint8 *)&field->decimals);
+
+			if (!err) field->flags = flags;
+		} else {
+			/* well */
+		}
+	}
+
+	return err ? -1 : 0;
+}
+
 /**
  * parse the result-set packet and extract the fields
  *
@@ -714,7 +768,7 @@
     
 	/* the next chunk, the field-def */
 	for (i = 0; i < field_count; i++) {
-		MYSQL_FIELD *field;
+		network_mysqld_proto_fielddef_t *field;
         
 		chunk = chunk->next;
 		g_assert(chunk);
@@ -722,56 +776,11 @@
 		packet.data = chunk->data;
 		packet.offset = 0;
 
+		field = network_mysqld_proto_fielddef_new();
+
 		err = err || network_mysqld_proto_skip_network_header(&packet);
- 
-		field = network_mysqld_proto_fielddef_new();
-
-		if (capabilities & CLIENT_PROTOCOL_41) {
-			err = err || network_mysqld_proto_get_lenenc_string(&packet, &field->catalog, NULL);
-			err = err || network_mysqld_proto_get_lenenc_string(&packet, &field->db, NULL);
-			err = err || network_mysqld_proto_get_lenenc_string(&packet, &field->table, NULL);
-			err = err || network_mysqld_proto_get_lenenc_string(&packet, &field->org_table, NULL);
-			err = err || network_mysqld_proto_get_lenenc_string(&packet, &field->name, NULL);
-			err = err || network_mysqld_proto_get_lenenc_string(&packet, &field->org_name, NULL);
-	        
-			err = err || network_mysqld_proto_skip(&packet, 1); /* filler */
-	        
-			err = err || network_mysqld_proto_get_int16(&packet, (guint16 *)&field->charsetnr);
-			err = err || network_mysqld_proto_get_int32(&packet, (guint32 *)&field->length);
-			err = err || network_mysqld_proto_get_int8(&packet, (guint8 *)&field->type);
-			err = err || network_mysqld_proto_get_int16(&packet, (guint16 *)&field->flags);
-			err = err || network_mysqld_proto_get_int8(&packet, (guint8 *)&field->decimals);
-	        
-			err = err || network_mysqld_proto_skip(&packet, 2); /* filler */
-		} else {
-			guint8 len;
-
-			/* see protocol.cc Protocol::send_fields */
-
-			err = err || network_mysqld_proto_get_lenenc_string(&packet, &field->table, NULL);
-			err = err || network_mysqld_proto_get_lenenc_string(&packet, &field->name, NULL);
-			err = err || network_mysqld_proto_get_int8(&packet, &len);
-			err = err || (len != 3);
-			err = err || network_mysqld_proto_get_int24(&packet, (guint32 *)&field->length);
-			err = err || network_mysqld_proto_get_int8(&packet, &len);
-			err = err || (len != 1);
-			err = err || network_mysqld_proto_get_int8(&packet, (guint8 *)&field->type);
-			err = err || network_mysqld_proto_get_int8(&packet, &len);
-			if (len == 3) { /* the CLIENT_LONG_FLAG is set */
-				err = err || network_mysqld_proto_get_int16(&packet, (guint16 *)&field->flags);
-				err = err || network_mysqld_proto_get_int8(&packet, (guint8 *)&field->decimals);
-			} else if (len == 2) {
-				guint8 flags = 0;
-				err = err || network_mysqld_proto_get_int8(&packet, &flags);
-				err = err || network_mysqld_proto_get_int8(&packet, (guint8 *)&field->decimals);
-
-				if (!err) field->flags = flags;
-			} else {
-				/* well */
-			}
-
-		}
-        
+		err = err || network_mysqld_proto_get_fielddef(&packet, field, capabilities);
+
 		g_ptr_array_add(fields, field); /* even if we had an error, append it so that we can free it later */
 
 		if (err) return NULL;
@@ -1358,4 +1367,451 @@
 	return dst;
 }
 
+/*
+ * prepared statements
+ */
+
+/**
+ * 
+ */
+network_mysqld_stmt_prepare_packet_t *network_mysqld_stmt_prepare_packet_new() {
+	network_mysqld_stmt_prepare_packet_t *stmt_prepare_packet;
+
+	stmt_prepare_packet = g_slice_new0(network_mysqld_stmt_prepare_packet_t);
+	stmt_prepare_packet->stmt_text = g_string_new(NULL);
+
+	return stmt_prepare_packet;
+}
+
+/**
+ * 
+ */
+void network_mysqld_stmt_prepare_packet_free(network_mysqld_stmt_prepare_packet_t *stmt_prepare_packet) {
+	if (NULL == stmt_prepare_packet) return;
+
+	if (NULL != stmt_prepare_packet->stmt_text) g_string_free(stmt_prepare_packet->stmt_text, TRUE);
+
+	g_slice_free(network_mysqld_stmt_prepare_packet_t, stmt_prepare_packet);
+}
+
+/**
+ * 
+ */
+int network_mysqld_proto_get_stmt_prepare_packet(network_packet *packet, network_mysqld_stmt_prepare_packet_t *stmt_prepare_packet) {
+	guint8 packet_type;
+
+	int err = 0;
+
+	err = err || network_mysqld_proto_get_int8(packet, &packet_type);
+	if (err) return -1;
+
+	if (COM_STMT_PREPARE != packet_type) {
+		g_critical("%s: expected the first byte to be %02x, got %02x",
+				G_STRLOC,
+				COM_STMT_PREPARE,
+				packet_type);
+		return -1;
+	}
+
+	g_string_assign_len(stmt_prepare_packet->stmt_text, packet->data->str + packet->offset, packet->data->len - packet->offset);
+
+	return err ? -1 : 0;
+}
+
+int network_mysqld_proto_append_stmt_prepare_packet(GString *packet, network_mysqld_stmt_prepare_packet_t *stmt_prepare_packet) {
+	network_mysqld_proto_append_int8(packet, COM_STMT_PREPARE);
+	g_string_append_len(packet, S(stmt_prepare_packet->stmt_text));
+
+	return 0;
+}
+
+/**
+ * 
+ */
+network_mysqld_stmt_prepare_ok_packet_t *network_mysqld_stmt_prepare_ok_packet_new() {
+	network_mysqld_stmt_prepare_ok_packet_t *stmt_prepare_ok_packet;
+
+	stmt_prepare_ok_packet = g_slice_new0(network_mysqld_stmt_prepare_ok_packet_t);
+
+	return stmt_prepare_ok_packet;
+}
+
+/**
+ * 
+ */
+void network_mysqld_stmt_prepare_ok_packet_free(network_mysqld_stmt_prepare_ok_packet_t *stmt_prepare_ok_packet) {
+	if (NULL == stmt_prepare_ok_packet) return;
+
+	g_slice_free(network_mysqld_stmt_prepare_ok_packet_t, stmt_prepare_ok_packet);
+}
+
+/**
+ * parse the first packet of the OK response for a COM_STMT_PREPARE
+ *
+ * it is followed by the field defs for the params and the columns and their EOF packets which is handled elsewhere
+ */
+int network_mysqld_proto_get_stmt_prepare_ok_packet(network_packet *packet, network_mysqld_stmt_prepare_ok_packet_t *stmt_prepare_ok_packet) {
+	guint8 packet_type;
+	guint16 num_columns;
+	guint16 num_params;
+	guint16 warnings;
+	guint32 stmt_id;
+
+	int err = 0;
+
+	err = err || network_mysqld_proto_get_int8(packet, &packet_type);
+	if (err) return -1;
+
+	if (0x00 != packet_type) {
+		g_critical("%s: expected the first byte to be %02x, got %02x",
+				G_STRLOC,
+				0x00,
+				packet_type);
+		return -1;
+	}
+	err = err || network_mysqld_proto_get_int32(packet, &stmt_id);
+	err = err || network_mysqld_proto_get_int16(packet, &num_columns);
+	err = err || network_mysqld_proto_get_int16(packet, &num_params);
+	err = err || network_mysqld_proto_skip(packet, 1); /* the filler */
+	err = err || network_mysqld_proto_get_int16(packet, &warnings);
+
+	if (!err) {
+		stmt_prepare_ok_packet->stmt_id = stmt_id;
+		stmt_prepare_ok_packet->num_columns = num_columns;
+		stmt_prepare_ok_packet->num_params = num_params;
+		stmt_prepare_ok_packet->warnings = warnings;
+	}
+
+	return err ? -1 : 0;
+}
+
+int network_mysqld_proto_append_stmt_prepare_ok_packet(GString *packet, network_mysqld_stmt_prepare_ok_packet_t *stmt_prepare_ok_packet) {
+	int err = 0;
+
+	err = err || network_mysqld_proto_append_int8(packet, MYSQLD_PACKET_OK);
+	err = err || network_mysqld_proto_append_int32(packet, stmt_prepare_ok_packet->stmt_id);
+	err = err || network_mysqld_proto_append_int16(packet, stmt_prepare_ok_packet->num_columns);
+	err = err || network_mysqld_proto_append_int16(packet, stmt_prepare_ok_packet->num_params);
+	err = err || network_mysqld_proto_append_int8(packet, 0x00);
+	err = err || network_mysqld_proto_append_int16(packet, stmt_prepare_ok_packet->warnings);
+
+	return err ? -1 : 0;
+}
+
+/**
+ * create a struct for a COM_STMT_EXECUTE packet
+ */
+network_mysqld_stmt_execute_packet_t *network_mysqld_stmt_execute_packet_new() {
+	network_mysqld_stmt_execute_packet_t *stmt_execute_packet;
+
+	stmt_execute_packet = g_slice_new0(network_mysqld_stmt_execute_packet_t);
+	stmt_execute_packet->params = g_ptr_array_new();
+
+	return stmt_execute_packet;
+}
+
+/**
+ * free a struct for a COM_STMT_EXECUTE packet
+ */
+void network_mysqld_stmt_execute_packet_free(network_mysqld_stmt_execute_packet_t *stmt_execute_packet) {
+	guint i;
+
+	if (NULL == stmt_execute_packet) return;
+
+	for (i = 0; i < stmt_execute_packet->params->len; i++) {
+		network_mysqld_type_t *param = g_ptr_array_index(stmt_execute_packet->params, i);
+
+		network_mysqld_type_free(param);
+	}
+
+	g_ptr_array_free(stmt_execute_packet->params, TRUE);
+
+	g_slice_free(network_mysqld_stmt_execute_packet_t, stmt_execute_packet);
+}
+
+/**
+ * get the statement-id from the COM_STMT_EXECUTE packet
+ *
+ * as network_mysqld_proto_get_stmt_execute_packet() needs the parameter count
+ * to calculate the number of null-bits, we need a way to look it up in a 
+ * external store which is very likely indexed by the stmt-id
+ *
+ * @see network_mysqld_proto_get_stmt_execute_packet()
+ */
+int network_mysqld_proto_get_stmt_execute_packet_stmt_id(network_packet *packet,
+		guint32 *stmt_id) {
+	guint8 packet_type;
+	int err = 0;
+
+	err = err || network_mysqld_proto_get_int8(packet, &packet_type);
+	if (err) return -1;
+
+	if (COM_STMT_EXECUTE != packet_type) {
+		g_critical("%s: expected the first byte to be %02x, got %02x",
+				G_STRLOC,
+				COM_STMT_EXECUTE,
+				packet_type);
+		return -1;
+	}
+
+	err = err || network_mysqld_proto_get_int32(packet, stmt_id);
+
+	return err ? -1 : 0;
+}
+
+/**
+ *
+ * param_count has to be taken from the response of the prepare-stmt-ok packet
+ *
+ * @param param_count number of parameters that we expect to see here
+ */
+int network_mysqld_proto_get_stmt_execute_packet(network_packet *packet,
+		network_mysqld_stmt_execute_packet_t *stmt_execute_packet,
+		guint param_count) {
+	int err = 0;
+	GString *nul_bits;
+	gsize nul_bits_len;
+
+	err = err || network_mysqld_proto_get_stmt_execute_packet_stmt_id(packet, &stmt_execute_packet->stmt_id);
+	err = err || network_mysqld_proto_get_int8(packet, &stmt_execute_packet->flags);
+	err = err || network_mysqld_proto_get_int32(packet, &stmt_execute_packet->iteration_count);
+
+	if (0 == param_count) {
+		return err ? -1 : 0;
+	}
+
+	nul_bits_len = (param_count + 7) / 8;
+	nul_bits = g_string_sized_new(nul_bits_len);
+	err = err || network_mysqld_proto_get_gstring_len(packet, nul_bits_len, nul_bits);
+	err = err || network_mysqld_proto_get_int8(packet, &stmt_execute_packet->new_params_bound);
+
+	if (0 != err) {
+		g_string_free(nul_bits, TRUE);
+
+		return -1; /* exit early if something failed up to now */
+	}
+
+	if (stmt_execute_packet->new_params_bound) {
+		guint i;
+
+		for (i = 0; 0 == err && i < param_count; i++) {
+			guint16 param_type;
+
+			err = err || network_mysqld_proto_get_int16(packet, &param_type);
+
+			if (0 == err) {
+				network_mysqld_type_t *param;
+
+				param = network_mysqld_type_new(param_type & 0xff);
+				if (NULL == param) {
+					g_critical("%s: couldn't create type = %d", G_STRLOC, param_type & 0xff);
+
+					err = -1;
+					break;
+				}
+				param->is_null = (nul_bits->str[i / 8] & (1 << (i % 8))) != 0;
+				param->is_unsigned = (param_type & 0x8000) != 0;
+
+				g_ptr_array_add(stmt_execute_packet->params, param);
+			}
+		}
+
+		for (i = 0; 0 == err && i < param_count; i++) {
+			network_mysqld_type_t *param = g_ptr_array_index(stmt_execute_packet->params, i);
+
+			if (!param->is_null) {
+				err = err || network_mysqld_proto_binary_get_type(packet, param);
+			}
+		}
+	}
+
+	g_string_free(nul_bits, TRUE);
+
+	return err ? -1 : 0;
+}
+
+int network_mysqld_proto_append_stmt_execute_packet(GString *packet,
+		network_mysqld_stmt_execute_packet_t *stmt_execute_packet,
+		guint param_count) {
+	gsize nul_bits_len;
+	GString *nul_bits;
+	guint i;
+	int err = 0;
+
+	nul_bits_len = (param_count + 7) / 8;
+	nul_bits = g_string_sized_new(nul_bits_len);
+	memset(nul_bits->str, 0, nul_bits->len); /* set it all to zero */
+
+	for (i = 0; i < param_count; i++) {
+		network_mysqld_type_t *param = g_ptr_array_index(stmt_execute_packet->params, i);
+
+		if (param->is_null) {
+			nul_bits->str[i / 8] |= 1 << (i % 8);
+		}
+	}
+
+	network_mysqld_proto_append_int8(packet, COM_STMT_EXECUTE);
+	network_mysqld_proto_append_int32(packet, stmt_execute_packet->stmt_id);
+	network_mysqld_proto_append_int8(packet, stmt_execute_packet->flags);
+	network_mysqld_proto_append_int32(packet, stmt_execute_packet->iteration_count);
+	g_string_append_len(packet, S(nul_bits));
+	network_mysqld_proto_append_int8(packet, stmt_execute_packet->new_params_bound);
+
+	if (stmt_execute_packet->new_params_bound) {
+		for (i = 0; i < stmt_execute_packet->params->len; i++) {
+			network_mysqld_type_t *param = g_ptr_array_index(stmt_execute_packet->params, i);
+
+			network_mysqld_proto_append_int16(packet, (guint16)param->type);
+		}
+		for (i = 0; 0 == err && i < stmt_execute_packet->params->len; i++) {
+			network_mysqld_type_t *param = g_ptr_array_index(stmt_execute_packet->params, i);
+			
+			if (!param->is_null) {
+				err = err || network_mysqld_proto_binary_append_type(packet, param);
+			}
+		}
+	}
+
+	return err ? -1 : 0;
+}
+
+/**
+ * create a struct for a COM_STMT_EXECUTE resultset row
+ */
+network_mysqld_resultset_row_t *network_mysqld_resultset_row_new() {
+	return g_ptr_array_new();
+}
+
+/**
+ * free a struct for a COM_STMT_EXECUTE resultset row
+ */
+void network_mysqld_resultset_row_free(network_mysqld_resultset_row_t *row) {
+	guint i;
+
+	if (NULL == row) return;
+
+	for (i = 0; i < row->len; i++) {
+		network_mysqld_type_t *field = g_ptr_array_index(row, i);
+
+		network_mysqld_type_free(field);
+	}
+
+	g_ptr_array_free(row, TRUE);
+}
+
+/**
+ * get the fields of a row that is in binary row format
+ */
+int network_mysqld_proto_get_binary_row(network_packet *packet, network_mysqld_proto_fielddefs_t *coldefs, network_mysqld_resultset_row_t *row) {
+	int err = 0;
+	guint i;
+	guint nul_bytes_len;
+	GString *nul_bytes;
+
+	err = err || network_mysqld_proto_skip(packet, 1); /* the packet header which seems to be always 0 */
+
+	nul_bytes_len = (coldefs->len + 7 + 2) / 8; /* the first 2 bits are reserved */
+	nul_bytes = g_string_sized_new(nul_bytes_len);
+	err = err || network_mysqld_proto_get_gstring_len(packet, nul_bytes_len, nul_bytes);
+
+	for (i = 0; 0 == err && i < coldefs->len; i++) {
+		network_mysqld_type_t *param;
+		network_mysqld_proto_fielddef_t *coldef = g_ptr_array_index(coldefs, i);
+
+		param = network_mysqld_type_new(coldef->type);
+		if (NULL == param) {
+			g_critical("%s: coulnd't create type = %d", G_STRLOC, coldef->type);
+
+			err = -1;
+			break;
+		}
+
+		if (nul_bytes->str[(i + 2) / 8] & (1 << ((i + 2) % 8))) {
+			param->is_null = TRUE;
+		} else {
+			err = err || network_mysqld_proto_binary_get_type(packet, param);
+		}
+
+		g_ptr_array_add(row, param);
+	}
+
+	g_string_free(nul_bytes, TRUE);
+
+	return err ? -1 : 0;
+}
+
+/**
+ */
+GList *network_mysqld_proto_get_next_binary_row(GList *chunk, network_mysqld_proto_fielddefs_t *fields, network_mysqld_resultset_row_t *row) {
+	network_packet packet;
+	int err = 0;
+	network_mysqld_lenenc_type lenenc_type;
+    
+	packet.data = chunk->data;
+	packet.offset = 0;
+
+	err = err || network_mysqld_proto_skip_network_header(&packet);
+
+	err = err || network_mysqld_proto_peek_lenenc_type(&packet, &lenenc_type);
+	if (0 != err) return NULL;
+
+	if (NETWORK_MYSQLD_LENENC_TYPE_EOF == lenenc_type) {
+		/* this is a EOF packet, we are done */
+		return NULL;
+	}
+
+	err = err || network_mysqld_proto_get_binary_row(&packet, fields, row);
+
+	return err ? NULL : chunk->next;
+}
+
+/**
+ * create a struct for a COM_STMT_CLOSE packet
+ */
+network_mysqld_stmt_close_packet_t *network_mysqld_stmt_close_packet_new() {
+	network_mysqld_stmt_close_packet_t *stmt_close_packet;
+
+	stmt_close_packet = g_slice_new0(network_mysqld_stmt_close_packet_t);
+
+	return stmt_close_packet;
+}
+
+/**
+ * free a struct for a COM_STMT_CLOSE packet
+ */
+void network_mysqld_stmt_close_packet_free(network_mysqld_stmt_close_packet_t *stmt_close_packet) {
+	if (NULL == stmt_close_packet) return;
+
+	g_slice_free(network_mysqld_stmt_close_packet_t, stmt_close_packet);
+}
+
+/**
+ */
+int network_mysqld_proto_get_stmt_close_packet(network_packet *packet, network_mysqld_stmt_close_packet_t *stmt_close_packet) {
+	guint8 packet_type;
+	int err = 0;
+
+	err = err || network_mysqld_proto_get_int8(packet, &packet_type);
+	if (err) return -1;
+
+	if (COM_STMT_CLOSE != packet_type) {
+		g_critical("%s: expected the first byte to be %02x, got %02x",
+				G_STRLOC,
+				COM_STMT_CLOSE,
+				packet_type);
+		return -1;
+	}
+
+	err = err || network_mysqld_proto_get_int32(packet, &stmt_close_packet->stmt_id);
+
+	return err ? -1 : 0;
+}
+
+int network_mysqld_proto_append_stmt_close_packet(GString *packet, network_mysqld_stmt_close_packet_t *stmt_close_packet) {
+	network_mysqld_proto_append_int8(packet, COM_STMT_CLOSE);
+	network_mysqld_proto_append_int32(packet, stmt_close_packet->stmt_id);
+
+	return 0;
+}
+
 

=== modified file 'src/network-mysqld-packet.h'
--- src/network-mysqld-packet.h	2010-05-10 10:31:45 +0000
+++ src/network-mysqld-packet.h	2010-09-22 15:13:16 +0000
@@ -185,4 +185,58 @@
 NETWORK_API int network_mysqld_proto_get_auth_response(network_packet *packet, network_mysqld_auth_response *auth);
 NETWORK_API network_mysqld_auth_response *network_mysqld_auth_response_copy(network_mysqld_auth_response *src);
 
+/* COM_STMT_* */
+
+typedef struct {
+	GString *stmt_text;
+} network_mysqld_stmt_prepare_packet_t;
+
+NETWORK_API network_mysqld_stmt_prepare_packet_t *network_mysqld_stmt_prepare_packet_new();
+NETWORK_API void network_mysqld_stmt_prepare_packet_free(network_mysqld_stmt_prepare_packet_t *stmt_prepare_packet);
+NETWORK_API int network_mysqld_proto_get_stmt_prepare_packet(network_packet *packet, network_mysqld_stmt_prepare_packet_t *stmt_prepare_packet);
+NETWORK_API int network_mysqld_proto_append_stmt_prepare_packet(GString *packet, network_mysqld_stmt_prepare_packet_t *stmt_prepare_packet);
+
+typedef struct {
+	guint32 stmt_id;
+	guint16 num_columns;
+	guint16 num_params;
+	guint16 warnings;
+} network_mysqld_stmt_prepare_ok_packet_t;
+
+NETWORK_API network_mysqld_stmt_prepare_ok_packet_t *network_mysqld_stmt_prepare_ok_packet_new(void);
+NETWORK_API void network_mysqld_stmt_prepare_ok_packet_free(network_mysqld_stmt_prepare_ok_packet_t *stmt_prepare_ok_packet);
+NETWORK_API int network_mysqld_proto_get_stmt_prepare_ok_packet(network_packet *packet, network_mysqld_stmt_prepare_ok_packet_t *stmt_prepare_ok_packet);
+NETWORK_API int network_mysqld_proto_append_stmt_prepare_ok_packet(GString *packet, network_mysqld_stmt_prepare_ok_packet_t *stmt_prepare_ok_packet);
+
+typedef struct {
+	guint32 stmt_id;
+	guint8  flags;
+	guint32 iteration_count;
+	guint8 new_params_bound;
+	GPtrArray *params; /**< array<network_mysqld_type *> */
+} network_mysqld_stmt_execute_packet_t;
+
+NETWORK_API network_mysqld_stmt_execute_packet_t *network_mysqld_stmt_execute_packet_new(void);
+NETWORK_API void network_mysqld_stmt_execute_packet_free(network_mysqld_stmt_execute_packet_t *stmt_execute_packet);
+NETWORK_API int network_mysqld_proto_get_stmt_execute_packet(network_packet *packet, network_mysqld_stmt_execute_packet_t *stmt_execute_packet, guint param_count);
+NETWORK_API int network_mysqld_proto_append_stmt_execute_packet(GString *packet, network_mysqld_stmt_execute_packet_t *stmt_execute_packet, guint param_count);
+NETWORK_API int network_mysqld_proto_get_stmt_execute_packet_stmt_id(network_packet *packet, guint32 *stmt_id);
+
+
+typedef GPtrArray network_mysqld_resultset_row_t;
+
+NETWORK_API network_mysqld_resultset_row_t *network_mysqld_resultset_row_new(void);
+NETWORK_API void network_mysqld_resultset_row_free(network_mysqld_resultset_row_t *row);
+NETWORK_API int network_mysqld_proto_get_binary_row(network_packet *packet, network_mysqld_proto_fielddefs_t *fields, network_mysqld_resultset_row_t *row);
+NETWORK_API GList *network_mysqld_proto_get_next_binary_row(GList *chunk, network_mysqld_proto_fielddefs_t *fields, network_mysqld_resultset_row_t *row);
+
+typedef struct {
+	guint32 stmt_id;
+} network_mysqld_stmt_close_packet_t;
+
+NETWORK_API network_mysqld_stmt_close_packet_t *network_mysqld_stmt_close_packet_new(void);
+NETWORK_API void network_mysqld_stmt_close_packet_free(network_mysqld_stmt_close_packet_t *stmt_close_packet);
+NETWORK_API int network_mysqld_proto_get_stmt_close_packet(network_packet *packet, network_mysqld_stmt_close_packet_t *stmt_close_packet);
+NETWORK_API int network_mysqld_proto_append_stmt_close_packet(GString *packet, network_mysqld_stmt_close_packet_t *stmt_close_packet);
+
 #endif

=== modified file 'src/network-mysqld-proto.h'
--- src/network-mysqld-proto.h	2010-04-06 14:26:51 +0000
+++ src/network-mysqld-proto.h	2010-09-22 15:13:16 +0000
@@ -111,11 +111,14 @@
 NETWORK_API int network_mysqld_proto_peek_lenenc_type(network_packet *packet, network_mysqld_lenenc_type *type);
 NETWORK_API int network_mysqld_proto_get_lenenc_int(network_packet *packet, guint64 *v);
 
-NETWORK_API MYSQL_FIELD *network_mysqld_proto_fielddef_new(void);
-NETWORK_API void network_mysqld_proto_fielddef_free(MYSQL_FIELD *fielddef);
+typedef MYSQL_FIELD network_mysqld_proto_fielddef_t;
+NETWORK_API network_mysqld_proto_fielddef_t *network_mysqld_proto_fielddef_new(void);
+NETWORK_API void network_mysqld_proto_fielddef_free(network_mysqld_proto_fielddef_t *fielddef);
+NETWORK_API int network_mysqld_proto_get_fielddef(network_packet *packet, network_mysqld_proto_fielddef_t *field, guint32 capabilities);
 
-NETWORK_API GPtrArray *network_mysqld_proto_fielddefs_new(void);
-NETWORK_API void network_mysqld_proto_fielddefs_free(GPtrArray *fielddefs);
+typedef GPtrArray network_mysqld_proto_fielddefs_t;
+NETWORK_API network_mysqld_proto_fielddefs_t *network_mysqld_proto_fielddefs_new(void);
+NETWORK_API void network_mysqld_proto_fielddefs_free(network_mysqld_proto_fielddefs_t *fielddefs);
 
 NETWORK_API guint32 network_mysqld_proto_get_packet_len(GString *_header);
 NETWORK_API guint8 network_mysqld_proto_get_packet_id(GString *_header);

=== added file 'src/network_mysqld_proto_binary.c'
--- src/network_mysqld_proto_binary.c	1970-01-01 00:00:00 +0000
+++ src/network_mysqld_proto_binary.c	2010-09-22 15:13:16 +0000
@@ -0,0 +1,441 @@
+/* $%BEGINLICENSE%$
+ Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA
+
+ $%ENDLICENSE%$ */
+
+/**
+ * codec's for the binary MySQL client protocol
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "network_mysqld_proto_binary.h"
+
+#include "glib-ext.h"
+#include "string-len.h"
+
+/* ints */
+static int network_mysqld_proto_binary_get_int_type(network_packet *packet, network_mysqld_type_t *type) {
+	int err = 0;
+	guint8 i8;
+	guint16 i16;
+	guint32 i32;
+	guint64 i64;
+
+	switch (type->type) {
+	case MYSQL_TYPE_TINY:
+		err = err || network_mysqld_proto_get_int8(packet, &i8);
+		err = err || network_mysqld_type_set_int(type, (guint64)i8, type->is_unsigned);
+		break;
+	case MYSQL_TYPE_SHORT:
+		err = err || network_mysqld_proto_get_int16(packet, &i16);
+		err = err || network_mysqld_type_set_int(type, (guint64)i16, type->is_unsigned);
+		break;
+	case MYSQL_TYPE_LONG:
+	case MYSQL_TYPE_INT24:
+		err = err || network_mysqld_proto_get_int32(packet, &i32);
+		err = err || network_mysqld_type_set_int(type, (guint64)i32, type->is_unsigned);
+		break;
+	case MYSQL_TYPE_LONGLONG:
+		err = err || network_mysqld_proto_get_int64(packet, &i64);
+		err = err || network_mysqld_type_set_int(type, i64, type->is_unsigned);
+		break;
+	default:
+		err = -1;
+		break;
+	}
+
+	return err ? -1 : 0;
+}
+
+static int network_mysqld_proto_binary_append_int_type(GString *packet, network_mysqld_type_t *type) {
+	guint64 i64;
+	guint8  i8;
+	guint16 i16;
+	guint32 i32;
+	int err = 0;
+
+	err = err || network_mysqld_type_get_int(type, &i64, NULL);
+	if (0 != err) return -1;
+
+	switch (type->type) {
+	case MYSQL_TYPE_TINY:
+
+		i8 = i64;
+
+		err = err || network_mysqld_proto_append_int8(packet, i8);
+		break;
+	case MYSQL_TYPE_SHORT:
+		i16 = i64;
+
+		err = err || network_mysqld_proto_append_int16(packet, i16);
+		break;
+	case MYSQL_TYPE_LONG:
+	case MYSQL_TYPE_INT24:
+		i32 = i64;
+
+		err = err || network_mysqld_proto_append_int32(packet, i32);
+		break;
+	case MYSQL_TYPE_LONGLONG:
+		err = err || network_mysqld_proto_append_int64(packet, i64);
+		break;
+	default:
+		err = -1;
+		break;
+	}
+
+	return err ? -1 : 0;
+}
+
+/* double */
+static int network_mysqld_proto_binary_get_double_type(network_packet *packet, network_mysqld_type_t *type) {
+	int err = 0;
+	union {
+		double d;
+		char d_char_shadow[sizeof(double) + 1];
+	} double_copy;
+
+	GString s;
+	s.str = double_copy.d_char_shadow;
+	s.len = 0;
+	s.allocated_len = sizeof(double_copy.d_char_shadow);
+
+	err = err || network_mysqld_proto_get_gstring_len(packet, sizeof(double), &s);
+
+	if (0 == err) {
+		err = err || network_mysqld_type_set_double(type, double_copy.d);
+	}
+
+	return err ? -1 : 0;
+}
+
+static int network_mysqld_proto_binary_append_double_type(GString *packet, network_mysqld_type_t *type) {
+	union {
+		double d;
+		char d_char_shadow[sizeof(double)];
+	} double_copy;
+	int err = 0;
+
+	err = err || network_mysqld_type_get_double(type, &double_copy.d);
+
+	g_string_append_len(packet, double_copy.d_char_shadow, sizeof(double));
+
+	return err ? -1 : 0;
+}
+
+/* float */
+static int network_mysqld_proto_binary_get_float_type(network_packet *packet, network_mysqld_type_t *type) {
+	int err = 0;
+	union {
+		float d;
+		char d_char_shadow[sizeof(float) + 1];
+	} float_copy;
+
+	GString s;
+	s.str = float_copy.d_char_shadow;
+	s.len = 0;
+	s.allocated_len = sizeof(float_copy.d_char_shadow);
+
+	err = err || network_mysqld_proto_get_gstring_len(packet, sizeof(float), &s);
+
+	if (0 == err) {
+		err = err || network_mysqld_type_set_double(type, (double)float_copy.d);
+	}
+
+	return err ? -1 : 0;
+}
+
+static int network_mysqld_proto_binary_append_float_type(GString *packet, network_mysqld_type_t *type) {
+	double d;
+	int err = 0;
+
+	err = err || network_mysqld_type_get_double(type, &d); /* get our float as double */
+
+	if (0 == err) {
+		/* copy the float directly without switching byte-order */
+		union {
+			float f;
+			char f_char_shadow[sizeof(float)];
+		} float_copy; /* shadow the float with a equally sized char to be able to copy it without extra type-casting */
+
+		float_copy.f = (float)d;
+
+		g_string_append_len(packet, float_copy.f_char_shadow, sizeof(float));
+	}
+
+	return err ? -1 : 0;
+}
+
+/* all kinds of strings */
+static int network_mysqld_proto_binary_get_string_type(network_packet *packet, network_mysqld_type_t *type) {
+	GString *str;
+	int err = 0;
+
+	str = g_string_new(NULL);
+
+	err = err || network_mysqld_proto_get_lenenc_gstring(packet, str);
+
+	network_mysqld_type_set_string(type, S(str));
+
+	g_string_free(str, TRUE);
+
+	return err ? -1 : 0;
+}
+
+static int network_mysqld_proto_binary_append_string_type(GString *packet, network_mysqld_type_t *type) {
+	const char *s;
+	gsize s_len;
+	int err = 0;
+
+	err = err || network_mysqld_type_get_string_const(type, &s, &s_len);
+	err = err || network_mysqld_proto_append_lenenc_string_len(packet, s, s_len);
+
+	return err ? -1 : 0;
+}
+
+/* all kinds of time */
+
+/**
+ * extract the date from a binary resultset row
+ */
+static int network_mysqld_proto_binary_get_date_type(network_packet *packet, network_mysqld_type_t *type) {
+	int err = 0;
+	guint8 len;
+	network_mysqld_type_date_t date;
+
+	err = err || network_mysqld_proto_get_int8(packet, &len);
+
+	/* check the valid lengths
+	 */
+	switch (len) {
+	case 11: /* date + time + ms */
+	case 7:  /* date + time ( ms is .0000 ) */
+	case 4:  /* date ( time is 00:00:00 )*/
+	case 0:  /* date == 0000-00-00 */
+		break;
+	default:
+		return -1;
+	}
+
+	memset(&date, 0, sizeof(date));
+	if (len > 0) {
+		err = err || network_mysqld_proto_get_int16(packet, &date.year);
+		err = err || network_mysqld_proto_get_int8(packet, &date.month);
+		err = err || network_mysqld_proto_get_int8(packet, &date.day);
+		
+		if (len > 4) {
+			err = err || network_mysqld_proto_get_int8(packet, &date.hour);
+			err = err || network_mysqld_proto_get_int8(packet, &date.min);
+			err = err || network_mysqld_proto_get_int8(packet, &date.sec);
+
+			if (len > 7) {
+				err = err || network_mysqld_proto_get_int32(packet, &date.nsec);
+			}
+		}
+	}
+
+	if (0 == err) {
+		err = err || network_mysqld_type_set_date(type, &date);
+	}
+
+	return err ? -1 : 0;
+}
+
+static int network_mysqld_proto_binary_append_date_type(GString G_GNUC_UNUSED *packet, network_mysqld_type_t G_GNUC_UNUSED *type) {
+	/* not implemented yet */
+	return -1;
+}
+
+/**
+ * extract the time from a binary resultset row
+ */
+static int network_mysqld_proto_binary_get_time_type(network_packet *packet, network_mysqld_type_t *type) {
+	int err = 0;
+	guint8 len;
+	network_mysqld_type_time_t t;
+
+	err = err || network_mysqld_proto_get_int8(packet, &len);
+
+	/* check the valid lengths
+	 */
+	switch (len) {
+	case 12: /* day + time + ms */
+	case 8:  /* day + time ( ms is .0000 ) */
+	case 0:  /* time == 00:00:00 */
+		break;
+	default:
+		return -1;
+	}
+
+	memset(&t, 0, sizeof(t));
+	if (len > 0) {
+		err = err || network_mysqld_proto_get_int8(packet, &t.sign);
+		err = err || network_mysqld_proto_get_int32(packet, &t.days);
+		
+		err = err || network_mysqld_proto_get_int8(packet, &t.hour);
+		err = err || network_mysqld_proto_get_int8(packet, &t.min);
+		err = err || network_mysqld_proto_get_int8(packet, &t.sec);
+
+		if (len > 8) {
+			err = err || network_mysqld_proto_get_int32(packet, &t.nsec);
+		}
+	}
+
+	if (0 == err) {
+		err = err || network_mysqld_type_set_time(type, &t);
+	}
+
+	return err ? -1 : 0;
+}
+
+static int network_mysqld_proto_binary_append_time_type(GString G_GNUC_UNUSED *packet, network_mysqld_type_t G_GNUC_UNUSED *type) {
+	/* not implemented yet */
+	return -1;
+}
+
+/**
+ * valid types for prepared statements parameters we receive from the client
+ */
+gboolean network_mysql_proto_binary_type_is_valid_input(enum enum_field_types field_type) {
+	switch (field_type) {
+	case MYSQL_TYPE_TINY:
+	case MYSQL_TYPE_SHORT:
+	case MYSQL_TYPE_LONG:
+	case MYSQL_TYPE_LONGLONG:
+
+	case MYSQL_TYPE_FLOAT:
+	case MYSQL_TYPE_DOUBLE:
+
+	case MYSQL_TYPE_BLOB:
+	case MYSQL_TYPE_STRING:
+
+	case MYSQL_TYPE_DATE:
+	case MYSQL_TYPE_DATETIME:
+	case MYSQL_TYPE_TIME:
+	case MYSQL_TYPE_TIMESTAMP:
+
+	case MYSQL_TYPE_NULL:
+		return TRUE;
+	default:
+		return FALSE;
+	}
+}
+
+/**
+ * types we allow the send back to the client
+ */
+gboolean network_mysql_proto_binary_is_valid_output(enum enum_field_types field_type) {
+	switch (field_type) {
+	case MYSQL_TYPE_TINY:
+	case MYSQL_TYPE_SHORT:
+	case MYSQL_TYPE_INT24:
+	case MYSQL_TYPE_LONG:
+	case MYSQL_TYPE_LONGLONG:
+
+	case MYSQL_TYPE_FLOAT:
+	case MYSQL_TYPE_DOUBLE:
+	case MYSQL_TYPE_NEWDECIMAL:
+
+	case MYSQL_TYPE_TINY_BLOB:
+	case MYSQL_TYPE_BLOB:
+	case MYSQL_TYPE_MEDIUM_BLOB:
+	case MYSQL_TYPE_LONG_BLOB:
+	case MYSQL_TYPE_STRING:
+	case MYSQL_TYPE_VAR_STRING:
+
+	case MYSQL_TYPE_DATE:
+	case MYSQL_TYPE_DATETIME:
+	case MYSQL_TYPE_TIME:
+	case MYSQL_TYPE_TIMESTAMP:
+
+	case MYSQL_TYPE_BIT:
+		return TRUE;
+	default:
+		return FALSE;
+	}
+}
+
+int network_mysqld_proto_binary_get_type(network_packet *packet, network_mysqld_type_t *type) {
+	switch (type->type) {
+	case MYSQL_TYPE_TINY:
+	case MYSQL_TYPE_SHORT:
+	case MYSQL_TYPE_LONG:
+	case MYSQL_TYPE_INT24:
+	case MYSQL_TYPE_LONGLONG:
+		return network_mysqld_proto_binary_get_int_type(packet, type);
+	case MYSQL_TYPE_DATE:
+	case MYSQL_TYPE_DATETIME:
+	case MYSQL_TYPE_TIMESTAMP:
+		return network_mysqld_proto_binary_get_date_type(packet, type);
+	case MYSQL_TYPE_TIME:
+		return network_mysqld_proto_binary_get_time_type(packet, type);
+	case MYSQL_TYPE_FLOAT:
+		return network_mysqld_proto_binary_get_float_type(packet, type);
+	case MYSQL_TYPE_DOUBLE:
+		return network_mysqld_proto_binary_get_double_type(packet, type);
+	case MYSQL_TYPE_BIT:
+	case MYSQL_TYPE_NEWDECIMAL:
+	case MYSQL_TYPE_BLOB:
+	case MYSQL_TYPE_TINY_BLOB:
+	case MYSQL_TYPE_MEDIUM_BLOB:
+	case MYSQL_TYPE_LONG_BLOB:
+	case MYSQL_TYPE_STRING:
+	case MYSQL_TYPE_VAR_STRING:
+		/* they are all length-encoded strings */
+		return network_mysqld_proto_binary_get_string_type(packet, type);
+	}
+
+	return -1;
+}
+
+int network_mysqld_proto_binary_append_type(GString *packet, network_mysqld_type_t *type) {
+	switch (type->type) {
+	case MYSQL_TYPE_TINY:
+	case MYSQL_TYPE_SHORT:
+	case MYSQL_TYPE_LONG:
+	case MYSQL_TYPE_INT24:
+	case MYSQL_TYPE_LONGLONG:
+		return network_mysqld_proto_binary_append_int_type(packet, type);
+	case MYSQL_TYPE_DATE:
+	case MYSQL_TYPE_DATETIME:
+	case MYSQL_TYPE_TIMESTAMP:
+		return network_mysqld_proto_binary_append_date_type(packet, type);
+	case MYSQL_TYPE_TIME:
+		return network_mysqld_proto_binary_append_time_type(packet, type);
+	case MYSQL_TYPE_FLOAT:
+		return network_mysqld_proto_binary_append_float_type(packet, type);
+	case MYSQL_TYPE_DOUBLE:
+		return network_mysqld_proto_binary_append_double_type(packet, type);
+	case MYSQL_TYPE_BIT:
+	case MYSQL_TYPE_NEWDECIMAL:
+	case MYSQL_TYPE_BLOB:
+	case MYSQL_TYPE_TINY_BLOB:
+	case MYSQL_TYPE_MEDIUM_BLOB:
+	case MYSQL_TYPE_LONG_BLOB:
+	case MYSQL_TYPE_STRING:
+	case MYSQL_TYPE_VAR_STRING:
+		/* they are all length-encoded strings */
+		return network_mysqld_proto_binary_append_string_type(packet, type);
+	}
+
+	return -1;
+}
+
+

=== added file 'src/network_mysqld_proto_binary.h'
--- src/network_mysqld_proto_binary.h	1970-01-01 00:00:00 +0000
+++ src/network_mysqld_proto_binary.h	2010-09-22 15:13:16 +0000
@@ -0,0 +1,12 @@
+#ifndef __NETWORK_MYSQLD_PROTO_BINARY_H__
+#define __NETWORK_MYSQLD_PROTO_BINARY_H__
+
+#include <glib.h>
+
+#include "network-socket.h"
+#include "network_mysqld_type.h"
+
+int network_mysqld_proto_binary_get_type(network_packet *packet, network_mysqld_type_t *type);
+int network_mysqld_proto_binary_append_type(GString *packet, network_mysqld_type_t *type);
+
+#endif

=== added file 'src/network_mysqld_type.c'
--- src/network_mysqld_type.c	1970-01-01 00:00:00 +0000
+++ src/network_mysqld_type.c	2010-09-22 15:13:16 +0000
@@ -0,0 +1,656 @@
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <glib.h>
+
+#include "network_mysqld_type.h"
+#include "string-len.h"
+
+#include "glib-ext.h"
+
+/* expose the types itself and their internal representation */
+
+typedef double network_mysqld_type_double_t;
+
+typedef float network_mysqld_type_float_t;
+
+typedef GString network_mysqld_type_string_t;
+
+typedef struct {
+	guint64 i;
+	gboolean is_unsigned;
+} network_mysqld_type_int_t;
+
+/**
+ * create a type that can hold a MYSQL_TYPE_LONGLONG
+ */
+static network_mysqld_type_int_t *network_mysqld_type_int_new(void) {
+	network_mysqld_type_int_t *ll;
+	
+	ll = g_slice_new0(network_mysqld_type_int_t);
+
+	return ll;
+}
+
+/**
+ * free a network_mysqld_type_int_t
+ */
+static void network_mysqld_type_int_free(network_mysqld_type_int_t *ll) {
+	if (NULL == ll) return;
+
+	g_slice_free(network_mysqld_type_int_t, ll);
+}
+
+static int network_mysqld_type_data_int_get_int(network_mysqld_type_t *type, guint64 *i, gboolean *is_unsigned) {
+	network_mysqld_type_int_t *value;
+
+	if (NULL == type->data) return -1;
+
+	value = type->data;
+
+	*i = value->i;
+	*is_unsigned = value->is_unsigned;
+
+	return 0;
+}
+
+static int network_mysqld_type_data_int_set_int(network_mysqld_type_t *type, guint64 i, gboolean is_unsigned) {
+	network_mysqld_type_int_t *value;
+
+	if (NULL == type->data) {
+		type->data = network_mysqld_type_int_new();
+	}	
+	value = type->data;
+
+	value->i = i;
+	value->is_unsigned = is_unsigned;
+
+	return 0;
+}
+
+
+/**
+ * typesafe wrapper for network_mysqld_type_new()
+ */
+static void network_mysqld_type_data_int_free(network_mysqld_type_t *type) {
+	if (NULL == type) return;
+	if (NULL == type->data) return;
+
+	network_mysqld_type_int_free(type->data);
+}
+
+static void network_mysqld_type_data_int_init(network_mysqld_type_t *type, enum enum_field_types field_type) {
+	type->type	= field_type;
+	type->free_data = network_mysqld_type_data_int_free;
+	type->get_int    = network_mysqld_type_data_int_get_int;
+	type->set_int    = network_mysqld_type_data_int_set_int;
+}
+
+/* MYSQL_TYPE_DOUBLE */
+
+/**
+ * create a type that can hold a MYSQL_TYPE_DOUBLE
+ */
+static network_mysqld_type_double_t *network_mysqld_type_double_new(void) {
+	network_mysqld_type_double_t *t;
+	
+	t = g_slice_new0(network_mysqld_type_double_t);
+
+	return t;
+}
+
+/**
+ * free a network_mysqld_type_double_t
+ */
+static void network_mysqld_type_double_free(network_mysqld_type_double_t *t) {
+	if (NULL == t) return;
+
+	g_slice_free(network_mysqld_type_double_t, t);
+}
+
+static void network_mysqld_type_data_double_free(network_mysqld_type_t *type) {
+	if (NULL == type) return;
+	if (NULL == type->data) return;
+
+	network_mysqld_type_double_free(type->data);
+}
+
+static int network_mysqld_type_data_double_get_double(network_mysqld_type_t *type, double *d) {
+	network_mysqld_type_double_t *value = type->data;
+
+	if (NULL == value) return -1;
+
+	*d = *value;
+
+	return 0;
+}
+
+static int network_mysqld_type_data_double_set_double(network_mysqld_type_t *type, double d) {
+	network_mysqld_type_double_t *value;
+
+	if (NULL == type->data) {
+		type->data = network_mysqld_type_double_new();
+	}
+
+	value = type->data;
+	*value = d;
+
+	return 0;
+}
+
+static void network_mysqld_type_data_double_init(network_mysqld_type_t *type, enum enum_field_types field_type) {
+	type->type	= field_type;
+	type->free_data = network_mysqld_type_data_double_free;
+	type->get_double = network_mysqld_type_data_double_get_double;
+	type->set_double = network_mysqld_type_data_double_set_double;
+}
+
+/* MYSQL_TYPE_FLOAT */
+
+/**
+ * create a type that can hold a MYSQL_TYPE_FLOAT
+ */
+
+static network_mysqld_type_float_t *network_mysqld_type_float_new(void) {
+	network_mysqld_type_float_t *t;
+	
+	t = g_slice_new0(network_mysqld_type_float_t);
+
+	return t;
+}
+
+/**
+ * free a network_mysqld_type_float_t
+ */
+static void network_mysqld_type_float_free(network_mysqld_type_float_t *t) {
+	if (NULL == t) return;
+
+	g_slice_free(network_mysqld_type_float_t, t);
+}
+
+static void network_mysqld_type_data_float_free(network_mysqld_type_t *type) {
+	if (NULL == type) return;
+	if (NULL == type->data) return;
+
+	network_mysqld_type_float_free(type->data);
+}
+
+static int network_mysqld_type_data_float_get_double(network_mysqld_type_t *type, double *dst) {
+	network_mysqld_type_float_t *src = type->data;
+
+	if (NULL == type->data) return -1;
+
+	*dst = (double)*src;
+
+	return 0;
+}
+
+static int network_mysqld_type_data_float_set_double(network_mysqld_type_t *type, double src) {
+	network_mysqld_type_float_t *dst = type->data;
+
+	if (NULL == type->data) {
+		type->data = network_mysqld_type_float_new();
+	}
+
+	dst = type->data;
+	*dst = (float)src;
+
+	return 0;
+}
+
+static void network_mysqld_type_data_float_init(network_mysqld_type_t *type, enum enum_field_types field_type) {
+	type->type	= field_type;
+	type->free_data = network_mysqld_type_data_float_free;
+	type->get_double = network_mysqld_type_data_float_get_double;
+	type->set_double = network_mysqld_type_data_float_set_double;
+}
+
+/* MYSQL_TYPE_STRING */
+static network_mysqld_type_string_t *network_mysqld_type_string_new(void) {
+	network_mysqld_type_string_t *str;
+
+	str = g_string_new(NULL);
+
+	return str;
+}
+
+static void network_mysqld_type_string_free(network_mysqld_type_string_t *str) {
+	if (NULL == str) return;
+
+	g_string_free(str, TRUE);
+}
+
+static void network_mysqld_type_data_string_free(network_mysqld_type_t *type) {
+	if (NULL == type) return;
+
+	network_mysqld_type_string_free(type->data);
+}
+
+static int network_mysqld_type_data_string_get_string_const(network_mysqld_type_t *type, const char **dst, gsize *dst_len) {
+	GString *src = type->data;
+
+	if (NULL == type->data) return -1;
+
+	*dst = src->str;
+	*dst_len = src->len;
+	
+	return 0;
+}
+
+static int network_mysqld_type_data_string_set_string(network_mysqld_type_t *type, const char *src, gsize src_len) {
+	GString *dst;
+
+	if (NULL == type->data) {
+		type->data = g_string_sized_new(src_len);
+	}
+
+	dst = type->data;
+
+	g_string_assign_len(dst, src, src_len);
+	
+	return 0;
+}
+
+static void network_mysqld_type_data_string_init(network_mysqld_type_t *type, enum enum_field_types field_type) {
+	type->type	= field_type;
+	type->free_data = network_mysqld_type_data_string_free;
+	type->get_string_const = network_mysqld_type_data_string_get_string_const;
+	type->set_string = network_mysqld_type_data_string_set_string;
+}
+
+/* MYSQL_TYPE_DATE */
+static network_mysqld_type_date_t *network_mysqld_type_date_new(void) {
+	network_mysqld_type_date_t *date;
+
+	date = g_slice_new0(network_mysqld_type_date_t);
+
+	return date;
+}
+
+static void network_mysqld_type_date_free(network_mysqld_type_date_t *date) {
+	if (NULL == date) return;
+
+	g_slice_free(network_mysqld_type_date_t, date);
+}
+
+static void network_mysqld_type_data_date_free(network_mysqld_type_t *type) {
+	if (NULL == type) return;
+
+	network_mysqld_type_date_free(type->data);
+}
+
+static int network_mysqld_type_data_date_get_date(network_mysqld_type_t *type, network_mysqld_type_date_t *dst) {
+	network_mysqld_type_date_t *src = type->data;
+
+	if (NULL == type->data) return -1;
+
+	memcpy(dst, src, sizeof(*src));
+
+	return 0;
+}
+
+static gboolean network_mysqld_type_date_time_is_valid(network_mysqld_type_date_t *date) {
+	return (date->nsec < 1000000000 &&
+	      date->sec  < 100 &&
+	      date->min  <= 60 &&
+	      date->hour <= 24);
+}
+
+static gboolean network_mysqld_type_date_date_is_valid(network_mysqld_type_date_t *date) {
+	return (date->day <= 31 &&
+	      date->month <= 12 &&
+	      date->year  <= 9999);
+}
+
+gboolean network_mysqld_type_date_is_valid(network_mysqld_type_date_t *date) {
+	return network_mysqld_type_date_time_is_valid(date) &&
+		network_mysqld_type_date_date_is_valid(date);
+}
+
+static int network_mysqld_type_data_date_get_string(network_mysqld_type_t *type, char **dst, gsize *dst_len) {
+	network_mysqld_type_date_t *src = type->data;
+
+	if (NULL == type->data) return -1;
+
+	switch (type->type) {
+	case MYSQL_TYPE_DATE:
+		if (!network_mysqld_type_date_date_is_valid(src)) {
+			return -1;
+		}
+		break;
+	case MYSQL_TYPE_DATETIME:
+	case MYSQL_TYPE_TIMESTAMP:
+		if (!network_mysqld_type_date_is_valid(src)) {
+			return -1;
+		}
+		break;
+	default:
+		/* we shouldn't be here */
+		return -1;
+	}
+
+	if (NULL != *dst) {
+		switch (type->type) {
+		case MYSQL_TYPE_DATE:
+			/* dst_len already contains a size and we don't have to alloc */
+			if (*dst_len < NETWORK_MYSQLD_TYPE_DATE_MIN_BUF_LEN) {
+				return -1; /* ... but it is too small .. we could return the right size here */
+			}
+			*dst_len = snprintf(*dst, *dst_len, "%04u-%02u-%02u",
+					src->year,
+					src->month,
+					src->day);
+			break;
+		case MYSQL_TYPE_DATETIME:
+		case MYSQL_TYPE_TIMESTAMP:
+			/* dst_len already contains a size and we don't have to alloc */
+			if (*dst_len < NETWORK_MYSQLD_TYPE_DATETIME_MIN_BUF_LEN) {
+				return -1; /* ... but it is too small .. we could return the right size here */
+			}
+			*dst_len = snprintf(*dst, *dst_len, "%04u-%02u-%02u %02u:%02u:%02u.%09u",
+					src->year,
+					src->month,
+					src->day,
+					src->hour,
+					src->min,
+					src->sec,
+					src->nsec);
+			break;
+		default:
+			g_assert_not_reached();
+			break;
+		}
+	} else {
+		switch (type->type) {
+		case MYSQL_TYPE_DATE:
+			*dst = g_strdup_printf("%04u-%02u-%02u",
+					src->year,
+					src->month,
+					src->day);
+			*dst_len = strlen(*dst);
+			break;
+		case MYSQL_TYPE_DATETIME:
+		case MYSQL_TYPE_TIMESTAMP:
+			*dst = g_strdup_printf("%04u-%02u-%02u %02u:%02u:%02u.%09u",
+					src->year,
+					src->month,
+					src->day,
+					src->hour,
+					src->min,
+					src->sec,
+					src->nsec);
+			*dst_len = strlen(*dst);
+			break;
+		default:
+			g_assert_not_reached();
+			break;
+		}
+	}
+
+	return 0;
+}
+
+
+static int network_mysqld_type_data_date_set_date(network_mysqld_type_t *type, network_mysqld_type_date_t *src) {
+	network_mysqld_type_date_t *dst;
+
+	if (NULL == type->data) {
+		type->data = network_mysqld_type_date_new();
+	}
+
+	dst = type->data;
+
+	memcpy(dst, src, sizeof(*src));
+
+	return 0;
+}
+
+static void network_mysqld_type_data_date_init(network_mysqld_type_t *type, enum enum_field_types field_type) {
+	type->type	= field_type;
+	type->free_data = network_mysqld_type_data_date_free;
+	type->get_date   = network_mysqld_type_data_date_get_date;
+	type->get_string = network_mysqld_type_data_date_get_string;
+	type->set_date   = network_mysqld_type_data_date_set_date;
+}
+
+
+/* MYSQL_TYPE_TIME */
+static network_mysqld_type_time_t *network_mysqld_type_time_new(void) {
+	network_mysqld_type_time_t *t;
+
+	t = g_slice_new0(network_mysqld_type_time_t);
+
+	return t;
+}
+
+static void network_mysqld_type_time_free(network_mysqld_type_time_t *t) {
+	if (NULL == t) return;
+
+	g_slice_free(network_mysqld_type_time_t, t);
+}
+
+static void network_mysqld_type_data_time_free(network_mysqld_type_t *type) {
+	if (NULL == type) return;
+
+	network_mysqld_type_time_free(type->data);
+}
+
+static int network_mysqld_type_data_time_get_time(network_mysqld_type_t *type, network_mysqld_type_time_t *dst) {
+	network_mysqld_type_time_t *src = type->data;
+
+	if (NULL == type->data) return -1;
+
+	memcpy(dst, src, sizeof(*src));
+
+	return 0;
+}
+
+static int network_mysqld_type_data_time_get_string(network_mysqld_type_t *type, char **dst, gsize *dst_len) {
+	network_mysqld_type_time_t *src = type->data;
+
+	if (NULL == type->data) return -1;
+
+	if (NULL != *dst) {
+		/* dst_len already contains a size and we don't have to alloc */
+		if (*dst_len < NETWORK_MYSQLD_TYPE_TIME_MIN_BUF_LEN) {
+			return -1; /* ... but it is too small .. we could return the right size here */
+		}
+		*dst_len = snprintf(*dst, *dst_len, "%s%d %02u:%02u:%02u.%09u",
+				src->sign ? "-" : "",
+				src->days,
+				src->hour,
+				src->min,
+				src->sec,
+				src->nsec);
+	} else {
+		*dst = g_strdup_printf("%s%d %02u:%02u:%02u.%09u",
+				src->sign ? "-" : "",
+				src->days,
+				src->hour,
+				src->min,
+				src->sec,
+				src->nsec);
+		*dst_len = strlen(*dst);
+	}
+
+	return 0;
+}
+
+static int network_mysqld_type_data_time_set_time(network_mysqld_type_t *type, network_mysqld_type_time_t *src) {
+	network_mysqld_type_date_t *dst;
+
+	if (NULL == type->data) {
+		type->data = network_mysqld_type_time_new();
+	}
+	dst = type->data;
+
+	memcpy(dst, src, sizeof(*src));
+
+	return 0;
+}
+
+
+static void network_mysqld_type_data_time_init(network_mysqld_type_t *type, enum enum_field_types field_type) {
+	type->type	= field_type;
+	type->free_data = network_mysqld_type_data_time_free;
+	type->get_time = network_mysqld_type_data_time_get_time;
+	type->get_string = network_mysqld_type_data_time_get_string;
+	type->set_time = network_mysqld_type_data_time_set_time;
+}
+
+
+/**
+ * create a type 
+ */
+network_mysqld_type_t *network_mysqld_type_new(enum enum_field_types field_type) {
+	network_mysqld_type_t *type = NULL;
+
+	switch (field_type) {
+	case MYSQL_TYPE_TINY:
+	case MYSQL_TYPE_SHORT:
+	case MYSQL_TYPE_LONG:
+	case MYSQL_TYPE_INT24:
+	case MYSQL_TYPE_LONGLONG:
+		type = g_slice_new0(network_mysqld_type_t);
+
+		network_mysqld_type_data_int_init(type, field_type);
+		break;
+	case MYSQL_TYPE_FLOAT: /* 4 bytes */
+		type = g_slice_new0(network_mysqld_type_t);
+
+		network_mysqld_type_data_float_init(type, field_type);
+		break;
+	case MYSQL_TYPE_DOUBLE: /* 8 bytes */
+		type = g_slice_new0(network_mysqld_type_t);
+
+		network_mysqld_type_data_double_init(type, field_type);
+		break;
+	case MYSQL_TYPE_DATETIME:
+	case MYSQL_TYPE_DATE:
+	case MYSQL_TYPE_TIMESTAMP:
+		type = g_slice_new0(network_mysqld_type_t);
+
+		network_mysqld_type_data_date_init(type, field_type);
+		break;
+	case MYSQL_TYPE_TIME:
+		type = g_slice_new0(network_mysqld_type_t);
+
+		network_mysqld_type_data_time_init(type, field_type);
+		break;
+	case MYSQL_TYPE_NEWDECIMAL:
+	case MYSQL_TYPE_BLOB:
+	case MYSQL_TYPE_TINY_BLOB:
+	case MYSQL_TYPE_MEDIUM_BLOB:
+	case MYSQL_TYPE_LONG_BLOB:
+	case MYSQL_TYPE_STRING:
+	case MYSQL_TYPE_VAR_STRING:
+	case MYSQL_TYPE_VARCHAR:
+		/* they are all length-encoded strings */
+		type = g_slice_new0(network_mysqld_type_t);
+
+		network_mysqld_type_data_string_init(type, field_type);
+		break;
+	case MYSQL_TYPE_NULL:
+		type = g_slice_new0(network_mysqld_type_t);
+
+		type->type = field_type;
+		break;
+	}
+
+	return type;
+}
+/**
+ * free a type
+ */
+void network_mysqld_type_free(network_mysqld_type_t *type) {
+	if (NULL == type) return;
+
+	if (NULL != type->free_data) {
+		type->free_data(type);
+	}
+	g_slice_free(network_mysqld_type_t, type);
+}
+
+int network_mysqld_type_get_gstring(network_mysqld_type_t *type, GString *s) {
+	if (NULL == type->get_gstring) return -1;
+
+	return type->get_gstring(type, s);
+}
+
+int network_mysqld_type_get_string_const(network_mysqld_type_t *type, const char **s, gsize *s_len) {
+	if (NULL == type->get_string_const) return -1;
+
+	return type->get_string_const(type, s, s_len);
+}
+
+int network_mysqld_type_get_string(network_mysqld_type_t *type, char **s, gsize *s_len) {
+	if (NULL == type->get_string) return -1;
+
+	return type->get_string(type, s, s_len);
+}
+
+
+int network_mysqld_type_set_string(network_mysqld_type_t *type, const char *s, gsize s_len) {
+	if (NULL == type->set_string) return -1;
+
+	return type->set_string(type, s, s_len);
+}
+
+
+int network_mysqld_type_get_int(network_mysqld_type_t *type, guint64 *i, gboolean *is_unsigned) {
+	if (NULL == type->get_int) return -1;
+
+	return type->get_int(type, i, is_unsigned);
+}
+
+
+int network_mysqld_type_set_int(network_mysqld_type_t *type, guint64 i, gboolean is_unsigned) {
+	if (NULL == type->set_int) return -1;
+
+	return type->set_int(type, i, is_unsigned);
+}
+
+
+int network_mysqld_type_get_double(network_mysqld_type_t *type, double *d) {
+	if (NULL == type->get_double) return -1;
+
+	return type->get_double(type, d);
+}
+
+
+int network_mysqld_type_set_double(network_mysqld_type_t *type, double d) {
+	if (NULL == type->set_double) return -1;
+
+	return type->set_double(type, d);
+}
+
+
+int network_mysqld_type_get_date(network_mysqld_type_t *type, network_mysqld_type_date_t *date) {
+	if (NULL == type->get_date) return -1;
+
+	return type->get_date(type, date);
+}
+
+
+int network_mysqld_type_set_date(network_mysqld_type_t *type, network_mysqld_type_date_t *date) {
+	if (NULL == type->set_date) return -1;
+
+	return type->set_date(type, date);
+}
+
+
+int network_mysqld_type_get_time(network_mysqld_type_t *type, network_mysqld_type_time_t *t) {
+	if (NULL == type->get_time) return -1;
+
+	return type->get_time(type, t);
+}
+
+
+int network_mysqld_type_set_time(network_mysqld_type_t *type, network_mysqld_type_time_t *t) {
+	if (NULL == type->set_time) return -1;
+
+	return type->set_time(type, t);
+}
+
+

=== added file 'src/network_mysqld_type.h'
--- src/network_mysqld_type.h	1970-01-01 00:00:00 +0000
+++ src/network_mysqld_type.h	2010-09-22 15:13:16 +0000
@@ -0,0 +1,147 @@
+#ifndef __NETWORK_MYSQLD_TYPE_H__
+#define __NETWORK_MYSQLD_TYPE_H__
+
+#include <mysql.h>
+#include <glib.h>
+
+#include "network-mysqld-proto.h"
+
+/**
+ * struct for the MYSQL_TYPE_DATE and friends
+ */
+typedef struct {
+	guint16 year;
+	guint8  month;
+	guint8  day;
+	
+	guint8  hour;
+	guint8  min;
+	guint8  sec;
+
+	guint32 nsec; /* the nano-second part */
+} network_mysqld_type_date_t;
+
+#define NETWORK_MYSQLD_TYPE_DATE_MIN_BUF_LEN (sizeof("2010-10-27"))
+#define NETWORK_MYSQLD_TYPE_DATETIME_MIN_BUF_LEN (sizeof("2010-10-27 19:27:30.000000001"))
+#define NETWORK_MYSQLD_TYPE_TIMESTAMP_MIN_BUF_LEN NETWORK_MYSQLD_TYPE_DATETIME_MIN_BUF_LEN
+
+/**
+ * struct for the MYSQL_TYPE_TIME 
+ */
+typedef struct {
+	guint8  sign;
+	guint32 days;
+	
+	guint8  hour;
+	guint8  min;
+	guint8  sec;
+
+	guint32 nsec; /* the nano-second part */
+} network_mysqld_type_time_t;
+
+#define NETWORK_MYSQLD_TYPE_TIME_MIN_BUF_LEN (sizeof("-2147483647 19:27:30.000000001"))
+
+typedef struct _network_mysqld_type_t network_mysqld_type_t;
+
+struct _network_mysqld_type_t {
+	enum enum_field_types type;
+
+	gpointer data;
+	void (*free_data)(network_mysqld_type_t *type);
+
+	/**
+	 * get a copy of ->data as GString 
+	 *
+	 * @param type the type to get the data from
+	 * @param s    GString that the converted data will be assigned too
+	 * @return 0 on success, -1 on error
+	 */
+	int (*get_gstring)(network_mysqld_type_t *type, GString *s);
+	/**
+	 * expose the ->data as constant string 
+	 *
+	 * only available for types that have a "string" storage like _STRING, _CHAR, _BLOB
+	 * the caller can copy the data out, but not change it
+	 *
+	 * @param type the type to get the data from
+	 * @param s    place to store the pointer to the const char * in
+	 * @param s_len length of the const char *
+	 * @return 0 on success, -1 on error
+	 */
+	int (*get_string_const)(network_mysqld_type_t *type, const char **s, gsize *s_len);
+	/**
+	 * get a copy of ->data as char *
+	 *
+	 * has 2 modes:
+	 * - no-alloc-mode if *s is not NULL where it is expected that s and s_len point
+	 *   to a buffer of that size that we can copy into
+	 *   *s_len will contain the size of the stored string on success
+	 *   if *s_len is too small, -1 will be returned
+	 * - alloc-mode when *s is NULL where we return a alloced buffer that is large enough
+	 *
+	 * @param type the type to get the data from
+	 * @param s    pointer to a buffer of *s_len size or pointer to (char *)NULL for alloc-mode
+	 * @param s_len pointer to the length of the buffer if *s is not NULL. Points to the length of the *s on success
+	 * @return 0 on success, -1 on error
+	 */
+	int (*get_string)(network_mysqld_type_t *type, char **s, gsize *len);
+	/**
+	 * set the ->data from a string 
+	 */
+	int (*set_string)(network_mysqld_type_t *type, const char *s, gsize s_len);
+	/**
+	 * get ->data as uint64
+	 */
+	int (*get_int)(network_mysqld_type_t *type, guint64 *i, gboolean *is_unsigned);
+	/**
+	 * set ->data from uint64
+	 */
+	int (*set_int)(network_mysqld_type_t *type, guint64 i, gboolean is_unsigned);
+	/**
+	 * get ->data as double
+	 */
+	int (*get_double)(network_mysqld_type_t *type, double *d);
+	/**
+	 * set ->data from double
+	 */
+	int (*set_double)(network_mysqld_type_t *type, double d);
+	int (*get_date)(network_mysqld_type_t *type, network_mysqld_type_date_t *date);
+	int (*set_date)(network_mysqld_type_t *type, network_mysqld_type_date_t *date);
+	/**
+	 * get the ->data as _time_t 
+	 */
+	int (*get_time)(network_mysqld_type_t *type, network_mysqld_type_time_t *t);
+	/**
+	 * set the ->data from a _time_t
+	 */
+	int (*set_time)(network_mysqld_type_t *type, network_mysqld_type_time_t *t);
+
+
+	gboolean is_null;     /**< is the value of this type NULL */
+	gboolean is_unsigned; /**< is the type signed or unsigned, only used by the integer types */
+}; 
+
+
+NETWORK_API network_mysqld_type_t *network_mysqld_type_new(enum enum_field_types _type);
+NETWORK_API void network_mysqld_type_free(network_mysqld_type_t *type);
+
+/**
+ * wrappers around the gettors and settors 
+ *
+ * @return -1 if no settor or gettor defined or settor or gettor failed to convert
+ */
+NETWORK_API int network_mysqld_type_get_gstring(network_mysqld_type_t *type, GString *s);
+NETWORK_API int network_mysqld_type_get_gstring(network_mysqld_type_t *type, GString *s);
+NETWORK_API int network_mysqld_type_get_string_const(network_mysqld_type_t *type, const char **s, gsize *s_len);
+NETWORK_API int network_mysqld_type_get_string(network_mysqld_type_t *type, char **s, gsize *len);
+NETWORK_API int network_mysqld_type_set_string(network_mysqld_type_t *type, const char *s, gsize s_len);
+NETWORK_API int network_mysqld_type_get_int(network_mysqld_type_t *type, guint64 *i, gboolean *is_unsigned);
+NETWORK_API int network_mysqld_type_set_int(network_mysqld_type_t *type, guint64 i, gboolean is_unsigned);
+NETWORK_API int network_mysqld_type_get_double(network_mysqld_type_t *type, double *d);
+NETWORK_API int network_mysqld_type_set_double(network_mysqld_type_t *type, double d);
+NETWORK_API int network_mysqld_type_get_date(network_mysqld_type_t *type, network_mysqld_type_date_t *date);
+NETWORK_API int network_mysqld_type_set_date(network_mysqld_type_t *type, network_mysqld_type_date_t *date);
+NETWORK_API int network_mysqld_type_get_time(network_mysqld_type_t *type, network_mysqld_type_time_t *t);
+NETWORK_API int network_mysqld_type_set_time(network_mysqld_type_t *type, network_mysqld_type_time_t *t);
+
+#endif

=== modified file 'tests/unit/CMakeLists.txt'
--- tests/unit/CMakeLists.txt	2010-02-24 11:02:26 +0000
+++ tests/unit/CMakeLists.txt	2010-09-22 15:13:16 +0000
@@ -113,6 +113,7 @@
 	../../src/glib-ext.c 
 	../../src/network-mysqld-proto.c 
 	../../src/network-mysqld-packet.c 
+	../../src/network_mysqld_type.c 
 	../../src/chassis-timings.c
 	../../src/my_rdtsc.c
 )
@@ -132,6 +133,7 @@
 	../../src/glib-ext.c
 	../../src/network-mysqld-proto.c
 	../../src/network-mysqld-packet.c
+	../../src/network_mysqld_type.c 
 	../../src/network-address.c
 )
 

=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2010-04-06 14:26:51 +0000
+++ tests/unit/Makefile.am	2010-09-22 15:13:16 +0000
@@ -32,6 +32,7 @@
 	t_network_backend \
 	t_network_injection \
 	t_network_mysqld_packet \
+	t_network_mysqld_type \
 	t_network_mysqld_masterinfo \
 	t_chassis_timings \
 	t_chassis_shutdown_hooks \
@@ -81,10 +82,21 @@
 check_mysqld_proto_CPPFLAGS = -I$(top_srcdir)/src/ $(GLIB_CFLAGS) $(MYSQL_CFLAGS)
 check_mysqld_proto_LDADD    = $(GLIB_LIBS)
 
+t_network_mysqld_type_SOURCES  = \
+	t_network_mysqld_type.c \
+	$(top_srcdir)/src/network_mysqld_type.c \
+	$(top_srcdir)/src/glib-ext.c
+
+t_network_mysqld_type_CPPFLAGS = -I$(top_srcdir)/src/ $(GLIB_CFLAGS) $(MYSQL_CFLAGS) $(LUA_CFLAGS)
+t_network_mysqld_type_LDADD    = $(GLIB_LIBS) $(LUA_LIBS) $(EVENT_LIBS)
+
+
 t_network_mysqld_packet_SOURCES  = \
 	t_network_mysqld_packet.c \
 	$(top_srcdir)/src/network-mysqld-packet.c \
 	$(top_srcdir)/src/network-mysqld-proto.c \
+	$(top_srcdir)/src/network_mysqld_type.c \
+	$(top_srcdir)/src/network_mysqld_proto_binary.c \
 	$(top_srcdir)/src/network-queue.c \
 	$(top_srcdir)/src/network-socket.c \
 	$(top_srcdir)/src/network-address.c \
@@ -126,6 +138,8 @@
 	$(top_srcdir)/src/glib-ext.c \
 	$(top_srcdir)/src/network-mysqld-proto.c \
 	$(top_srcdir)/src/network-mysqld-packet.c \
+	$(top_srcdir)/src/network_mysqld_type.c \
+	$(top_srcdir)/src/network_mysqld_proto_binary.c \
 	$(top_srcdir)/src/network-address.c \
 	$(top_srcdir)/src/network-queue.c \
 	$(top_srcdir)/src/network-socket.c
@@ -177,6 +191,8 @@
 	$(top_srcdir)/src/network-backend.c \
 	$(top_srcdir)/src/network-mysqld-proto.c \
 	$(top_srcdir)/src/network-mysqld-packet.c \
+	$(top_srcdir)/src/network_mysqld_type.c \
+	$(top_srcdir)/src/network_mysqld_proto_binary.c \
 	$(top_srcdir)/src/network-conn-pool.c \
 	$(top_srcdir)/src/network-address.c \
 	$(top_srcdir)/src/network-queue.c \
@@ -204,6 +220,8 @@
 	$(top_srcdir)/src/glib-ext.c \
 	$(top_srcdir)/src/network-mysqld-proto.c \
 	$(top_srcdir)/src/network-mysqld-packet.c \
+	$(top_srcdir)/src/network_mysqld_type.c \
+	$(top_srcdir)/src/network_mysqld_proto_binary.c \
 	$(top_srcdir)/src/network-injection.c \
 	$(top_srcdir)/src/my_rdtsc.c \
 	$(top_srcdir)/src/chassis-timings.c

=== modified file 'tests/unit/lua/mysql-proto.lua'
--- tests/unit/lua/mysql-proto.lua	2010-04-06 14:26:51 +0000
+++ tests/unit/lua/mysql-proto.lua	2010-09-22 15:13:16 +0000
@@ -19,7 +19,7 @@
  $%ENDLICENSE%$ --]]
 local proto = assert(require("mysql.proto"))
 local password = assert(require("mysql.password"))
-
+require("proxy.test")
 ---
 -- err packet
 
@@ -265,3 +265,72 @@
 
 assert(false == password.check(challenge, response, dbl_hashed))
 
+---
+-- prepared stmt decoders
+--
+
+-- EXECUTE packet, no params
+local packet = "\023\001\000\000\000\000\001\000\000\000"
+local execute = proto.from_stmt_execute_packet(packet, 0)
+assert(execute)
+assertEquals(execute.stmt_id, 1)
+assertEquals(execute.flags, 0)
+assertEquals(execute.iteration_count, 1)
+assertEquals(execute.new_params_bound, false)
+
+-- EXECUTE packet with 14 params
+local packet = "\023" ..
+	"\001\000\000\000" ..
+	"\000" ..
+	"\001\000\000\000" ..
+	"\003\000" ..
+	"\001" ..
+	"\254\000\006\000\254\000\008\000\008\128\003\000\002\000\001\000\005\000\004\000\010\000\012\000\007\000\011\000" ..
+	"\003\102\111\111" ..
+	"\001\000\000\000\000\000\000\000" ..
+	"\001\000\000\000\000\000\000\000" ..
+	"\001\000\000\000" ..
+	"\001\000" ..
+	"\001" ..
+	"\102\102\102\102\102\102\036\064" ..
+	"\000\000\036\065" ..
+	"\004\218\007\010\017" ..
+	"\011\218\007\010\017\019\027\030\001\000\000\000" ..
+	"\011\218\007\010\017\019\027\030\001\000\000\000" ..
+	"\012\001\120\000\000\000\019\027\030\001\000\000\000"
+
+local execute = proto.from_stmt_execute_packet(packet, 14)
+assert(execute)
+assertEquals(execute.stmt_id, 1)
+assertEquals(execute.flags, 0)
+assertEquals(execute.iteration_count, 1)
+assertEquals(execute.new_params_bound, true)
+
+local params = execute.params
+assert(params)
+assertEquals(#params, 14)
+
+local expected_params = {
+	{ type = 254, value = nil },
+	{ type = 6, value = nil },
+	{ type = 254, value = "foo" },
+	{ type = 8, value = 1 },
+	{ type = 8, value = 1 },
+	{ type = 3, value = 1 },
+	{ type = 2, value = 1 },
+	{ type = 1, value = 1 },
+	{ type = 5, value = 10.2 }, --[[ double ]]--
+	{ type = 4, value = 10.25 }, --[[ float ]]--
+	{ type = 10, value = "2010-10-17" }, --[[ date ]]--
+	{ type = 12, value = "2010-10-17 19:27:30.000000001" }, --[[ datetime ]]--
+	{ type = 7, value = "2010-10-17 19:27:30.000000001" }, --[[ timestamp ]]--
+	{ type = 11, value = "-120 19:27:30.000000001" }, --[[ time ]]--
+}
+
+for ndx, expected_param in ipairs(expected_params) do
+	local param = params[ndx]
+	assert(param)
+	assertEquals(param.type, expected_param.type)
+	assertEquals(param.value, expected_param.value)
+end
+

=== modified file 'tests/unit/t_network_mysqld_packet.c'
--- tests/unit/t_network_mysqld_packet.c	2010-04-06 14:26:51 +0000
+++ tests/unit/t_network_mysqld_packet.c	2010-09-22 15:13:16 +0000
@@ -27,6 +27,7 @@
 
 #include "network-mysqld-proto.h"
 #include "network-mysqld-packet.h"
+#include "network_mysqld_type.h"
 #include "glib-ext.h"
 
 #if GLIB_CHECK_VERSION(2, 16, 0)
@@ -695,6 +696,624 @@
 	network_queue_free(q);
 }
 
+/* prepared statements */
+
+/* COM_STMT_PREPARE */
+static void t_com_stmt_prepare_new(void) {
+	network_mysqld_stmt_prepare_packet_t *cmd;
+
+	cmd = network_mysqld_stmt_prepare_packet_new();
+	g_assert(cmd);
+
+	network_mysqld_stmt_prepare_packet_free(cmd);
+}
+
+static void t_com_stmt_prepare_from_packet(void) {
+	network_mysqld_stmt_prepare_packet_t *cmd;
+	const char raw_packet[] = "\x1c\x00\x00\x00\x16SELECT CONCAT(?, ?) AS col1";
+	network_packet packet;
+
+	packet.data = g_string_new_len(C(raw_packet));
+	packet.offset = 0;
+
+	cmd = network_mysqld_stmt_prepare_packet_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_stmt_prepare_packet(&packet, cmd));
+	g_assert_cmpint(sizeof("SELECT CONCAT(?, ?) AS col1") - 1, ==, cmd->stmt_text->len);
+	g_assert_cmpstr("SELECT CONCAT(?, ?) AS col1", ==, cmd->stmt_text->str);
+
+	network_mysqld_stmt_prepare_packet_free(cmd);
+}
+
+/* COM_STMT_PREPARE OK-result */
+
+static void t_com_stmt_prepare_ok_new(void) {
+	network_mysqld_stmt_prepare_ok_packet_t *cmd;
+
+	cmd = network_mysqld_stmt_prepare_ok_packet_new();
+	g_assert(cmd);
+
+	network_mysqld_stmt_prepare_ok_packet_free(cmd);
+}
+
+/**
+ * test if we parse all the fields of a COM_STMT_PREPARE-ok response correctly
+ */
+static void t_com_stmt_prepare_ok_from_packet(void) {
+	network_mysqld_stmt_prepare_ok_packet_t *cmd;
+	network_mysqld_eof_packet_t *eof;
+	network_mysqld_proto_fielddef_t *coldef;
+
+	/* a response for the COM_STMT_PREPARE command
+	 *
+	 * the OK part with stmt-id and so on is in the first packet. The others are
+	 * the field-defs, a EOF, the param-defs, and the last EOF */
+	strings packets[] = {
+		{ C("\x0c\x00\x00\x01\x00\x01\x00\x00\x00\x01\x00\x02\x00\x00\x00\x00") }, /* the PREPARE OK packet */
+		{ C("\x17\x00\x00\x02\x03\x64\x65\x66\x00\x00\x00\x01\x3f\x00\x0c\x3f\x00\x00\x00\x00\x00\xfd\x80\x00\x00\x00\x00") }, /* column-def: param 1 */
+		{ C("\x17\x00\x00\x03\x03\x64\x65\x66\x00\x00\x00\x01\x3f\x00\x0c\x3f\x00\x00\x00\x00\x00\xfd\x80\x00\x00\x00\x00") }, /* column-def: param 2 */
+		{ C("\x05\x00\x00\x04\xfe\x00\x00\x02\x00") }, /* the seperator */
+		{ C("\x1a\x00\x00\x05\x03\x64\x65\x66\x00\x00\x00\x04\x63\x6f\x6c\x31\x00\x0c\x3f\x00\x00\x00\x00\x00\xfd\x80\x00\x1f\x00\x00") }, /* column-def: result-col 1 */
+		{ C("\x05\x00\x00\x06\xfe\x00\x00\x02\x00") } /* the terminator */
+	};
+	network_packet packet;
+
+	packet.data = g_string_new_len(packets[0].s, packets[0].s_len);
+	packet.offset = 0;
+
+	cmd = network_mysqld_stmt_prepare_ok_packet_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_stmt_prepare_ok_packet(&packet, cmd));
+	g_assert_cmpint(1, ==, cmd->stmt_id);
+	g_assert_cmpint(1, ==, cmd->num_columns);
+	g_assert_cmpint(2, ==, cmd->num_params);
+	g_assert_cmpint(0, ==, cmd->warnings);
+	
+	network_mysqld_stmt_prepare_ok_packet_free(cmd);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+
+	packet.data = g_string_new_len(packets[1].s, packets[1].s_len);
+	packet.offset = 0;
+
+	coldef = network_mysqld_proto_fielddef_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_fielddef(&packet, coldef, CLIENT_PROTOCOL_41));
+
+	network_mysqld_proto_fielddef_free(coldef);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+
+
+	packet.data = g_string_new_len(packets[2].s, packets[2].s_len);
+	packet.offset = 0;
+
+	coldef = network_mysqld_proto_fielddef_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_fielddef(&packet, coldef, CLIENT_PROTOCOL_41));
+	network_mysqld_proto_fielddef_free(coldef);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+
+
+	packet.data = g_string_new_len(packets[3].s, packets[3].s_len);
+	packet.offset = 0;
+
+	eof = network_mysqld_eof_packet_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_eof_packet(&packet, eof));
+
+	network_mysqld_eof_packet_free(eof);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+
+
+	packet.data = g_string_new_len(packets[4].s, packets[4].s_len);
+	packet.offset = 0;
+
+	coldef = network_mysqld_proto_fielddef_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_fielddef(&packet, coldef, CLIENT_PROTOCOL_41));
+	network_mysqld_proto_fielddef_free(coldef);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+
+
+	packet.data = g_string_new_len(packets[5].s, packets[5].s_len);
+	packet.offset = 0;
+
+	eof = network_mysqld_eof_packet_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_eof_packet(&packet, eof));
+
+	network_mysqld_eof_packet_free(eof);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+}
+
+/* COM_STMT_EXECUTE */
+
+static void t_com_stmt_execute_new(void) {
+	network_mysqld_stmt_execute_packet_t *cmd;
+
+	cmd = network_mysqld_stmt_execute_packet_new();
+	g_assert(cmd);
+
+	network_mysqld_stmt_execute_packet_free(cmd);
+}
+
+/**
+ * test if we decode all valid types from EXECUTE stmt 
+ */
+static void t_com_stmt_execute_from_packet(void) {
+	network_mysqld_stmt_execute_packet_t *cmd;
+	const char raw_packet[] = 
+		"\x7a\x00\x00\x00"
+		"\x17" /* COM_STMT_EXECUTE */
+		"\x01\x00\x00\x00" /* stmt-id */
+		"\x00" /* flags */
+		"\x01\x00\x00\x00" /* iteration count */
+		"\x03\x00" /* nul-flags */
+		"\x01" /* yeah, we have parameters */
+		"\xfe\x00\x06\x00\xfe\x00\x08\x00\x08\x80\x03\x00\x02\x00\x01\x00\x05\x00\x04\x00\x0a\x00\x0c\x00\x07\x00\x0b\x00" /* param-defs */
+		"\x03\x66\x6f\x6f" /* the string */
+		"\x01\x00\x00\x00\x00\x00\x00\x00" /* int64 */
+		"\x01\x00\x00\x00\x00\x00\x00\x00" /* int64 (unsigned) */
+		"\x01\x00\x00\x00" /* int32 */
+		"\x01\x00" /* int16 */
+		"\x01" /* int8 */
+		"\x66\x66\x66\x66\x66\x66\x24\x40"
+		"\x33\x33\x23\x41"
+		"\x04\xda\x07\x0a\x11"
+		"\x0b\xda\x07\x0a\x11\x13\x1b\x1e\x01\x00\x00\x00"
+		"\x0b\xda\x07\x0a\x11\x13\x1b\x1e\x01\x00\x00\x00"
+		"\x0c\x01\x78\x00\x00\x00\x13\x1b\x1e\x01\x00\x00\x00";
+
+	network_packet packet;
+	network_mysqld_type_t *param;
+	int param_ndx = 0;
+
+	packet.data = g_string_new_len(C(raw_packet));
+	packet.offset = 0;
+
+#define EXPECTED_NUM_PARAMS 14
+	cmd = network_mysqld_stmt_execute_packet_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_stmt_execute_packet(&packet, cmd, EXPECTED_NUM_PARAMS));
+	g_assert_cmpint(1, ==, cmd->stmt_id);
+	g_assert_cmpint(0, ==, cmd->flags);
+	g_assert_cmpint(1, ==, cmd->iteration_count);
+	g_assert_cmpint(1, ==, cmd->new_params_bound);
+	g_assert_cmpint(EXPECTED_NUM_PARAMS, ==, cmd->params->len);
+#undef EXPECTED_NUM_PARAMS
+
+	/* (_STRING)NULL */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_STRING, ==, param->type);
+	g_assert_cmpint(TRUE, ==, param->is_null);
+
+	/* (_NULL) */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_NULL, ==, param->type);
+	g_assert_cmpint(TRUE, ==, param->is_null);
+
+	/* (_STRING)"foo" */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_STRING, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	{
+		const char *s;
+		gsize s_len;
+
+		g_assert_cmpint(0, ==, param->get_string_const(param, &s, &s_len));
+		g_assert_cmpint(s_len, ==, 3);
+		g_assert_cmpstr(s, ==, "foo");
+	};
+
+	/* (_INT64)1 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_LONGLONG, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	g_assert_cmpint(FALSE, ==, param->is_unsigned);
+	{
+		guint64 i;
+		gboolean is_unsigned;
+
+		g_assert_cmpint(0, ==, param->get_int(param, &i, &is_unsigned));
+		g_assert_cmpint(i, ==, 1);
+		g_assert_cmpint(is_unsigned, ==, FALSE);
+	};
+
+	/* (_UINT64)1 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_LONGLONG, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	g_assert_cmpint(TRUE, ==, param->is_unsigned);
+	{
+		guint64 i;
+		gboolean is_unsigned;
+
+		g_assert_cmpint(0, ==, param->get_int(param, &i, &is_unsigned));
+		g_assert_cmpint(i, ==, 1);
+	};
+
+	/* (_INT32)1 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_LONG, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	g_assert_cmpint(FALSE, ==, param->is_unsigned);
+	{
+		guint64 i;
+		gboolean is_unsigned;
+
+		g_assert_cmpint(0, ==, param->get_int(param, &i, &is_unsigned));
+		g_assert_cmpint(i, ==, 1);
+	};
+
+	/* (_INT16)1 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_SHORT, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	g_assert_cmpint(FALSE, ==, param->is_unsigned);
+	{
+		guint64 i;
+		gboolean is_unsigned;
+
+		g_assert_cmpint(0, ==, param->get_int(param, &i, &is_unsigned));
+		g_assert_cmpint(i, ==, 1);
+	};
+
+	/* (_INT8)1 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_TINY, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	g_assert_cmpint(FALSE, ==, param->is_unsigned);
+	{
+		guint64 i;
+		gboolean is_unsigned;
+
+		g_assert_cmpint(0, ==, param->get_int(param, &i, &is_unsigned));
+		g_assert_cmpint(i, ==, 1);
+	};
+
+	/* (_DOUBLE)10.2 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_DOUBLE, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	{
+		double d;
+
+		g_assert_cmpint(0, ==, param->get_double(param, &d));
+		g_assert_cmpfloat(d, ==, 10.2);
+	};
+
+	/* (_FLOAT)10.2 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_FLOAT, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	{
+		double d;
+
+		g_assert_cmpint(0, ==, param->get_double(param, &d));
+		g_assert_cmpfloat(d, ==, (float)10.2);
+	};
+
+	/* (_DATE)2010-10-17 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_DATE, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	{
+		network_mysqld_type_date_t date;
+
+		g_assert_cmpint(0, ==, param->get_date(param, &date));
+		g_assert_cmpint(date.year, ==, 2010);
+		g_assert_cmpint(date.month, ==, 10);
+		g_assert_cmpint(date.day, ==, 17);
+
+		g_assert_cmpint(date.hour, ==, 0);
+		g_assert_cmpint(date.min, ==, 0);
+		g_assert_cmpint(date.sec, ==, 0);
+		g_assert_cmpint(date.nsec, ==, 0);
+	};
+
+	/* (_DATETIME)2010-10-17 19:27:30.000 010 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_DATETIME, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	{
+		network_mysqld_type_date_t date;
+
+		g_assert_cmpint(0, ==, param->get_date(param, &date));
+
+		g_assert_cmpint(date.year, ==, 2010);
+		g_assert_cmpint(date.month, ==, 10);
+		g_assert_cmpint(date.day, ==, 17);
+
+		g_assert_cmpint(date.hour, ==, 19);
+		g_assert_cmpint(date.min, ==, 27);
+		g_assert_cmpint(date.sec, ==, 30);
+		g_assert_cmpint(date.nsec, ==, 1);
+	};
+
+	/* (_TIMESTAMP)2010-10-17 19:27:30.000 010 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_TIMESTAMP, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	{
+		network_mysqld_type_date_t date;
+
+		g_assert_cmpint(0, ==, param->get_date(param, &date));
+		g_assert_cmpint(date.year, ==, 2010);
+		g_assert_cmpint(date.month, ==, 10);
+		g_assert_cmpint(date.day, ==, 17);
+
+		g_assert_cmpint(date.hour, ==, 19);
+		g_assert_cmpint(date.min, ==, 27);
+		g_assert_cmpint(date.sec, ==, 30);
+		g_assert_cmpint(date.nsec, ==, 1);
+	};
+
+	/* (_TIME)-120 19:27:30.000 010 */
+	param = g_ptr_array_index(cmd->params, param_ndx++);
+	g_assert(param);
+	g_assert_cmpint(MYSQL_TYPE_TIME, ==, param->type);
+	g_assert_cmpint(FALSE, ==, param->is_null);
+	{
+		network_mysqld_type_time_t t;
+
+		g_assert_cmpint(0, ==, param->get_time(param, &t));
+		g_assert_cmpint(t.sign, ==, 1);
+		g_assert_cmpint(t.days, ==, 120);
+
+		g_assert_cmpint(t.hour, ==, 19);
+		g_assert_cmpint(t.min, ==, 27);
+		g_assert_cmpint(t.sec, ==, 30);
+		g_assert_cmpint(t.nsec, ==, 1);
+	};
+
+	network_mysqld_stmt_execute_packet_free(cmd);
+}
+
+/**
+ * test if we decode all valid types from EXECUTE stmt 
+ */
+static void t_com_stmt_execute_from_packet_invalid(void) {
+	network_mysqld_stmt_execute_packet_t *cmd;
+	const char raw_packet[] = 
+		"\x12\x00\x00\x00"
+		"\x17" /* COM_STMT_EXECUTE */
+		"\x01\x00\x00\x00" /* stmt-id */
+		"\x00" /* flags */
+		"\x01\x00\x00\x00" /* iteration count */
+		"\x00"
+		"\x01"
+		"\x0f\x00"
+		"\x03\x66\x6f\x6f";
+
+	network_packet packet;
+	network_mysqld_type_t *param;
+	int param_ndx = 0;
+
+	packet.data = g_string_new_len(C(raw_packet));
+	packet.offset = 0;
+
+#define EXPECTED_NUM_PARAMS 1
+	cmd = network_mysqld_stmt_execute_packet_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, !=, network_mysqld_proto_get_stmt_execute_packet(&packet, cmd, EXPECTED_NUM_PARAMS));
+#undef EXPECTED_NUM_PARAMS
+
+	network_mysqld_stmt_execute_packet_free(cmd);
+}
+
+/**
+ * if there are no parameters, we don't have any nul-flags to send
+ */
+static void t_com_stmt_execute_from_packet_no_params(void) {
+	network_mysqld_stmt_execute_packet_t *cmd;
+	const char raw_packet[] = 
+		"\x0a\x00\x00\x00"
+		"\x17" /* COM_STMT_EXECUTE */
+		"\x01\x00\x00\x00" /* stmt-id */
+		"\x00" /* flags */
+		"\x01\x00\x00\x00" /* iteration count */
+		;
+
+	network_packet packet;
+
+	packet.data = g_string_new_len(C(raw_packet));
+	packet.offset = 0;
+
+	cmd = network_mysqld_stmt_execute_packet_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_stmt_execute_packet(&packet, cmd, 0));
+	g_assert_cmpint(1, ==, cmd->stmt_id);
+	g_assert_cmpint(0, ==, cmd->flags);
+	g_assert_cmpint(1, ==, cmd->iteration_count);
+
+	network_mysqld_stmt_execute_packet_free(cmd);
+}
+
+/* COM_STMT_EXECUTE result */
+
+/**
+ * test if we parse all the fields of a COM_STMT_EXECUTE result correctly
+ */
+static void t_com_stmt_execute_result_from_packet(void) {
+	network_mysqld_eof_packet_t *eof;
+	network_mysqld_proto_fielddefs_t *coldefs;
+	network_mysqld_proto_fielddef_t *coldef;
+	network_mysqld_resultset_row_t *row;
+	network_mysqld_type_t *field;
+	GString *data;
+	guint64 field_count;
+	int packet_id = 0;
+
+	/* response for a 
+	 *   SELECT ? AS col2, CONCAT(?, ?) AS col1
+	 * with
+	 *   1: NULL
+	 *   2: STRING bar
+	 *   3: STRING foo
+	 */
+	strings packets[] = {
+		{ C("\x01\x00\x00\x01\x02") },
+		{ C("\x1a\x00\x00\x02\x03\x64\x65\x66\x00\x00\x00\x04\x63\x6f\x6c\x32\x00\x0c\x3f\x00\x00\x00\x00\x00\xfe\x80\x00\x00\x00\x00") },
+		{ C("\x1a\x00\x00\x03\x03\x64\x65\x66\x00\x00\x00\x04\x63\x6f\x6c\x31\x00\x0c\x08\x00\x06\x00\x00\x00\xfd\x00\x00\x1f\x00\x00") },
+		{ C("\x05\x00\x00\x04\xfe\x00\x00\x02\x00") },
+		{ C("\x09\x00\x00\x05\x00\x04\x06" "barfoo") },
+		{ C("\x05\x00\x00\x06\xfe\x00\x00\x02\x00") }
+
+	};
+	network_packet packet;
+
+	/* the field-count */
+	packet_id = 0;
+	packet.data = g_string_new_len(packets[packet_id].s, packets[packet_id].s_len);
+	packet.offset = 0;
+
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_lenenc_int(&packet, &field_count));
+	g_assert_cmpint(2, ==, field_count);
+	
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+
+
+	/* the colum defs */
+	packet_id++;
+	packet.data = g_string_new_len(packets[packet_id].s, packets[packet_id].s_len);
+	packet.offset = 0;
+
+	coldefs = network_mysqld_proto_fielddefs_new();
+	coldef = network_mysqld_proto_fielddef_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_fielddef(&packet, coldef, CLIENT_PROTOCOL_41));
+
+	g_ptr_array_add(coldefs, coldef);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+
+	/* the string column */
+	packet_id++;
+	packet.data = g_string_new_len(packets[packet_id].s, packets[packet_id].s_len);
+	packet.offset = 0;
+
+	coldef = network_mysqld_proto_fielddef_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_fielddef(&packet, coldef, CLIENT_PROTOCOL_41));
+
+	g_ptr_array_add(coldefs, coldef);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+
+	/* the EOF */	
+	packet_id++;
+	packet.data = g_string_new_len(packets[packet_id].s, packets[packet_id].s_len);
+	packet.offset = 0;
+
+	eof = network_mysqld_eof_packet_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_eof_packet(&packet, eof));
+
+	network_mysqld_eof_packet_free(eof);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+
+	/* the row */
+	packet_id++;
+	packet.data = g_string_new_len(packets[packet_id].s, packets[packet_id].s_len);
+	packet.offset = 0;
+
+	row = network_mysqld_resultset_row_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_binary_row(&packet, coldefs, row));
+
+	/* check if the 1st field is NULL */
+	field = g_ptr_array_index(row, 0);
+	g_assert(field);
+	g_assert_cmpint(TRUE, ==, field->is_null);
+
+	/* check if the 2nd field is "barfoo" */
+	field = g_ptr_array_index(row, 1);
+	g_assert(field);
+	g_assert_cmpint(MYSQL_TYPE_VAR_STRING, ==, field->type);
+	g_assert_cmpint(FALSE, ==, field->is_null);
+
+	/* FIXME: find a way to test this without touching the internal representation */
+	data = field->data;
+	g_assert(data);
+	g_assert_cmpint(data->len, ==, 6);
+	g_assert_cmpstr(data->str, ==, "barfoo");
+
+	network_mysqld_resultset_row_free(row);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+
+	packet_id++;
+	packet.data = g_string_new_len(packets[packet_id].s, packets[packet_id].s_len);
+	packet.offset = 0;
+
+	eof = network_mysqld_eof_packet_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_eof_packet(&packet, eof));
+
+	network_mysqld_eof_packet_free(eof);
+
+	g_assert_cmpint(packet.offset, ==, packet.data->len); /* is everything parsed */
+	g_string_free(packet.data, TRUE);
+	
+	network_mysqld_proto_fielddefs_free(coldefs);
+}
+
+/* COM_STMT_CLOSE */
+static void t_com_stmt_close_new(void) {
+	network_mysqld_stmt_close_packet_t *cmd;
+
+	cmd = network_mysqld_stmt_close_packet_new();
+	g_assert(cmd);
+
+	network_mysqld_stmt_close_packet_free(cmd);
+}
+
+static void t_com_stmt_close_from_packet(void) {
+	network_mysqld_stmt_close_packet_t *cmd;
+	const char raw_packet[] = "\x05\x00\x00\x00\x19\x01\x00\x00\x00";
+	network_packet packet;
+	packet.data = g_string_new_len(C(raw_packet));
+	packet.offset = 0;
+
+	cmd = network_mysqld_stmt_close_packet_new();
+	g_assert_cmpint(0, ==, network_mysqld_proto_skip_network_header(&packet));
+	g_assert_cmpint(0, ==, network_mysqld_proto_get_stmt_close_packet(&packet, cmd));
+	g_assert_cmpint(1, ==, cmd->stmt_id);
+
+	network_mysqld_stmt_close_packet_free(cmd);
+}
+
 
 /**
  * @cond
@@ -727,6 +1346,23 @@
 	g_test_add_func("/core/resultset-fields-broken-proto-field-count-low", t_resultset_fields_parse_low);
 	g_test_add_func("/core/resultset-fields-broken-proto-field-count-high", t_resultset_fields_parse_high);
 
+	/* prepared statements */
+	g_test_add_func("/core/com_stmt_prepare_new", t_com_stmt_prepare_new);
+	g_test_add_func("/core/com_stmt_prepare_from_packet", t_com_stmt_prepare_from_packet);
+
+	g_test_add_func("/core/com_stmt_prepare_ok_new", t_com_stmt_prepare_ok_new);
+	g_test_add_func("/core/com_stmt_prepare_ok_from_packet", t_com_stmt_prepare_ok_from_packet);
+
+	g_test_add_func("/core/com_stmt_execute_new", t_com_stmt_execute_new);
+	g_test_add_func("/core/com_stmt_execute_from_packet", t_com_stmt_execute_from_packet);
+	g_test_add_func("/core/com_stmt_execute_from_packet_no_params", t_com_stmt_execute_from_packet_no_params);
+	g_test_add_func("/core/com_stmt_execute_from_packet_invalid", t_com_stmt_execute_from_packet_invalid);
+	
+	g_test_add_func("/core/com_stmt_execute_result_from_packet", t_com_stmt_execute_result_from_packet);
+
+	g_test_add_func("/core/com_stmt_close_new", t_com_stmt_close_new);
+	g_test_add_func("/core/com_stmt_close_from_packet", t_com_stmt_close_from_packet);
+
 	return g_test_run();
 }
 /** @endcond */

=== added file 'tests/unit/t_network_mysqld_type.c'
--- tests/unit/t_network_mysqld_type.c	1970-01-01 00:00:00 +0000
+++ tests/unit/t_network_mysqld_type.c	2010-09-22 15:13:16 +0000
@@ -0,0 +1,205 @@
+/* $%BEGINLICENSE%$
+ Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA
+
+ $%ENDLICENSE%$ */
+ 
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "network_mysqld_type.h"
+#include "glib-ext.h"
+#include "string-len.h"
+
+void t_proto_type_date_to_string(void) {
+	network_mysqld_type_t *type;
+	network_mysqld_type_date_t date;
+	const char *const_s;
+	char *s;
+	gsize s_len;
+	char static_s[NETWORK_MYSQLD_TYPE_DATE_MIN_BUF_LEN];
+
+	type = network_mysqld_type_new(MYSQL_TYPE_DATE);
+
+	memset(&date, 0, sizeof(date));
+	date.year = 2010;
+	date.month = 12;
+	date.day = 30;
+
+	date.hour = 19;
+	date.min  = 27;
+	date.sec  = 30;
+
+	date.nsec = 1;
+
+	g_assert_cmpint(0, ==, network_mysqld_type_set_date(type, &date));
+	g_assert_cmpint(-1, ==, network_mysqld_type_get_string_const(type, &const_s, &s_len)); /* it has no string backend, so it can't have a _const for us */
+
+	/* get a copy of the date, alloced */
+	s = NULL;
+	s_len = 0;
+	g_assert_cmpint(0, ==, network_mysqld_type_get_string(type, &s, &s_len));
+	g_assert_cmpint(10, ==, s_len);
+	g_assert_cmpstr("2010-12-30", ==, s);
+	g_free(s);
+
+	s = static_s;
+	s_len = sizeof(static_s);
+	g_assert_cmpint(0, ==, network_mysqld_type_get_string(type, &s, &s_len));
+	g_assert_cmpint(10, ==, s_len);
+	g_assert_cmpstr("2010-12-30", ==, s);
+
+	network_mysqld_type_free(type);
+}
+
+void t_proto_type_datetime_to_string(void) {
+	network_mysqld_type_t *type;
+	network_mysqld_type_date_t date;
+	const char *const_s;
+	char *s;
+	gsize s_len;
+	char static_s[NETWORK_MYSQLD_TYPE_DATETIME_MIN_BUF_LEN];
+
+	type = network_mysqld_type_new(MYSQL_TYPE_DATETIME);
+
+	memset(&date, 0, sizeof(date));
+	date.year = 2010;
+	date.month = 12;
+	date.day = 30;
+
+	date.hour = 19;
+	date.min  = 27;
+	date.sec  = 30;
+
+	date.nsec = 1;
+
+	g_assert_cmpint(0, ==, network_mysqld_type_set_date(type, &date));
+	g_assert_cmpint(-1, ==, network_mysqld_type_get_string_const(type, &const_s, &s_len)); /* it has no string backend, so it can't have a _const for us */
+
+	/* get a copy of the date, alloced */
+	s = NULL;
+	s_len = 0;
+	g_assert_cmpint(0, ==, network_mysqld_type_get_string(type, &s, &s_len));
+	g_assert_cmpint(29, ==, s_len);
+	g_assert_cmpstr("2010-12-30 19:27:30.000000001", ==, s);
+	g_free(s);
+
+	s = static_s;
+	s_len = sizeof(static_s);
+	g_assert_cmpint(0, ==, network_mysqld_type_get_string(type, &s, &s_len));
+	g_assert_cmpint(29, ==, s_len);
+	g_assert_cmpstr("2010-12-30 19:27:30.000000001", ==, s);
+
+	network_mysqld_type_free(type);
+}
+
+void t_proto_type_timestamp_to_string(void) {
+	network_mysqld_type_t *type;
+	network_mysqld_type_date_t date;
+	const char *const_s;
+	char *s;
+	gsize s_len;
+	char static_s[NETWORK_MYSQLD_TYPE_TIMESTAMP_MIN_BUF_LEN];
+
+	type = network_mysqld_type_new(MYSQL_TYPE_TIMESTAMP);
+
+	memset(&date, 0, sizeof(date));
+	date.year = 2010;
+	date.month = 12;
+	date.day = 30;
+
+	date.hour = 19;
+	date.min  = 27;
+	date.sec  = 30;
+
+	date.nsec = 1;
+
+	g_assert_cmpint(0, ==, network_mysqld_type_set_date(type, &date));
+	g_assert_cmpint(-1, ==, network_mysqld_type_get_string_const(type, &const_s, &s_len)); /* it has no string backend, so it can't have a _const for us */
+
+	/* get a copy of the date, alloced */
+	s = NULL;
+	s_len = 0;
+	g_assert_cmpint(0, ==, network_mysqld_type_get_string(type, &s, &s_len));
+	g_assert_cmpint(29, ==, s_len);
+	g_assert_cmpstr("2010-12-30 19:27:30.000000001", ==, s);
+	g_free(s);
+
+	s = static_s;
+	s_len = sizeof(static_s);
+	g_assert_cmpint(0, ==, network_mysqld_type_get_string(type, &s, &s_len));
+	g_assert_cmpint(29, ==, s_len);
+	g_assert_cmpstr("2010-12-30 19:27:30.000000001", ==, s);
+
+	network_mysqld_type_free(type);
+}
+
+void t_proto_type_time_to_string(void) {
+	network_mysqld_type_t *type;
+	network_mysqld_type_time_t t;
+	const char *const_s;
+	char *s;
+	gsize s_len;
+	char static_s[NETWORK_MYSQLD_TYPE_TIME_MIN_BUF_LEN];
+
+	type = network_mysqld_type_new(MYSQL_TYPE_TIME);
+
+	memset(&t, 0, sizeof(t));
+	t.sign = -1;
+	t.days = 120;
+	t.hour = 19;
+	t.min  = 27;
+	t.sec  = 30;
+	t.nsec = 1;
+
+	g_assert_cmpint(0, ==, network_mysqld_type_set_time(type, &t));
+	g_assert_cmpint(-1, ==, network_mysqld_type_get_string_const(type, &const_s, &s_len)); /* it has no string backend, so it can't have a _const for us */
+
+
+	/* get a copy of the time, alloced */
+	s = NULL;
+	s_len = 0;
+	g_assert_cmpint(0, ==, network_mysqld_type_get_string(type, &s, &s_len));
+	g_assert_cmpint(23, ==, s_len);
+	g_assert_cmpstr("-120 19:27:30.000000001", ==, s);
+	g_free(s);
+
+	s = static_s;
+	s_len = sizeof(static_s);
+	g_assert_cmpint(0, ==, network_mysqld_type_get_string(type, &s, &s_len));
+	g_assert_cmpint(23, ==, s_len);
+	g_assert_cmpstr("-120 19:27:30.000000001", ==, s);
+
+	network_mysqld_type_free(type);
+}
+
+int main(int argc, char **argv) {
+	g_test_init(&argc, &argv, NULL);
+	g_test_bug_base("http://bugs.mysql.com/");
+
+	g_test_add_func("/mysql-proto/type/time", t_proto_type_time_to_string);
+	g_test_add_func("/mysql-proto/type/datetime", t_proto_type_datetime_to_string);
+	g_test_add_func("/mysql-proto/type/timestamp", t_proto_type_timestamp_to_string);
+	g_test_add_func("/mysql-proto/type/date", t_proto_type_date_to_string);
+
+	return g_test_run();
+}
+