diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-09-28 11:07:31 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-09-28 11:07:31 +0200 |
| commit | 1d9c5686c3143c088770e36ca1744d59efd69421 (patch) | |
| tree | 35a84a630756ee8c46729401b8fbf9ebcaa5b3b3 /client | |
| parent | 031ee861a99d74ef40e74202b2a4b107608c75ef (diff) | |
| parent | 793e369bfe19abe0912dbe3f21a4c70da1d09668 (diff) | |
| download | mariadb-git-1d9c5686c3143c088770e36ca1744d59efd69421.tar.gz | |
Upmerge 5.0-build -> 5.1-build.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index aaa08441e51..05cf919a30c 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1534,7 +1534,7 @@ void show_diff(DYNAMIC_STRING* ds, else diff_name = 0; #else - diff_name = "diff"; // Otherwise always assume it's called diff + diff_name = "diff"; /* Otherwise always assume it's called diff */ #endif if (diff_name) |