diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-12-01 00:48:36 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-12-01 00:48:36 +0200 |
| commit | 4f221e351df6c05fdeb95d0b328cf155204195cd (patch) | |
| tree | a23bff20c8087c048d600898926de60c8e9b0efe /sql | |
| parent | b22dc24cbb160d0bbe7e43fc67d22d6147740f6b (diff) | |
| parent | d5be7db312283260d3ca11de946ceb53c1ac4d84 (diff) | |
| download | mariadb-git-4f221e351df6c05fdeb95d0b328cf155204195cd.tar.gz | |
Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a60fee84d0b..e8132ae7f81 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3983,6 +3983,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; case 'h': strmake(mysql_real_data_home,argument, sizeof(mysql_real_data_home)-1); + /* Correct pointer set by my_getopt (for embedded library) */ + mysql_data_home= mysql_real_data_home; break; case 'L': strmake(language, argument, sizeof(language)-1); |