diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-05-29 15:40:55 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-05-29 15:40:55 +0200 |
| commit | afe815e12b21707bd693c534dd8d3ad419ae4320 (patch) | |
| tree | 012ee6457e70197cfd477b7cbf9f552db7781fa1 /scripts | |
| parent | fddc198750af834cddb0818564f05b2de0c24a74 (diff) | |
| parent | a07ac913b8341cfe00d65f8a69a873cbed9b8981 (diff) | |
| download | mariadb-git-afe815e12b21707bd693c534dd8d3ad419ae4320.tar.gz | |
Merge up 5.0-build into 5.1-build:
mostly just the merge changesets,
but also a change of Perl scripts to use "/usr/bin/perl" fixed.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_find_rows.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_fix_extensions.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_setpermission.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_zap.sh | 2 | ||||
| -rw-r--r-- | scripts/mysqlaccess.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/scripts/mysql_find_rows.sh b/scripts/mysql_find_rows.sh index 77eacc8a9b4..967a8196ebd 100644 --- a/scripts/mysql_find_rows.sh +++ b/scripts/mysql_find_rows.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000, 2004 MySQL AB # # This program is free software; you can redistribute it and/or modify diff --git a/scripts/mysql_fix_extensions.sh b/scripts/mysql_fix_extensions.sh index fbc72406f5e..6d4e017f678 100644 --- a/scripts/mysql_fix_extensions.sh +++ b/scripts/mysql_fix_extensions.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # This is a utility for MySQL. It is not needed by any standard part # of MySQL. diff --git a/scripts/mysql_setpermission.sh b/scripts/mysql_setpermission.sh index b1ea26a9b7d..5fa6b969e39 100644 --- a/scripts/mysql_setpermission.sh +++ b/scripts/mysql_setpermission.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl ## Emacs, this is -*- perl -*- mode? :-) ## ## Permission setter for MySQL diff --git a/scripts/mysql_zap.sh b/scripts/mysql_zap.sh index 3bb92aaec2e..f78212e2578 100644 --- a/scripts/mysql_zap.sh +++ b/scripts/mysql_zap.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2002, 2004 MySQL AB # # This program is free software; you can redistribute it and/or modify diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh index bcaf9f8af8e..0153a3afa7c 100644 --- a/scripts/mysqlaccess.sh +++ b/scripts/mysqlaccess.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # **************************** package MySQLaccess; #use strict; |