diff options
| author | unknown <monty@mishka.local> | 2004-10-20 02:55:03 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-10-20 02:55:03 +0300 |
| commit | 2da1cbd97dd566d629115f02321ab36aac069ce4 (patch) | |
| tree | 40c316b93bfec146a18945a7cd7813bcc5a5a179 /sql/ha_innodb.cc | |
| parent | ca1a24e0ad171272d2bcddcac737694af6c251a3 (diff) | |
| parent | 4736d0fe9963742e2788960d60da7f0f2dd593e9 (diff) | |
| download | mariadb-git-2da1cbd97dd566d629115f02321ab36aac069ce4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
client/mysqlimport.c:
Auto merged
libmysql/libmysql.c:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 35a51837449..133ea3c9c7c 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -878,7 +878,7 @@ innobase_init(void) Note that when using the embedded server, the datadirectory is not necessarily the current directory of this program. */ - if (mysql_embedded) { + if (mysqld_embedded) { default_path = mysql_real_data_home; fil_path_to_mysql_datadir = mysql_real_data_home; } else { @@ -1016,7 +1016,7 @@ innobase_init(void) srv_max_n_open_files = (ulint) innobase_open_files; srv_innodb_status = (ibool) innobase_create_status_file; - srv_print_verbose_log = mysql_embedded ? 0 : 1; + srv_print_verbose_log = mysqld_embedded ? 0 : 1; /* Store the default charset-collation number of this MySQL installation */ |