mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge work.mysql.com:/home/bk/mysql

Browse source 
into cane.mysql.fi:/usr/home/tim/my/work
This commit is contained in:
tim@cane.mysql.fi 2000-12-22 16:42:49 +02:00
commit 30e8de65b6
5 changed files with 29 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BUILD/FINISH.sh
View file

@ -6,7 +6,7 @@ for arg in "$@"; do
done
CFLAGS="$cflags" CXX=gcc CXXFLAGS="$cxxflags" eval "$configure"
eval "CFLAGS='$cflags' CXX=gcc CXXFLAGS='$cxxflags' $configure"
if [ "x$do_make" = "xno" ] ; then
exit 0

1
BitKeeper/etc/gone
View file

@ -328,3 +328,4 @@ serg@serg.mysql.com|mysql-test/r/ft0000002.c.result|20001212120059|07173|cd66b90
serg@serg.mysql.com|mysql-test/r/sel000031.result|20001211130803|03576|d49aeac63ad7db4d
serg@serg.mysql.com|mysql-test/r/sel000032.result|20001211130803|08537|6cb30e23cbca9fb0
serg@serg.mysql.com|mysql-test/r/sel000033.result|20001211130803|13548|56d1d02d72b94602
sasha@mysql.sashanet.com|mysql-test/README.gcov|20001214012355|41825|2de7575ca81155e5

60
mysql-test/mysql-test-run.sh
View file

@ -60,7 +60,7 @@ TIMEFILE="$MYSQL_TEST_DIR/var/tmp/mysqltest-time"
RES_SPACE=" "
MYSQLD_SRC_DIRS="strings mysys include extra regex isam merge myisam \
myisammrg heap sql"
GCOV_MSG=/tmp/mysqld-gcov.out #gcov output
GCOV_MSG=/tmp/mysqld-gcov.out
GCOV_ERR=/tmp/mysqld-gcov.err
MASTER_RUNNING=0
@ -136,41 +136,29 @@ MYSQL_TEST="$MYSQL_TEST --no-defaults --socket=$MASTER_MYSOCK --database=$DB --u
GDB_MASTER_INIT=/tmp/gdbinit.master
GDB_SLAVE_INIT=/tmp/gdbinit.slave
if [ "$1" = "--force" ] ; then
FORCE=1
shift 1
fi
if [ "$1" = "--record" ] ; then
RECORD=1
shift 1
fi
if [ "$1" = "--gcov" ];
then
if [ x$BINARY_DIST = x1 ] ; then
echo "Cannot do coverage test without the source - please us source dist"
exit 1
fi
DO_GCOV=1
shift 1
fi
if [ "$1" = "--gdb" ];
then
# if the user really wanted to run binary dist in a debugger, he can
# but we should warn him
if [ x$BINARY_DIST = x1 ] ; then
echo "Note: you will get more meaningful output on a source distribution \
compiled with debugging option when running tests with -gdb option"
fi
DO_GDB=1
shift 1
fi
while test $# -gt 0; do
case "$1" in
--force ) FORCE=1 ;;
--record ) RECORD=1 ;;
--gcov )
if [ x$BINARY_DIST = x1 ] ; then
echo "Cannot do coverage test without the source - please use source dist"
exit 1
fi
DO_GCOV=1
;;
--gdb )
if [ x$BINARY_DIST = x1 ] ; then
echo "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with -gdb option"
fi
DO_GDB=1
;;
-- ) shift; break ;;
--* ) echo "Unrecognized option: $1"; exit 1 ;;
* ) break ;;
esac
shift
done
#++
# Function Definitions

1
mysql-test/t/replace.test
View file

@ -10,6 +10,7 @@ CREATE TABLE t1 (
PRIMARY KEY (gesuchnr,benutzer_id)
) type=ISAM;
replace into t1 (gesuchnr,benutzer_id) values (2,1);
replace into t1 (gesuchnr,benutzer_id) values (1,1);
replace into t1 (gesuchnr,benutzer_id) values (1,1);
alter table t1 type=myisam;

3
sql/sql_insert.cc
View file

@ -366,7 +366,8 @@ int write_record(TABLE *table,COPY_INFO *info)
}
key_copy((byte*) key,table,key_nr,0);
if ((error=(table->file->index_read_idx(table->record[1],key_nr,
(byte*) key,0,
(byte*) key,
table->key_info[key_nr].key_length,
HA_READ_KEY_EXACT))))
goto err;
}