mirror of
https://github.com/MariaDB/server.git
synced 2025-07-10 04:22:00 +03:00
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
This commit is contained in:
@ -3,7 +3,7 @@
|
||||
path=`dirname $0`
|
||||
. "$path/SETUP.sh"
|
||||
|
||||
extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -fmessage-length=0 "
|
||||
extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage"
|
||||
extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
|
||||
extra_configs="$extra_configs --with-innodb --with-berkeley-db"
|
||||
|
||||
|
@ -111,6 +111,7 @@ root@x3.internalnet
|
||||
salle@banica.(none)
|
||||
salle@geopard.(none)
|
||||
salle@geopard.online.bg
|
||||
salle@vafla.online.bg
|
||||
sasha@mysql.sashanet.com
|
||||
serg@build.mysql2.com
|
||||
serg@serg.mylan
|
||||
|
@ -223,7 +223,7 @@ INSERT INTO t1 VALUES
|
||||
(21,4),(22,5),(23,5),(24,5),(25,5),(26,5),(30,5),(31,5),(32,5),(33,5),
|
||||
(33,5),(33,5),(33,5),(33,5),(34,5),(35,5);
|
||||
|
||||
# we expect that optimizer will choose key on A
|
||||
# we expect that optimizer will choose index on A
|
||||
EXPLAIN SELECT * FROM t1 WHERE a IN(1,2) AND b=5;
|
||||
SELECT * FROM t1 WHERE a IN(1,2) AND b=5;
|
||||
|
||||
|
@ -2038,7 +2038,7 @@ static int flush_cached_blocks(KEY_CACHE *keycache,
|
||||
/*
|
||||
flush all key blocks for a file to disk, but don't do any mutex locks
|
||||
|
||||
flush_key_blocks()
|
||||
flush_key_blocks_int()
|
||||
keycache pointer to a key cache data structure
|
||||
file handler for the file to flush to
|
||||
flush_type type of the flush
|
||||
@ -2255,7 +2255,7 @@ restart:
|
||||
RETURN
|
||||
0 ok
|
||||
1 error
|
||||
*/
|
||||
*/
|
||||
|
||||
int flush_key_blocks(KEY_CACHE_HANDLE key_cache,
|
||||
File file, enum flush_type type)
|
||||
|
@ -770,7 +770,9 @@ bool thr_got_alarm(thr_alarm_t *alrm_ptr)
|
||||
void thr_end_alarm(thr_alarm_t *alrm_ptr)
|
||||
{
|
||||
thr_alarm_t alrm= *alrm_ptr;
|
||||
/* alrm may be zero if thr_alarm aborted with an error */
|
||||
if (alrm && alrm->crono)
|
||||
|
||||
{
|
||||
KillTimer(NULL, alrm->crono);
|
||||
alrm->crono = 0;
|
||||
|
@ -120,6 +120,7 @@ SUFFIXES = .sh
|
||||
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
||||
-e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
|
||||
-e 's!@''LIBS''@!@LIBS@!' \
|
||||
-e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
|
||||
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
|
||||
-e 's!@''openssl_libs''@!@openssl_libs@!' \
|
||||
-e 's!@''VERSION''@!@VERSION@!' \
|
||||
|
@ -92,7 +92,7 @@ libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"
|
||||
libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
|
||||
cflags="-I$pkgincludedir @CFLAGS@"
|
||||
include="-I$pkgincludedir"
|
||||
embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @innodb_system_libs@"
|
||||
embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @WRAPLIBS@ @innodb_system_libs@"
|
||||
embedded_libs=`echo "$embedded_libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
|
||||
|
||||
# Remove some options that a client doesn't have to care about
|
||||
|
@ -242,8 +242,8 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
|
||||
{
|
||||
if (err != HA_ERR_KEY_NOT_FOUND && err != HA_ERR_END_OF_FILE)
|
||||
{
|
||||
sql_print_error("mysql_ha_read: Got error %d when reading table",
|
||||
err);
|
||||
sql_print_error("mysql_ha_read: Got error %d when reading table '%s'",
|
||||
err, tables->real_name);
|
||||
table->file->print_error(err,MYF(0));
|
||||
goto err;
|
||||
}
|
||||
|
Reference in New Issue
Block a user