summaryrefslogtreecommitdiff
path: root/client/mysqldump.c
diff options
context:
space:
mode:
authorGuilhem Bichot <guilhem@mysql.com>2009-02-12 15:08:56 +0100
committerGuilhem Bichot <guilhem@mysql.com>2009-02-12 15:08:56 +0100
commit3cf3f9720e641dea71171e915b0057864ddd8f3b (patch)
tree73476f970c229f75846855edeeddfbc6fd87ed4b /client/mysqldump.c
parent3550ecb5ccb9b2dbfa012eef445a0de5fc36e40f (diff)
parente7dfc37dd0c20238bead920a37586a1c01c0bf40 (diff)
downloadmariadb-git-3cf3f9720e641dea71171e915b0057864ddd8f3b.tar.gz
merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather copied mtr from 6.0-main here (at least this one knows how to run Maria tests). I also fixed suite/maria tests to be accepted by the new mtr. mysys/thr_mutex.c: adding DBUG_PRINT here, so that we can locate where the warning is issued.
Diffstat (limited to 'client/mysqldump.c')
-rw-r--r--client/mysqldump.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c
index c068b2ff16e..44c53a0e4c2 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by