summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-06-04 23:17:45 +0300
committerunknown <monty@narttu.mysql.fi>2003-06-04 23:17:45 +0300
commitc98248649d723835660ea5703e7058ce1a6202f3 (patch)
tree46e23cd2170be042ecb871f07ed5a09b011d2d09 /sql
parentfb339587a53a1b7cd9385e24c36e82eb278c51d8 (diff)
parentb5860aed7b1d11f2d3ac909cde1438c86af26cb5 (diff)
downloadmariadb-git-c98248649d723835660ea5703e7058ce1a6202f3.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 1492d6ddb68..7289d0e72cf 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1923,7 +1923,7 @@ extern "C" pthread_handler_decl(handle_shutdown,arg)
#endif
-const char *load_default_groups[]= { "mysqld","server",0 };
+const char *load_default_groups[]= { "mysqld","server",MYSQL_BASE_VERSION,0 };
bool open_log(MYSQL_LOG *log, const char *hostname,
const char *opt_name, const char *extension,