diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-25 11:15:45 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-25 11:15:45 -0400 |
| commit | f533b2b462b5b73630245172b627506d36f95b39 (patch) | |
| tree | fb2c50f1b28879b4c6ed9289752044c76390a141 /sql | |
| parent | c6a0cbdac6dbb7134164732bf7a6096d82e1f0a1 (diff) | |
| parent | 472d66320d8538f2d1850bb50caceed18181024a (diff) | |
| download | mariadb-git-f533b2b462b5b73630245172b627506d36f95b39.tar.gz | |
Merge branch '5.5-galera' into 10.0-galera
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 4d22e1d01de..fab1477a87b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -9676,10 +9676,10 @@ static int get_options(int *argc_ptr, char ***argv_ptr) } if (global_system_variables.wsrep_causal_reads) { - WSREP_WARN("option --wsrep-casual-reads is deprecated"); + WSREP_WARN("option --wsrep-causal-reads is deprecated"); if (!(global_system_variables.wsrep_sync_wait & WSREP_SYNC_WAIT_BEFORE_READ)) { - WSREP_WARN("--wsrep-casual-reads=ON takes precedence over --wsrep-sync-wait=%u. " + WSREP_WARN("--wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=%u. " "WSREP_SYNC_WAIT_BEFORE_READ is on", global_system_variables.wsrep_sync_wait); global_system_variables.wsrep_sync_wait |= WSREP_SYNC_WAIT_BEFORE_READ; |