diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-17 15:40:03 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-17 15:40:03 +0300 |
| commit | 3324d0a7ffb4c1d7ec2335c3e423bcbfaa963bce (patch) | |
| tree | 223c241e869976a0e08b0b04c79b6e43d262ab79 /libmysql | |
| parent | b69a91cc3c7e77664e0476d52860bc1b0fcb87d9 (diff) | |
| download | mariadb-git-3324d0a7ffb4c1d7ec2335c3e423bcbfaa963bce.tar.gz | |
Fixed bug with SELECT * ... UNION
client/mysql.cc:
Increased version number
client/mysqltest.c:
Changed to use default path
include/mysql.h:
Changed prototype of mysql_server_init
libmysql/libmysql.c:
Changed prototype of mysql_server_init
libmysqld/lib_sql.cc:
Changed prototype of mysql_server_init
mysql-test/r/union.result:
Added test for UNION bug
mysql-test/t/union.test:
Added test for UNION bug
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index cb2407efdd0..eb0e2f1820a 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -92,10 +92,12 @@ static ulong mysql_sub_escape_string(CHARSET_INFO *charset_info, char *to, const char *from, ulong length); void mysql_server_init(int argc __attribute__((unused)), - char **argv __attribute__((unused)), - const char **groups __attribute__((unused))) {} + const char **argv __attribute__((unused)), + const char **groups __attribute__((unused))) +{} -void mysql_server_end() {} +void mysql_server_end() +{} my_bool mysql_thread_init() { |