diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
commit | 4933d21e5d93840ddcf41bf25ed92fbe253ae92d (patch) | |
tree | a4d892b86aa46927978f82976fff61f1e5193383 /mysql-test/r/mysqld--help,win.rdiff | |
parent | 97ee59d27d3daca806fdb3577df5a0e0a45a0a30 (diff) | |
parent | 7009bf411a8cb9a6e035b761b5e6352b4f474303 (diff) | |
download | mariadb-git-4933d21e5d93840ddcf41bf25ed92fbe253ae92d.tar.gz |
merge with mysql-5.5.21
Diffstat (limited to 'mysql-test/r/mysqld--help,win.rdiff')
-rw-r--r-- | mysql-test/r/mysqld--help,win.rdiff | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff index 676393720a7..957292b265f 100644 --- a/mysql-test/r/mysqld--help,win.rdiff +++ b/mysql-test/r/mysqld--help,win.rdiff @@ -42,9 +42,9 @@ --stack-trace Print a symbolic stack trace on failure (Defaults to on; use --skip-stack-trace to disable.) + --standalone Dummy option to start as a standalone program (NT). - -s, --symbolic-links - Enable symbolic link support. - --sync-binlog=# Synchronously flush binary log to disk after every #th + --stored-program-cache=# + The soft upper limit for number of cached stored routines + for one connection. @@ -807,8 +815,8 @@ size, MySQL will automatically convert it to an on-disk MyISAM or Aria table |