diff options
| author | monty@mysql.com <> | 2004-05-19 16:38:12 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-19 16:38:12 +0300 |
| commit | 86a966256be6818d20d138c1e687e1f195ddaf74 (patch) | |
| tree | 8d62bd5b112fa2148c1631a51cc9fa272dcf5d16 /libmysqld | |
| parent | fdc0f0e781051150ac187a92df1ff8f9ae3286c7 (diff) | |
| download | mariadb-git-86a966256be6818d20d138c1e687e1f195ddaf74.tar.gz | |
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 8 | ||||
| -rw-r--r-- | libmysqld/libmysqld.def | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 2c54603ea7a..4a96cb64ce4 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -385,11 +385,6 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) if (gethostname(glob_hostname,sizeof(glob_hostname)-4) < 0) strmov(glob_hostname,"mysql"); -#ifndef DBUG_OFF - strxmov(strend(server_version),MYSQL_SERVER_SUFFIX,"-debug",NullS); -#else - strmov(strend(server_version),MYSQL_SERVER_SUFFIX); -#endif load_defaults("my", (const char **) groups, argcp, argvp); defaults_argv=*argvp; @@ -406,9 +401,8 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) set_options(); get_options(*argcp, *argvp); + set_server_version(); - if (opt_log || opt_update_log || opt_slow_log || opt_bin_log) - strcat(server_version,"-log"); DBUG_PRINT("info",("%s Ver %s for %s on %s\n",my_progname, server_version, SYSTEM_TYPE,MACHINE_TYPE)); diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index c6615ee971c..1c9bdea0a01 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -63,3 +63,6 @@ EXPORTS mysql_refresh mysql_odbc_escape_string myodbc_remove_escape + net_buffer_length + max_allowed_packet + get_tty_password |