database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-26 17:42:13 +03:00
Code Activity

Merge hundin:/my/mysql-3.23 into tik.mysql.fi:/home/my/mysql-3.23

Browse Source
This commit is contained in:
monty@tik.mysql.fi
2002-03-05 15:49:34 +02:00
parent 8c01c96f90 539718ba25
commit cde0896521
7 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bdb/dist/s_recover vendored
View File

@ -12,6 +12,13 @@ rm -f $loglist
trap 'rm -f $t; exit 1' 1 2 3 13 15 trap 'rm -f $t; exit 1' 1 2 3 13 15
# Use the standard -k option if it works;
# otherwise fall back on the traditional notation.
if sort -k 1,1 /dev/null
then sort_2_etc='-k 2'
else sort_2_etc='+1'
fi
# Check to make sure we haven't duplicated a log record entry, and build # Check to make sure we haven't duplicated a log record entry, and build
# the list of log record types that the test suite uses. # the list of log record types that the test suite uses.
for i in $DIR; do for i in $DIR; do
@ -19,13 +26,14 @@ for i in $DIR; do
for f in ../$i/*.src; do for f in ../$i/*.src; do
# Grab the PREFIX; there should only be one per file, and # Grab the PREFIX; there should only be one per file, and
# so it's okay to just take the first. # so it's okay to just take the first.
grep '^PREFIX' $f | head -1 grep '^PREFIX' $f | sed q
egrep '^DEPRECATED[ ]|^BEGIN[ ]' $f | \ egrep '^DEPRECATED[ ]|^BEGIN[ ]' $f | \
awk '{print $1 "\t" $2 "\t" $3}' awk '{print $1 "\t" $2 "\t" $3}'
done done
done > $loglist done > $loglist
grep -v '^PREFIX' $loglist | awk '{print $2 "\t" $3}' | sort +1 -n | \ grep -v '^PREFIX' $loglist | awk '{print $2 "\t" $3}' | \
sort $sort_2_etc -n | \
uniq -d -f 1 > $t uniq -d -f 1 > $t
[ -s $t ] && { [ -s $t ] && {
echo "DUPLICATE LOG VALUES:" echo "DUPLICATE LOG VALUES:"

2
configure.in
View File

@ -611,6 +611,8 @@ AC_ARG_ENABLE(local-infile,
[ ENABLED_LOCAL_INFILE=no ] [ ENABLED_LOCAL_INFILE=no ]
) )
AC_SUBST(ENABLE_LOCAL_INFILE)
# Use Paul Eggerts macros from GNU tar to check for large file support. # Use Paul Eggerts macros from GNU tar to check for large file support.
MYSQL_SYS_LARGEFILE MYSQL_SYS_LARGEFILE

2
libmysql/libmysql.c
View File

@ -1022,7 +1022,7 @@ mysql_init(MYSQL *mysql)
/* /*
Only enable LOAD DATA INFILE by default if configured with Only enable LOAD DATA INFILE by default if configured with
--with-enabled-local-inflile --enable-local-infile
*/ */
#ifdef ENABLED_LOCAL_INFILE #ifdef ENABLED_LOCAL_INFILE
mysql->options.client_flag|= CLIENT_LOCAL_FILES; mysql->options.client_flag|= CLIENT_LOCAL_FILES;

11
mysql-test/mysql-test-run.sh
View File

@ -44,21 +44,22 @@ which ()
# No paths below as we can't be sure where the program is! # No paths below as we can't be sure where the program is!
BASENAME=`which basename | head -1` SED=sed
DIFF=`which diff | head -1`
BASENAME=`which basename | $SED q`
DIFF=`which diff | $SED q`
CAT=cat CAT=cat
CUT=cut CUT=cut
TAIL=tail TAIL=tail
ECHO=echo # use internal echo if possible ECHO=echo # use internal echo if possible
EXPR=expr # use internal if possible EXPR=expr # use internal if possible
FIND=find FIND=find
GCOV=`which gcov | head -1` GCOV=`which gcov | $SED q`
PRINTF=printf PRINTF=printf
RM=rm RM=rm
TIME=time TIME=time
TR=tr TR=tr
XARGS=`which xargs | head -1` XARGS=`which xargs | $SED q`
SED=sed
# Are we using a source or a binary distribution? # Are we using a source or a binary distribution?

2
scripts/safe_mysqld.sh
View File

@ -253,7 +253,7 @@ do
I=1 I=1
while test "$I" -le "$numofproces" while test "$I" -le "$numofproces"
do do
PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'`
for T in $PROC for T in $PROC
do do
break break

2
sql-bench/server-cfg.sh
View File

@ -932,7 +932,7 @@ sub version
{ {
if ($dir && -e "$dir/bin/solcon") if ($dir && -e "$dir/bin/solcon")
{ {
$version=`$dir/bin/solcon -e"ver" $main::opt_user $main::opt_password | grep Server | head -1`; $version=`$dir/bin/solcon -e"ver" $main::opt_user $main::opt_password | grep Server | sed q`;
if ($? == 0) if ($? == 0)
{ {
chomp($version); chomp($version);

2
sql/sql_yacc.yy
View File

@ -30,7 +30,7 @@
extern void yyerror(const char*); extern void yyerror(const char*);
int yylex(void *yylval); int yylex(void *yylval);
#define yyoverflow(A,B,C,D,E,F) if (my_yyoverflow((B),(D),(F))) { yyerror((char*) (A)); return 2; } #define yyoverflow(A,B,C,D,E,F) if (my_yyoverflow((B),(D),(int*) (F))) { yyerror((char*) (A)); return 2; }
inline Item *or_or_concat(Item* A, Item* B) inline Item *or_or_concat(Item* A, Item* B)
{ {