diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-08-30 11:36:24 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-08-30 11:36:24 +0200 |
| commit | ae325ec6ce3998b3dd38fc2ad7763857cd4c140f (patch) | |
| tree | 957911b8185c51f0ad2caf43f2124552bca6db9f /sql/mysql_install_db.cc | |
| parent | d99b8004e6b46e2a1b321bf50825254bf841cddb (diff) | |
| download | mariadb-git-ae325ec6ce3998b3dd38fc2ad7763857cd4c140f.tar.gz | |
Compile 10.0 on Windows
Diffstat (limited to 'sql/mysql_install_db.cc')
| -rw-r--r-- | sql/mysql_install_db.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc index bde81d915b2..4dc63d8a28d 100644 --- a/sql/mysql_install_db.cc +++ b/sql/mysql_install_db.cc @@ -37,7 +37,7 @@ "Usage: mysql_install_db.exe [OPTIONS]\n" \ "OPTIONS:" -extern "C" const char mysql_bootstrap_sql[]; +extern "C" const char* mysql_bootstrap_sql[]; char default_os_user[]= "NT AUTHORITY\\NetworkService"; static int create_db_instance(); @@ -247,7 +247,7 @@ static char *init_bootstrap_command_line(char *cmdline, size_t size) "\"\"%s\" --no-defaults --bootstrap" " \"--language=%s\\share\\english\"" " --basedir=. --datadir=. --default-storage-engine=myisam" - " --max_allowed_packet=9M --loose-skip-innodb --loose-skip-pbxt" + " --max_allowed_packet=9M " " --net-buffer-length=16k\"", mysqld_path, basedir); return cmdline; } @@ -565,12 +565,16 @@ static int create_db_instance() goto end; } - /* Write the bootstrap script to stdin. */ - if (fwrite(mysql_bootstrap_sql, strlen(mysql_bootstrap_sql), 1, in) != 1) + int i; + for (i=0; mysql_bootstrap_sql[i]; i++) { - verbose("ERROR: Cannot write to mysqld's stdin"); - ret= 1; - goto end; + /* Write the bootstrap script to stdin. */ + if (fwrite(mysql_bootstrap_sql, strlen(mysql_bootstrap_sql[i]), 1, in) != 1) + { + verbose("ERROR: Cannot write to mysqld's stdin"); + ret= 1; + goto end; + } } /* Remove default user, if requested. */ |