bk commit into 5.0 tree (monty:1.1944)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1944 05/07/18 20:05:30 monty@stripped +3 -0
  Fixes to previous changeset
  get_defaults_file() -> get_defaults_options()

  libmysqld/libmysqld.def
    1.14 05/07/18 20:04:19 monty@stripped +1 -1
    get_defaults_file() -> get_defaults_options()

  libmysql/libmysql.def
    1.41 05/07/18 20:04:19 monty@stripped +1 -1
    get_defaults_file() -> get_defaults_options()

  include/my_sys.h
    1.162 05/07/18 20:04:19 monty@stripped +0 -1
    Remove deleted function

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	mishka.local
# Root:	/home/my/mysql-5.0

--- 1.161/include/my_sys.h	2005-07-18 18:36:10 +03:00
+++ 1.162/include/my_sys.h	2005-07-18 20:04:19 +03:00
@@ -553,7 +553,6 @@
 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,

--- 1.40/libmysql/libmysql.def	2005-07-12 11:31:36 +03:00
+++ 1.41/libmysql/libmysql.def	2005-07-18 20:04:19 +03:00
@@ -150,5 +150,5 @@
 	mysql_server_end
 	mysql_set_character_set
 	mysql_get_character_set_info
-	get_defaults_files
+	get_defaults_options
 	modify_defaults_file

--- 1.13/libmysqld/libmysqld.def	2005-06-09 01:43:09 +03:00
+++ 1.14/libmysqld/libmysqld.def	2005-07-18 20:04:19 +03:00
@@ -158,7 +158,7 @@
 	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