~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to scripts/mysql_install_db.sh

Committer: Brian Aker
Date: 2008-07-06 07:56:50 UTC
mfrom: (53.2.38 codestyle)
Revision ID: brian@tangent.org-20080706075650-17hslbw06ggz9zb0

Resolved merge from Monty

files removed:
sql/my_lock.c

files renamed:
mysys/mf_keycache.c => storage/myisam/mf_keycache.c

mysys/mf_keycaches.c => storage/myisam/mf_keycaches.c

files modified:
configure.ac

include/keycache.h

include/m_string.h

include/my_global.h

include/my_sys.h

mysys/Makefile.am

mysys/my_handler.c

scripts/Makefile.am

scripts/mysql_install_db.sh

sql/Makefile.am

sql/field.h

sql/handler.h

sql/item.cc

sql/item.h

sql/log.h

sql/probes.h

sql/rpl_utility.cc

sql/sql_bitmap.h

sql/sql_list.h

sql/sql_string.h

sql/table.h

storage/archive/archive_reader.c

storage/archive/azio.c

storage/archive/azio.h

storage/archive/ha_archive.cc

storage/archive/ha_archive.h

storage/myisam/Makefile.am

storage/myisam/mi_dbug.c

storage/myisam/myisamdef.h

strings/bmove512.c

strings/longlong2str.c

strings/strtoll.c

strings/strtoull.c

Show diffs side-by-side

added added

removed removed

scripts/mysql_install_db.sh

342

343

# Create the system and help tables by passing them to "mysqld --bootstrap"

344

s_echo "Installing MySQL system tables..."

345

if { echo "use mysql;"; cat $create_system_tables } | eval "$filter_cmd_line" | $mysqld_install_cmd_line > /dev/null

345

if { echo "use mysql;"; cat $create_system_tables; } | eval "$filter_cmd_line" | $mysqld_install_cmd_line > /dev/null

346

then

347

s_echo "OK"

348

else

Older »