diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
| commit | 28c89b7151bc3ebd7a3459e85f4c9b5e73529629 (patch) | |
| tree | ce50324e5d1054f59a7178bfdb426189998baf52 /mysql-test/main/mysqld--help.result | |
| parent | 745fd4b39f8aff6300682502ed2ddf61ee343866 (diff) | |
| parent | 8fa759a5762733d9f8a4050437fadcd255ecd1a2 (diff) | |
| download | mariadb-git-28c89b7151bc3ebd7a3459e85f4c9b5e73529629.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
| -rw-r--r-- | mysql-test/main/mysqld--help.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index c55f535cd35..c173f435964 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1109,7 +1109,7 @@ The following specify which files/extra groups are read (specified before remain disable; STATE to track just transaction state (Is there an active transaction? Does it have any data? etc.); CHARACTERISTICS to track transaction state and report all - statements needed to start a transaction withthe same + statements needed to start a transaction with the same characteristics (isolation level, read only/read write,snapshot - but not any work done / data modified within the transaction). @@ -1785,5 +1785,5 @@ userstat FALSE verbose TRUE wait-timeout 28800 -To see what values a running MySQL server is using, type +To see what variables a running MySQL server is using, type 'mysqladmin variables' instead of 'mysqld --verbose --help'. |