merge

BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/count_distinct2.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
libmysqld/Makefile.am:
  Added back md5.c

1 files changed, 5 insertions, 3 deletions

diff --git a/include/mysql.h b/include/mysql.h
index 09c49592270..439354c5d98 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -71,6 +71,8 @@ extern char *mysql_unix_port;
 typedef struct st_mysql_field {
   char *name;			/* Name of column */
   char *table;			/* Table of column if column was a field */
+  char *org_table;		/* Org table name if table was an alias */
+  char *db;			/* Database for table */
   char *def;			/* Default value (set by mysql_list_fields) */
   unsigned long length;		/* Width of column */
   unsigned long max_length;	/* Max width of selected set */
@@ -251,7 +253,7 @@ typedef struct st_mysql_manager
 /* Set up and bring down the server; to ensure that applications will
  * work when linked against either the standard client library or the
  * embedded server library, these functions should be called. */
-int mysql_server_init(int argc, const char **argv, const char **groups);
+int mysql_server_init(int argc, char **argv, char **groups);
 void mysql_server_end(void);
 
 /* Set up and bring down a thread; these function should be called
@@ -421,8 +423,8 @@ int		STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
 */
 
 int simple_command(MYSQL *mysql,enum enum_server_command command,
-		   const char *arg, ulong length, my_bool skipp_check);
-ulong net_safe_read(MYSQL* mysql);
+		   const char *arg, unsigned long length, my_bool skipp_check);
+unsigned long net_safe_read(MYSQL* mysql);
 
 #ifdef	__cplusplus
 }