diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-30 22:13:36 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-30 22:13:36 +0300 |
| commit | 85c54dddc7f6303b0e48f6d9fb9c0c7561292e4b (patch) | |
| tree | fa297f7fa59f84c3c05e83388795c51d18dd89a7 /client/mysql.cc | |
| parent | a59e381efabf9733a300ed3be322aefaede88d44 (diff) | |
| parent | 788c28aceb023702282bfbf372016da79f9ab49f (diff) | |
| download | mariadb-git-85c54dddc7f6303b0e48f6d9fb9c0c7561292e4b.tar.gz | |
Manual merge from mysql-5.1-bugteam.
Conflicts:
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/r/rpl_binlog_grant.result
- mysql-test/suite/rpl/r/rpl_sp.result
- mysql-test/suite/rpl/t/rpl_binlog_grant.test
- mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index a2f8044a978..6505676158c 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1632,7 +1632,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), init_tee(argument); break; case OPT_NOTEE: - printf("WARNING: option deprecated; use --disable-tee instead.\n"); + WARN_DEPRECATED(VER_CELOSIA, "--no-tee", "--disable-tee"); if (opt_outfile) end_tee(); break; |