Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a47d5608
Commit
a47d5608
authored
Nov 18, 2003
by
monty@mashka.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge with 4.0 tree
parents
b60aea40
2846a16c
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
7 deletions
+11
-7
BUILD/compile-pentium-gcov
BUILD/compile-pentium-gcov
+1
-1
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
mysql-test/t/range.test
mysql-test/t/range.test
+1
-1
mysys/mf_keycache.c
mysys/mf_keycache.c
+2
-2
mysys/thr_alarm.c
mysys/thr_alarm.c
+2
-0
scripts/Makefile.am
scripts/Makefile.am
+1
-0
scripts/mysql_config.sh
scripts/mysql_config.sh
+1
-1
sql/sql_handler.cc
sql/sql_handler.cc
+2
-2
No files found.
BUILD/compile-pentium-gcov
View file @
a47d5608
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
path
=
`
dirname
$0
`
path
=
`
dirname
$0
`
.
"
$path
/SETUP.sh"
.
"
$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
=
"
$pentium_configs
$debug_configs
--disable-shared
$static_link
"
extra_configs
=
"
$extra_configs
--with-innodb --with-berkeley-db"
extra_configs
=
"
$extra_configs
--with-innodb --with-berkeley-db"
...
...
BitKeeper/etc/logging_ok
View file @
a47d5608
...
@@ -111,6 +111,7 @@ root@x3.internalnet
...
@@ -111,6 +111,7 @@ root@x3.internalnet
salle@banica.(none)
salle@banica.(none)
salle@geopard.(none)
salle@geopard.(none)
salle@geopard.online.bg
salle@geopard.online.bg
salle@vafla.online.bg
sasha@mysql.sashanet.com
sasha@mysql.sashanet.com
serg@build.mysql2.com
serg@build.mysql2.com
serg@serg.mylan
serg@serg.mylan
...
...
mysql-test/t/range.test
View file @
a47d5608
...
@@ -223,7 +223,7 @@ INSERT INTO t1 VALUES
...
@@ -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
),
(
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
);
(
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
;
EXPLAIN
SELECT
*
FROM
t1
WHERE
a
IN
(
1
,
2
)
AND
b
=
5
;
SELECT
*
FROM
t1
WHERE
a
IN
(
1
,
2
)
AND
b
=
5
;
SELECT
*
FROM
t1
WHERE
a
IN
(
1
,
2
)
AND
b
=
5
;
...
...
mysys/mf_keycache.c
View file @
a47d5608
...
@@ -2038,7 +2038,7 @@ static int flush_cached_blocks(KEY_CACHE *keycache,
...
@@ -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 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
keycache pointer to a key cache data structure
file handler for the file to flush to
file handler for the file to flush to
flush_type type of the flush
flush_type type of the flush
...
@@ -2255,7 +2255,7 @@ restart:
...
@@ -2255,7 +2255,7 @@ restart:
RETURN
RETURN
0 ok
0 ok
1 error
1 error
*/
*/
int
flush_key_blocks
(
KEY_CACHE_HANDLE
key_cache
,
int
flush_key_blocks
(
KEY_CACHE_HANDLE
key_cache
,
File
file
,
enum
flush_type
type
)
File
file
,
enum
flush_type
type
)
...
...
mysys/thr_alarm.c
View file @
a47d5608
...
@@ -770,7 +770,9 @@ bool thr_got_alarm(thr_alarm_t *alrm_ptr)
...
@@ -770,7 +770,9 @@ bool thr_got_alarm(thr_alarm_t *alrm_ptr)
void
thr_end_alarm
(
thr_alarm_t
*
alrm_ptr
)
void
thr_end_alarm
(
thr_alarm_t
*
alrm_ptr
)
{
{
thr_alarm_t
alrm
=
*
alrm_ptr
;
thr_alarm_t
alrm
=
*
alrm_ptr
;
/* alrm may be zero if thr_alarm aborted with an error */
if
(
alrm
&&
alrm
->
crono
)
if
(
alrm
&&
alrm
->
crono
)
{
{
KillTimer
(
NULL
,
alrm
->
crono
);
KillTimer
(
NULL
,
alrm
->
crono
);
alrm
->
crono
=
0
;
alrm
->
crono
=
0
;
...
...
scripts/Makefile.am
View file @
a47d5608
...
@@ -120,6 +120,7 @@ SUFFIXES = .sh
...
@@ -120,6 +120,7 @@ SUFFIXES = .sh
-e
's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'
\
-e
's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'
\
-e
's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!'
\
-e
's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!'
\
-e
's!@''LIBS''@!@LIBS@!'
\
-e
's!@''LIBS''@!@LIBS@!'
\
-e
's!@''WRAPLIBS''@!@WRAPLIBS@!'
\
-e
's!@''innodb_system_libs''@!@innodb_system_libs@!'
\
-e
's!@''innodb_system_libs''@!@innodb_system_libs@!'
\
-e
's!@''openssl_libs''@!@openssl_libs@!'
\
-e
's!@''openssl_libs''@!@openssl_libs@!'
\
-e
's!@''VERSION''@!@VERSION@!'
\
-e
's!@''VERSION''@!@VERSION@!'
\
...
...
scripts/mysql_config.sh
View file @
a47d5608
...
@@ -92,7 +92,7 @@ libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"
...
@@ -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; *\$;;'
`
libs_r
=
`
echo
"
$libs_r
"
|
sed
-e
's; \+; ;g'
|
sed
-e
's;^ *;;'
|
sed
-e
's; *\$;;'
`
cflags
=
"-I
$pkgincludedir
@CFLAGS@"
cflags
=
"-I
$pkgincludedir
@CFLAGS@"
include
=
"-I
$pkgincludedir
"
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; *\$;;'
`
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
# Remove some options that a client doesn't have to care about
...
...
sql/sql_handler.cc
View file @
a47d5608
...
@@ -242,8 +242,8 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
...
@@ -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
)
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"
,
sql_print_error
(
"mysql_ha_read: Got error %d when reading table
'%s'
"
,
err
);
err
,
tables
->
real_name
);
table
->
file
->
print_error
(
err
,
MYF
(
0
));
table
->
file
->
print_error
(
err
,
MYF
(
0
));
goto
err
;
goto
err
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment