diff options
author | unknown <miguel@hegel.local> | 2004-03-16 15:55:51 -0300 |
---|---|---|
committer | unknown <miguel@hegel.local> | 2004-03-16 15:55:51 -0300 |
commit | 80057de54e6b814d9badf821eef0aa5334bba031 (patch) | |
tree | 2991d948922c99c192f849d89e87b0178da5ccee /libmysql | |
parent | 9e1fdaf44458041f5ce145b2281c52953350f5ff (diff) | |
parent | f21ef18ff127561dcd411f9992b3f7344863b519 (diff) | |
download | mariadb-git-80057de54e6b814d9badf821eef0aa5334bba031.tar.gz |
Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
sql/log_event.cc:
Auto merged
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.def | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 470d4410c96..00d0fca119e 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -33,8 +33,8 @@ EXPORTS myodbc_remove_escape mysql_affected_rows mysql_autocommit - mysql_bind_param - mysql_bind_result + mysql_stmt_bind_param + mysql_stmt_bind_result mysql_change_user mysql_character_set_name mysql_close @@ -46,9 +46,9 @@ EXPORTS mysql_errno mysql_error mysql_escape_string - mysql_execute - mysql_fetch - mysql_fetch_column + mysql_stmt_execute + mysql_stmt_fetch + mysql_stmt_fetch_column mysql_fetch_field mysql_fetch_field_direct mysql_fetch_fields @@ -78,11 +78,11 @@ EXPORTS mysql_num_rows mysql_odbc_escape_string mysql_options - mysql_param_count - mysql_param_result + mysql_stmt_param_count + mysql_stmt_param_metadata mysql_ping mysql_prepare - mysql_get_metadata + mysql_stmt_result_metadata mysql_query mysql_read_query_result mysql_real_connect @@ -93,7 +93,7 @@ EXPORTS mysql_row_seek mysql_row_tell mysql_select_db - mysql_send_long_data + mysql_stmt_send_long_data mysql_send_query mysql_shutdown mysql_ssl_set |