summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-17 15:40:03 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-17 15:40:03 +0300
commit3324d0a7ffb4c1d7ec2335c3e423bcbfaa963bce (patch)
tree223c241e869976a0e08b0b04c79b6e43d262ab79 /include
parentb69a91cc3c7e77664e0476d52860bc1b0fcb87d9 (diff)
downloadmariadb-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 'include')
-rw-r--r--include/mysql.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h
index 7db907fb0f3..3431dc61945 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -224,7 +224,7 @@ typedef struct st_mysql_res {
/* 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. */
-void mysql_server_init(int argc, char **argv, const char **groups);
+void mysql_server_init(int argc, const char **argv, const char **groups);
void mysql_server_end();
/* Set up and bring down a thread; these function should be called