diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-18 17:03:43 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-18 17:03:43 +0200 |
| commit | 0fae0335d46c5f1757b59926be60a41eb0224837 (patch) | |
| tree | 600e29476bf817514a5b303b3f4f5988d964bf38 /scripts/mysql_install_db.pl.in | |
| parent | ce675406ca8dbc1532a908803a1371de8432d466 (diff) | |
| download | mariadb-git-0fae0335d46c5f1757b59926be60a41eb0224837.tar.gz | |
Ensure that all clients reads the appropriate 'client', client-mariadb and 'mariadb' sections from my.cnf
The mysqld server and all clients now reads the new client-server section
Fixed that mysqldumpslow supports new slow log formats and new mysqld --slow- options
client/mysql.cc:
Read also client-server and client-mariadb sections.
client/mysql_upgrade.c:
Read also client-server and client-mariadb sections.
client/mysqladmin.cc:
Read also client-server and client-mariadb sections.
client/mysqlbinlog.cc:
Read also client-server and client-mariadb sections.
client/mysqlcheck.c:
Read also client-server and client-mariadb sections.
client/mysqldump.c:
Read also client-server and client-mariadb sections.
client/mysqlimport.c:
Read also client-server and client-mariadb sections.
client/mysqlshow.c:
Read also client-server and client-mariadb sections.
client/mysqltest.cc:
Read also client-server and client-mariadb sections.
extra/my_print_defaults.c:
Updated help text
scripts/mysql_fix_privilege_tables.sh:
Read also sections client client-server client-mariadb
scripts/mysql_install_db.pl.in:
Also allow --data=* option
Read also groups mariadb, server and client-server.
scripts/mysql_install_db.sh:
Also allow --data=* option
Read also groups mariadb, server and client-server.
Added --lose-skip-pbxt to bootstrap
scripts/mysql_secure_installation.sh:
Read also groups client-server and client-mariadb
scripts/mysqld_multi.sh:
Read also group mariadb
scripts/mysqld_safe.sh:
Read also groups mariadb server and client-server
scripts/mysqldumpslow.sh:
Fixed to support new slow log formats
Added sorting on -ae (aggregated number of retreived rows) and e (retrieved rows)
Read also group 'mariadb'
If there is many instances of same option, use last one.
Get slow log file from options log-slow-queries=filename or query-log-file=filename
Added support for future --log-basename option
sql-common/client.c:
Read also groups 'client-server' and 'client-mariadb'
tests/mysql_client_test.c:
Read also groups 'client-server' and 'client-mariadb'
tests/thread_test.c:
Read also groups 'client-server' and 'client-mariadb'
Diffstat (limited to 'scripts/mysql_install_db.pl.in')
| -rw-r--r-- | scripts/mysql_install_db.pl.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index 18bd713c041..606ff8c1978 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -116,7 +116,7 @@ sub parse_arguments "basedir=s", "builddir=s", # FIXME not documented "srcdir=s", - "ldata|datadir=s", + "ldata|datadir|data=s", # Note that the user will be passed to mysqld so that it runs # as 'user' (crucial e.g. if log-bin=/some_other_path/ @@ -274,7 +274,7 @@ else my @default_options; my $cmd = quote_options($print_defaults,$opt->{'defaults-file'}, - "mysqld","mysql_install_db"); + "mysqld","mariadb","mysql_install_db","server","client-server"); open(PIPE, "$cmd |") or error($opt,"can't run $cmd: $!"); while ( <PIPE> ) { |