diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /include/sql_common.h | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
Diffstat (limited to 'include/sql_common.h')
| -rw-r--r-- | include/sql_common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sql_common.h b/include/sql_common.h index 406a87010fb..5a033fbe522 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -21,6 +21,7 @@ extern "C" { #endif #include <mysql.h> +#include <hash.h> extern const char *unknown_sqlstate; extern const char *cant_connect_sqlstate; @@ -34,6 +35,7 @@ struct st_mysql_options_extention { char *default_auth; char *ssl_crl; /* PEM CRL file */ char *ssl_crlpath; /* PEM directory of CRL-s? */ + char *server_public_key_path; void (*report_progress)(const MYSQL *mysql, unsigned int stage, unsigned int max_stage, |