Commit 55974b50 authored by unknown's avatar unknown
Browse files

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.


include/mysql.h:
  remove defines for obsolete 4.1 prepared statements C API names
libmysql/libmysql.c:
  Remove #ifdefed implementation of obsolete mysql_prepare call.
parent 04ff58d5

include/mysql.h

+0 −17
Original line number Diff line number Diff line
@@ -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,

libmysql/libmysql.c

+0 −16
Original line number Diff line number Diff line
@@ -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.