diff options
| author | unknown <serg@serg.mylan> | 2004-07-20 15:34:57 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-07-20 15:34:57 +0200 |
| commit | 4118ce3fb5dda66250e89a191cc185f9d4582a4f (patch) | |
| tree | 25cbffcf973dd7f352a4bcdc885aa172cb20a57a /libmysql | |
| parent | 58f4db90db784e8b827d3cb7e9f125cd01be8527 (diff) | |
| parent | 6979cda63a94c73d7571dad0d9ef040f2f4e54ac (diff) | |
| download | mariadb-git-4118ce3fb5dda66250e89a191cc185f9d4582a4f.tar.gz | |
manual merge
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
include/my_global.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.def | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index bbd5af6558d..38ac9505e4b 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -129,6 +129,18 @@ EXPORTS mysql_stmt_prepare mysql_stmt_init mysql_stmt_insert_id - mysql_stmt_attr_get - mysql_stmt_attr_set + mysql_stmt_attr_get + mysql_stmt_attr_set mysql_stmt_field_count + client_errors + mysql_set_local_infile_default + mysql_set_local_infile_handler + mysql_disable_reads_from_master + mysql_disable_rpl_parse + mysql_enable_reads_from_master + mysql_enable_rpl_parse + mysql_master_query + mysql_rpl_parse_enabled + mysql_rpl_probe + mysql_rpl_query_type + mysql_slave_query |