summaryrefslogtreecommitdiff
path: root/mysql-test/install_test_db.sh
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-08-20 11:20:47 -0600
committerunknown <sasha@mysql.sashanet.com>2001-08-20 11:20:47 -0600
commit9326aa42acbf5227b61a626a54e7f7fce2808c3c (patch)
tree26248881fcfc641e4a5f86cbf8845b3f8d8947ea /mysql-test/install_test_db.sh
parente704dd7202e2295ccea47260f5136444dfbe84de (diff)
downloadmariadb-git-9326aa42acbf5227b61a626a54e7f7fce2808c3c.tar.gz
fixes in mysqltest and mysqlbinlog
trying to understand why --bootstrap option does not create tables on disk, hope the problem will be fixed when I pull, if not will debug, but need to commit in order to pull client/mysqltest.c: added safe_connect() and chaned all calls to mysql_real_connect() to safe_connect() mysql-test/install_test_db.sh: more diagnostic sql/log_event.cc: fixed compile error in mysqlbinlog
Diffstat (limited to 'mysql-test/install_test_db.sh')
-rw-r--r--mysql-test/install_test_db.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh
index 34df311e683..c661d94035c 100644
--- a/mysql-test/install_test_db.sh
+++ b/mysql-test/install_test_db.sh
@@ -190,8 +190,11 @@ then
c_c="$c_c comment='Column privileges';"
fi
-if $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \
- --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb --skip-gemini $EXTRA_ARG << END_OF_DATA
+mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \
+ --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb --skip-gemini $EXTRA_ARG"
+echo "running $mysqld_boot"
+
+if $mysqld_boot << END_OF_DATA
use mysql;
$c_d
$i_d
@@ -211,5 +214,6 @@ END_OF_DATA
then
exit 0
else
+ echo "Error executing mysqld --boostrap"
exit 1
fi