Skip to content

Commit 7e2791a

Browse files
trostentrosten
committed
Merge branch 'mysql-5.5' into mysql-5.6
2 parents 8d83204 + 5d4cfb3 commit 7e2791a

15 files changed

+31
-36
lines changed

‎scripts/CMakeLists.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -124,6 +124,12 @@ STRING(REPLACE "-fstack-protector-strong" "" CXXFLAGS "${CXXFLAGS}")
124124
STRING(REPLACE "-grecord-gcc-switches" "" CXXFLAGS "${CXXFLAGS}")
125125
STRING(REPLACE "-pipe" "" CXXFLAGS "${CXXFLAGS}")
126126

127+
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
128+
SET (PERL_PATH "/usr/local/bin/perl")
129+
ELSE()
130+
SET (PERL_PATH "/usr/bin/perl")
131+
ENDIF()
132+
127133
IF(UNIX)
128134
# SHELL_PATH, FIND_PROC, CHECK_PID are used by mysqld_safe
129135
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")

‎scripts/dheadgen.pl‎

100755100644
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
#!/usr/bin/perl -w
2-
3-
#
4-
# Copyright (c) 2008, 2009 Sun Microsystems, Inc.
5-
# Use is subject to license terms.
6-
#
7-
1+
# Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
82
#
93
# Redistribution and use in source and binary forms, with or without
104
# modification, are permitted provided that the following conditions are met:

‎scripts/mysql_config.pl.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/usr/bin/perl
1+
#!@PERL_PATH@
22
# -*- cperl -*-
33
#
4-
# Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
4+
# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
55
#
66
# This program is free software; you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by

‎scripts/mysql_convert_table_format.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#!/usr/bin/perl
2-
# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
3-
# Use is subject to license terms.
1+
#!@PERL_PATH@
2+
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
43
#
54
# This program is free software; you can redistribute it and/or modify
65
# it under the terms of the GNU General Public License as published by

‎scripts/mysql_find_rows.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#!/usr/bin/perl
2-
# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
3-
# Use is subject to license terms.
1+
#!@PERL_PATH@
2+
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
43
#
54
# This program is free software; you can redistribute it and/or modify
65
# it under the terms of the GNU General Public License as published by

‎scripts/mysql_fix_extensions.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#!/usr/bin/perl
1+
#!@PERL_PATH@
22

3-
# Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
4-
# Use is subject to license terms.
3+
# Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
54
#
65
# This program is free software; you can redistribute it and/or
76
# modify it under the terms of the GNU Library General Public

‎scripts/mysql_install_db.pl.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/usr/bin/perl
1+
#!@PERL_PATH@
22
# -*- cperl -*-
33
#
4-
# Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
4+
# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
55
#
66
# This program is free software; you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by

‎scripts/mysql_secure_installation.pl.in‎

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/usr/bin/perl
1+
#!@PERL_PATH@
22
# -*- cperl -*-
33
#
4-
# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
4+
# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
55
#
66
# This program is free software; you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by

‎scripts/mysql_setpermission.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
#!/usr/bin/perl
1+
#!@PERL_PATH@
22
## Emacs, this is -*- perl -*- mode? :-)
33

4-
# Copyright (c) 2000, 2014 Oracle and/or its affiliates. All rights reserved.
5-
# Use is subject to license terms.
4+
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
65
#
76
# This program is free software; you can redistribute it and/or
87
# modify it under the terms of the GNU Library General Public

‎scripts/mysql_zap.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#!/usr/bin/perl
2-
# Copyright (c) 2000, 2014 Oracle and/or its affiliates. All rights reserved.
3-
# Use is subject to license terms.
1+
#!@PERL_PATH@
2+
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
43
#
54
# This program is free software; you can redistribute it and/or modify
65
# it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)