diff options
| author | unknown <monty@mysql.com> | 2004-05-12 02:38:57 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-12 02:38:57 +0300 |
| commit | 47890151b47af55431a808e59af738a35d1a0bb7 (patch) | |
| tree | 02e8baaa5fa67d84f1517dd0fe43ee84dd6ef34f /scripts/mysql_install_db.sh | |
| parent | cd8f9ed2a294a80eb41f026eaab176e51209aa4c (diff) | |
| download | mariadb-git-47890151b47af55431a808e59af738a35d1a0bb7.tar.gz | |
Portability fixes
scripts/mysql_install_db.sh:
Portability fix (! is not portable)
sql/item_func.cc:
Use my_strtoll10() instead of strtoull()
sql/repl_failsafe.cc:
Use my_strtoll10() instead of strtoull()
sql/sql_analyse.cc:
Use my_strtoll10() instead of strtoull()
sql/sql_yacc.yy:
Use my_strtoll10() instead of strtoull()
strings/my_strtoll10.c:
Fix compiler warnings
Diffstat (limited to 'scripts/mysql_install_db.sh')
| -rw-r--r-- | scripts/mysql_install_db.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 61d173aac05..abde6ecbe73 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -10,6 +10,8 @@ in_rpm=0 windows=0 defaults="" +tmp_file=/tmp/mysql_install_db.$$ + case "$1" in --no-defaults|--defaults-file=*|--defaults-extra-file=*) defaults="$1"; shift @@ -212,9 +214,11 @@ then then echo "Fill help tables" fi - if ! (echo "use mysql; - " - cat $fill_help_tables) | eval "$mysqld_install_cmd_line" + echo "use mysql;" > $tmp_file + cat $tmp_file $fill_help_tables | eval "$mysqld_install_cmd_line" + res=$? + rm $tmp_file + if test $res != 0 then echo "" echo "WARNING: HELP FILES ARE NOT COMPLETELY INSTALLED!" |