diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-12-16 16:49:19 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-12-16 16:49:19 -0800 |
| commit | 7760efad74140680b1eefaf2172b0fa26f7b1146 (patch) | |
| tree | 57742baa180206a1cd3ea35d38c58108accd22a9 /include/mysql.h.pp | |
| parent | 40bbf697aad7d923fc1bd995bc5f547e45461cbe (diff) | |
| parent | b8b875cb796743240bed71857eae73d37f03c28f (diff) | |
| download | mariadb-git-7760efad74140680b1eefaf2172b0fa26f7b1146.tar.gz | |
Merge mariadb-5.5 -> 10.0-base.
Diffstat (limited to 'include/mysql.h.pp')
| -rw-r--r-- | include/mysql.h.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index ce577146581..48ce79046ff 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -729,3 +729,4 @@ int mysql_close_start(MYSQL *sock); int mysql_close_cont(MYSQL *sock, int status); my_socket mysql_get_socket(const MYSQL *mysql); unsigned int mysql_get_timeout_value(const MYSQL *mysql); +unsigned int mysql_get_timeout_value_ms(const MYSQL *mysql); |