diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-30 21:47:11 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-30 21:47:11 +0300 |
| commit | a59e381efabf9733a300ed3be322aefaede88d44 (patch) | |
| tree | 5bb7d787b7b4c25140afb74590153f8109510d61 /mysql-test/suite/rpl/t/rpl_user.test | |
| parent | 60c9bda26073afa5ad1bbbf1e17d64d2f0691e69 (diff) | |
| parent | 8a66b424f3a3be667f4548f618377c2bd9b825ac (diff) | |
| download | mariadb-git-a59e381efabf9733a300ed3be322aefaede88d44.tar.gz | |
Manual merge from mysql-5.1-bugteam.
Conflicts:
- sql/mysql_priv.h
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_user.test')
0 files changed, 0 insertions, 0 deletions