diff options
| author | unknown <brian@zim.(none)> | 2006-08-14 15:24:29 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-14 15:24:29 -0700 |
| commit | 948a89432738e4d3b9c4d2f8287573f97e81ecb3 (patch) | |
| tree | 2e163bcaefab8eeba55ac25ca6707e3181740da8 /scripts | |
| parent | 45a5ca85f35d1c13528140b449a27d6b2a47d09d (diff) | |
| parent | 61d5563ba413c18b2674e97016093c082b9918d0 (diff) | |
| download | mariadb-git-948a89432738e4d3b9c4d2f8287573f97e81ecb3.tar.gz | |
Merge zim.(none):/home/brian/mysql/dep-5.0
into zim.(none):/home/brian/mysql/dep-5.1
client/mysql.cc:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/repair.test:
Auto merged
scripts/fill_func_tables.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/sort.c:
Auto merged
mysql-test/r/mysqldump.result:
Fixing Result
mysql-test/r/repair.result:
Fixing result
mysql-test/t/mysqldump.test:
Merging change
storage/archive/ha_archive.cc:
Merging in change
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 83501886d88..e71849962fa 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 865ab3e6db4..4ac9cf909e9 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. |