summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@mishka.local>2005-07-18 20:05:30 +0300
committerunknown <monty@mishka.local>2005-07-18 20:05:30 +0300
commitf29f6ce18e0b417fff7349d4ddda3c3b7777976b (patch)
tree7f9dfacc8dc495f3b7df824b1d55f507b98d4bbb
parent5b6c1348c737ddf705800c3f734c25349d0ca841 (diff)
downloadmariadb-git-f29f6ce18e0b417fff7349d4ddda3c3b7777976b.tar.gz
Fixes to previous changeset
get_defaults_file() -> get_defaults_options() include/my_sys.h: Remove deleted function libmysql/libmysql.def: get_defaults_file() -> get_defaults_options() libmysqld/libmysqld.def: get_defaults_file() -> get_defaults_options()
-rw-r--r--include/my_sys.h1
-rw-r--r--libmysql/libmysql.def2
-rw-r--r--libmysqld/libmysqld.def2
3 files changed, 2 insertions, 3 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 4c385e9d1b3..6747733da9c 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -553,7 +553,6 @@ extern gptr my_once_alloc(uint Size,myf MyFlags);
extern void my_once_free(void);
extern char *my_once_strdup(const char *src,myf myflags);
extern char *my_once_memdup(const char *src, uint len, myf myflags);
-extern my_string my_tempnam(const char *dir,const char *pfx,myf MyFlags);
extern File my_open(const char *FileName,int Flags,myf MyFlags);
extern File my_register_filename(File fd, const char *FileName,
enum file_type type_of_file,
diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def
index 0688ea5732b..a469c67c466 100644
--- a/libmysql/libmysql.def
+++ b/libmysql/libmysql.def
@@ -150,5 +150,5 @@ EXPORTS
mysql_server_end
mysql_set_character_set
mysql_get_character_set_info
- get_defaults_files
+ get_defaults_options
modify_defaults_file
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
index dcb14e95d36..93456901a7d 100644
--- a/libmysqld/libmysqld.def
+++ b/libmysqld/libmysqld.def
@@ -158,7 +158,7 @@ EXPORTS
mysql_stmt_attr_get
mysql_stmt_attr_set
mysql_stmt_field_count
- get_defaults_files
+ get_defaults_options
my_charset_bin
my_charset_same
modify_defaults_file