summaryrefslogtreecommitdiff
path: root/sql/threadpool_common.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-23 10:32:21 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-23 10:32:21 +0300
commit826f9d4f7e99973cafe7654697d7c50b8b64b76b (patch)
tree8e41c3a90d40c21c37fcbd0658afe7d349865540 /sql/threadpool_common.cc
parente5d71e0b3d3ebd4e69526002720f93d62a3fd641 (diff)
parent31fe70290c54c44231aed881f5138924f32e47c5 (diff)
downloadmariadb-git-826f9d4f7e99973cafe7654697d7c50b8b64b76b.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'sql/threadpool_common.cc')
-rw-r--r--sql/threadpool_common.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc
index 06b74cfe1a6..3628ceb9112 100644
--- a/sql/threadpool_common.cc
+++ b/sql/threadpool_common.cc
@@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include "mariadb.h"
#include <violite.h>