- renamed scripts/fill_func_tables.sh to scripts/fill_help_tables and
updated all relevant files to honor this change (as discussed with vva) - added some more comments to the fill_help_tables script - minor cleanups scripts/Makefile.am: - renamed fill_funct_tables -> fill_help_tables to clarify purpose of this script (after discussing this with vva) - make sure "make clean" removes both the output and the script - fixed tabbing scripts/fill_help_tables.sh: - reflect name change, add some more info about the function of this script scripts/mysql_install_db.sh: - renamed fill_func_tables.sql -> fill_help_tables.sql (this does not yet resolve the problem that mysql_install_db does not find this file in the binary distribution)
This commit is contained in:
parent
a598cfbfc3
commit
a46ca55c31
@ -53,12 +53,12 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \
|
|||||||
mysqld_multi.sh \
|
mysqld_multi.sh \
|
||||||
mysql_tableinfo.sh \
|
mysql_tableinfo.sh \
|
||||||
mysqld_safe.sh \
|
mysqld_safe.sh \
|
||||||
fill_func_tables.sh
|
fill_help_tables.sh
|
||||||
|
|
||||||
EXTRA_DIST = $(EXTRA_SCRIPTS) \
|
EXTRA_DIST = $(EXTRA_SCRIPTS) \
|
||||||
mysqlaccess.conf \
|
mysqlaccess.conf \
|
||||||
mysqlbug \
|
mysqlbug \
|
||||||
fill_func_tables.sql
|
fill_help_tables.sql
|
||||||
|
|
||||||
pkgdata_DATA = make_binary_distribution
|
pkgdata_DATA = make_binary_distribution
|
||||||
|
|
||||||
@ -79,7 +79,8 @@ CLEANFILES = @server_scripts@ \
|
|||||||
mysqlhotcopy \
|
mysqlhotcopy \
|
||||||
mysqldumpslow \
|
mysqldumpslow \
|
||||||
mysqld_multi \
|
mysqld_multi \
|
||||||
fill_func_tables.sql
|
fill_help_tables \
|
||||||
|
fill_help_tables.sql
|
||||||
|
|
||||||
SUPERCLEANFILES = mysqlbug
|
SUPERCLEANFILES = mysqlbug
|
||||||
|
|
||||||
@ -134,7 +135,7 @@ SUFFIXES = .sh
|
|||||||
# Don't update the files from bitkeeper
|
# Don't update the files from bitkeeper
|
||||||
%::SCCS/s.%
|
%::SCCS/s.%
|
||||||
|
|
||||||
all: fill_func_tables.sql
|
all: fill_help_tables.sql
|
||||||
|
|
||||||
fill_func_tables.sql: fill_func_tables ../Docs/manual.texi
|
fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
|
||||||
./fill_func_tables < ../Docs/manual.texi > fill_func_tables.sql
|
./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
|
||||||
|
@ -1,7 +1,19 @@
|
|||||||
#!@PERL@
|
#!@PERL@
|
||||||
# fill_func_tables - parse ../Docs/manual.texi
|
#
|
||||||
|
# Usage: fill_help_tables <manual.texi>
|
||||||
# Original version by vva
|
# Example: ./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
|
||||||
|
#
|
||||||
|
# This script generates the SQL statements required by mysql_install_db to
|
||||||
|
# fill up the tables for the server-side online function help, which can be
|
||||||
|
# invoked with "help <function>" from the MySQL client.
|
||||||
|
#
|
||||||
|
# Please note, that you first need to update Docs/manual.texi with the
|
||||||
|
# manual file from the separate "mysqldoc" BitKeeper-Tree! The manual.texi
|
||||||
|
# included in the source tree is just an empty stub file - the full manual
|
||||||
|
# is now maintained in a separate tree.
|
||||||
|
#
|
||||||
|
# Original version by Victor Vagin <vva@mysql.com>
|
||||||
|
#
|
||||||
|
|
||||||
my $cat_name= "";
|
my $cat_name= "";
|
||||||
my $func_name= "";
|
my $func_name= "";
|
@ -325,7 +325,7 @@ $i_f
|
|||||||
$c_t
|
$c_t
|
||||||
$c_c
|
$c_c
|
||||||
END_OF_DATA
|
END_OF_DATA
|
||||||
cat fill_func_tables.sql
|
cat fill_help_tables.sql
|
||||||
) | eval "$execdir/mysqld $defaults --bootstrap --skip-grant-tables \
|
) | eval "$execdir/mysqld $defaults --bootstrap --skip-grant-tables \
|
||||||
--basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb $args"
|
--basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb $args"
|
||||||
then
|
then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user