diff options
| author | konstantin@mysql.com <> | 2004-11-01 19:01:50 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2004-11-01 19:01:50 +0300 |
| commit | 96829a4639dec81803fa32c7e98d9641b81cea25 (patch) | |
| tree | 7dc4010003d21b5adf89e57921bf84d39b230ab4 | |
| parent | ff7e440bb04280a19ece143c27eed793c3f57755 (diff) | |
| download | mariadb-git-96829a4639dec81803fa32c7e98d9641b81cea25.tar.gz | |
Remove support for obsolete 4.1.1 prepared statements C API names:
having approval for it since 4.1.4, I also have some assurance that
very few people actually used this: to enable these calls a user
had to #define HAVE_DEPRECATED_411_API and recompile the client library.
| -rw-r--r-- | include/mysql.h | 17 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 16 |
2 files changed, 0 insertions, 33 deletions
diff --git a/include/mysql.h b/include/mysql.h index 1c886020fdb..156d749234b 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -642,23 +642,6 @@ typedef struct st_mysql_methods #endif } MYSQL_METHODS; -#ifdef HAVE_DEPRECATED_411_API -/* Deprecated calls (since MySQL 4.1.2) */ - -/* Use mysql_stmt_init + mysql_stmt_prepare instead */ -MYSQL_STMT * STDCALL mysql_prepare(MYSQL * mysql, const char *query, - unsigned long length); -#define mysql_execute mysql_stmt_execute -#define mysql_fetch mysql_stmt_fetch -#define mysql_fetch_column mysql_stmt_fetch_column -#define mysql_bind_param mysql_stmt_bind_param -#define mysql_bind_result mysql_stmt_bind_result -#define mysql_param_count mysql_stmt_param_count -#define mysql_param_result mysql_stmt_param_metadata -#define mysql_get_metadata mysql_stmt_result_metadata -#define mysql_send_long_data mysql_stmt_send_long_data - -#endif /* HAVE_DEPRECATED_411_API */ MYSQL_STMT * STDCALL mysql_stmt_init(MYSQL *mysql); int STDCALL mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 9195f0a5bc5..88f46ce19e7 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1886,22 +1886,6 @@ my_bool cli_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt) DBUG_RETURN(0); } -#ifdef HAVE_DEPRECATED_411_API -MYSQL_STMT * STDCALL mysql_prepare(MYSQL *mysql, const char *query, - unsigned long query_length) -{ - MYSQL_STMT *stmt; - DBUG_ENTER("mysql_prepare"); - - stmt= mysql_stmt_init(mysql); - if (stmt && mysql_stmt_prepare(stmt, query, query_length)) - { - mysql_stmt_close(stmt); - DBUG_RETURN(0); - } - DBUG_RETURN(stmt); -} -#endif /* Allocate memory and init prepared statement structure. |