diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-09 22:23:41 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-09 22:23:41 -0400 |
| commit | 60201f0de84066efa8347c9d41c1e8802a69792d (patch) | |
| tree | d69877217b5d46b9f37fd63c1e665f2c8e6d2648 /scripts | |
| parent | 899f24e0a2e7d330de464a4d006fde91a3fedb54 (diff) | |
| parent | cc12757621220dc1e3c14eb26d39f61af64daee5 (diff) | |
| download | mariadb-git-60201f0de84066efa8347c9d41c1e8802a69792d.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
client/mysql.cc:
Auto merged
heap/hp_delete.c:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
scripts/fill_func_tables.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/r/grant2.result:
Manual merge
mysql-test/r/heap_btree.result:
Manual merge
mysql-test/r/mysql_client.result:
Manual merge
mysql-test/t/grant2.test:
Manual merge
mysql-test/t/heap_btree.test:
Manual merge
mysql-test/t/mysql_client.test:
Manual merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fill_func_tables.sh | 11 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/scripts/fill_func_tables.sh b/scripts/fill_func_tables.sh index 203c730dd9a..ad5b7fbb521 100644 --- a/scripts/fill_func_tables.sh +++ b/scripts/fill_func_tables.sh @@ -1,7 +1,12 @@ -#!/usr/bin/perl +#!@PERL@ +# +# Copyright (C) 2003 MySQL AB +# For a more info consult the file COPYRIGHT distributed with this file. +# # fill_func_tables - parse ../Docs/manual.texi - -# Original version by vva +# +# Original version by Victor Vagin <vva@mysql.com> +# my $cat_name= ""; my $func_name= ""; diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index c05fda745b0..5d7933e5277 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -1,4 +1,3 @@ - #!/bin/sh # Copyright (C) 2002-2003 MySQL AB # For a more info consult the file COPYRIGHT distributed with this file. |