database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

merge

Browse Source 
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
This commit is contained in:
unknown
2001-10-08 05:36:35 +03:00
parent 41972bea92 cef1d75249
commit 515c747dcf
118 changed files with 1796 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/mysql.h
View File

@@ -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
}