diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2001-06-04 18:34:04 -0400 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2001-06-04 18:34:04 -0400 |
| commit | bc0befda9cc4a26deac21cd59cfd96c8d3355edb (patch) | |
| tree | d1a1e436c5691d8f33e00c6966b99fe986110ece /libmysqld/lib_sql.cc | |
| parent | 020160f83f62d6171c57a4021e21e68049c2a4e8 (diff) | |
| download | mariadb-git-bc0befda9cc4a26deac21cd59cfd96c8d3355edb.tar.gz | |
Various changes to get libmysqld in sync with latest sources.
BitKeeper/etc/ignore:
Added libmysqld/uniques.cc
client/mysqltest.c:
Don't core dump if --socket isn't specified.
Add --test-file option, to facilitate running mysqltest under debugger.
libmysqld/Makefile.am:
We need uniques.cc
libmysqld/lib_sql.cc:
Tiny cleanup.
libmysqld/libmysqld.c:
Split mysql_real_query() into mysql_send_query() and
mysql_read_query_results().
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index b2889079ac8..ed04d85ee6e 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -50,8 +50,8 @@ void free_defaults_internal(char ** argv){if (argv) free_defaults(argv);} char mysql_data_home[FN_REFLEN]; char * get_mysql_data_home(){return mysql_data_home;}; #define mysql_data_home mysql_data_home_internal -#include "../sql/mysqld.cc" #include "lib_vio.c" +#include "../sql/mysqld.cc" #define SCRAMBLE_LENGTH 8 extern "C" { @@ -600,7 +600,7 @@ void embedded_srv_init(void) } //printf(ER(ER_READY),my_progname,server_version,""); - printf("%s initialized.\n", server_version); + //printf("%s initialized.\n", server_version); fflush(stdout); |