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
53d2e32b
Commit
53d2e32b
authored
Sep 23, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
parents
1e84e31c
41c25e01
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
181 additions
and
52 deletions
+181
-52
client/mysql.cc
client/mysql.cc
+2
-2
mysql-test/r/ctype_utf8.result
mysql-test/r/ctype_utf8.result
+13
-0
mysql-test/r/func_time.result
mysql-test/r/func_time.result
+12
-0
mysql-test/r/type_float.result
mysql-test/r/type_float.result
+7
-0
mysql-test/t/ctype_utf8.test
mysql-test/t/ctype_utf8.test
+12
-0
mysql-test/t/func_time.test
mysql-test/t/func_time.test
+19
-0
mysql-test/t/lowercase_fs_off.test
mysql-test/t/lowercase_fs_off.test
+1
-0
mysql-test/t/type_float.test
mysql-test/t/type_float.test
+10
-1
ndb/config/common.mk.am
ndb/config/common.mk.am
+1
-1
ndb/config/type_ndbapitools.mk.am
ndb/config/type_ndbapitools.mk.am
+1
-1
ndb/src/common/portlib/Makefile.am
ndb/src/common/portlib/Makefile.am
+2
-1
ndb/src/kernel/Makefile.am
ndb/src/kernel/Makefile.am
+2
-1
sql/item_strfunc.cc
sql/item_strfunc.cc
+2
-1
sql/mysqld.cc
sql/mysqld.cc
+2
-2
sql/sql_string.cc
sql/sql_string.cc
+6
-1
sql/stacktrace.c
sql/stacktrace.c
+40
-15
sql/stacktrace.h
sql/stacktrace.h
+6
-2
strings/strtod.c
strings/strtod.c
+43
-24
No files found.
client/mysql.cc
View file @
53d2e32b
...
...
@@ -2629,7 +2629,7 @@ com_connect(String *buffer, char *line)
bzero
(
buff
,
sizeof
(
buff
));
if
(
buffer
)
{
strm
ov
(
buff
,
line
);
strm
ake
(
buff
,
line
,
sizeof
(
buff
)
-
1
);
tmp
=
get_arg
(
buff
,
0
);
if
(
tmp
&&
*
tmp
)
{
...
...
@@ -2743,7 +2743,7 @@ com_use(String *buffer __attribute__((unused)), char *line)
char
*
tmp
,
buff
[
FN_REFLEN
+
1
];
bzero
(
buff
,
sizeof
(
buff
));
strm
ov
(
buff
,
line
);
strm
ake
(
buff
,
line
,
sizeof
(
buff
)
-
1
);
tmp
=
get_arg
(
buff
,
0
);
if
(
!
tmp
||
!*
tmp
)
{
...
...
mysql-test/r/ctype_utf8.result
View file @
53d2e32b
...
...
@@ -1352,3 +1352,16 @@ select database();
database()
имя_базы_в_кодировке_утф8_длиной_больше_чем_45
drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
use test;
create table t1(a char(10)) default charset utf8;
insert into t1 values ('123'), ('456');
explain
select substr(Z.a,-1), Z.a from t1 as Y join t1 as Z on Y.a=Z.a order by 1;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE Y ALL NULL NULL NULL NULL 2 Using temporary; Using filesort
1 SIMPLE Z ALL NULL NULL NULL NULL 2 Using where
select substr(Z.a,-1), Z.a from t1 as Y join t1 as Z on Y.a=Z.a order by 1;
substr(Z.a,-1) a
3 123
6 456
drop table t1;
mysql-test/r/func_time.result
View file @
53d2e32b
...
...
@@ -694,6 +694,18 @@ t1 CREATE TABLE `t1` (
`from_unixtime(1) + 0` double(23,6) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
SET NAMES latin1;
SET character_set_results = NULL;
SHOW VARIABLES LIKE 'character_set_results';
Variable_name Value
character_set_results
CREATE TABLE testBug8868 (field1 DATE, field2 VARCHAR(32) CHARACTER SET BINARY);
INSERT INTO testBug8868 VALUES ('2006-09-04', 'abcd');
SELECT DATE_FORMAT(field1,'%b-%e %l:%i%p') as fmtddate, field2 FROM testBug8868;
fmtddate field2
Sep-4 12:00AM abcd
DROP TABLE testBug8868;
SET NAMES DEFAULT;
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H)
union
(select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H);
...
...
mysql-test/r/type_float.result
View file @
53d2e32b
...
...
@@ -272,3 +272,10 @@ desc t3;
Field Type Null Key Default Extra
a double 0
drop table t1,t2,t3;
select 1e-308, 1.00000001e-300, 100000000e-300;
1e-308 1.00000001e-300 100000000e-300
0 1.00000001e-300 1e-292
select 10e307;
10e307
1e+308
End of 4.1 tests
mysql-test/t/ctype_utf8.test
View file @
53d2e32b
...
...
@@ -1087,5 +1087,17 @@ create database имя_базы_в_кодировке_утф8_длиной_бо
use
имя_базы_в_кодировке_утф8_длиной_больше_чем_45
;
select
database
();
drop
database
имя_базы_в_кодировке_утф8_длиной_больше_чем_45
;
use
test
;
#
# Bug #20204: "order by" changes the results returned
#
create
table
t1
(
a
char
(
10
))
default
charset
utf8
;
insert
into
t1
values
(
'123'
),
(
'456'
);
explain
select
substr
(
Z
.
a
,
-
1
),
Z
.
a
from
t1
as
Y
join
t1
as
Z
on
Y
.
a
=
Z
.
a
order
by
1
;
select
substr
(
Z
.
a
,
-
1
),
Z
.
a
from
t1
as
Y
join
t1
as
Z
on
Y
.
a
=
Z
.
a
order
by
1
;
drop
table
t1
;
# End of 4.1 tests
mysql-test/t/func_time.test
View file @
53d2e32b
...
...
@@ -368,6 +368,25 @@ create table t1 select now() - now(), curtime() - curtime(),
show
create
table
t1
;
drop
table
t1
;
#
# 21913: DATE_FORMAT() Crashes mysql server if I use it through
# mysql-connector-j driver.
#
SET
NAMES
latin1
;
SET
character_set_results
=
NULL
;
SHOW
VARIABLES
LIKE
'character_set_results'
;
CREATE
TABLE
testBug8868
(
field1
DATE
,
field2
VARCHAR
(
32
)
CHARACTER
SET
BINARY
);
INSERT
INTO
testBug8868
VALUES
(
'2006-09-04'
,
'abcd'
);
SELECT
DATE_FORMAT
(
field1
,
'%b-%e %l:%i%p'
)
as
fmtddate
,
field2
FROM
testBug8868
;
DROP
TABLE
testBug8868
;
SET
NAMES
DEFAULT
;
#
# Bug #19844 time_format in Union truncates values
#
...
...
mysql-test/t/lowercase_fs_off.test
View file @
53d2e32b
...
...
@@ -3,6 +3,7 @@
# i.e. lower_case_filesystem=OFF
#
--
source
include
/
have_case_sensitive_file_system
.
inc
--
source
include
/
not_embedded
.
inc
connect
(
master
,
localhost
,
root
,,);
connection
master
;
...
...
mysql-test/t/type_float.test
View file @
53d2e32b
...
...
@@ -179,4 +179,13 @@ show warnings;
desc
t3
;
drop
table
t1
,
t2
,
t3
;
# End of 4.1 tests
#
# Bug #22129: A small double precision number becomes zero
#
# check if underflows are detected correctly
select
1
e
-
308
,
1.00000001e-300
,
100000000
e
-
300
;
# check if overflows are detected correctly
select
10
e307
;
--
echo
End
of
4.1
tests
ndb/config/common.mk.am
View file @
53d2e32b
...
...
@@ -7,6 +7,6 @@ ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi"
mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi"
INCLUDES = $(INCLUDES_LOC)
LDADD = $(
top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
LDADD = $(
LDADD_LOC) -L$(top_srcdir)/ndb/src/common/portlib -lmygcc
DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC)
ndb/config/type_ndbapitools.mk.am
View file @
53d2e32b
...
...
@@ -3,7 +3,7 @@ LDADD += \
$(top_builddir)/ndb/src/libndbclient.la \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
-lmygcc
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
-I$(top_srcdir)/ndb/include \
...
...
ndb/src/common/portlib/Makefile.am
View file @
53d2e32b
noinst_HEADERS
=
gcc.cpp
noinst_LIBRARIES
=
libmygcc.a
libmygcc_a_SOURCES
=
gcc.cpp
noinst_LTLIBRARIES
=
libportlib.la
...
...
ndb/src/kernel/Makefile.am
View file @
53d2e32b
...
...
@@ -53,7 +53,8 @@ LDADD += \
$(top_builddir)
/ndb/src/common/util/libgeneral.la
\
$(top_builddir)
/dbug/libdbug.a
\
$(top_builddir)
/mysys/libmysys.a
\
$(top_builddir)
/strings/libmystrings.a @NDB_SCI_LIBS@
$(top_builddir)
/strings/libmystrings.a @NDB_SCI_LIBS@
-lmygcc
# Don't update the files from bitkeeper
%
::
SCCS/s.%
...
...
sql/item_strfunc.cc
View file @
53d2e32b
...
...
@@ -1109,12 +1109,13 @@ void Item_func_substr::fix_length_and_dec()
}
if
(
arg_count
==
3
&&
args
[
2
]
->
const_item
())
{
int32
length
=
(
int32
)
args
[
2
]
->
val_int
()
*
collation
.
collation
->
mbmaxlen
;
int32
length
=
(
int32
)
args
[
2
]
->
val_int
();
if
(
length
<=
0
)
max_length
=
0
;
/* purecov: inspected */
else
set_if_smaller
(
max_length
,(
uint
)
length
);
}
max_length
*=
collation
.
collation
->
mbmaxlen
;
}
...
...
sql/mysqld.cc
View file @
53d2e32b
...
...
@@ -6552,10 +6552,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
}
switch
(
method
-
1
)
{
case
0
:
method_conv
=
MI_STATS_METHOD_NULLS_EQUAL
;
method_conv
=
MI_STATS_METHOD_NULLS_
NOT_
EQUAL
;
break
;
case
1
:
method_conv
=
MI_STATS_METHOD_NULLS_
NOT_
EQUAL
;
method_conv
=
MI_STATS_METHOD_NULLS_EQUAL
;
break
;
case
2
:
method_conv
=
MI_STATS_METHOD_IGNORE_NULLS
;
...
...
sql/sql_string.cc
View file @
53d2e32b
...
...
@@ -248,6 +248,10 @@ bool String::copy(const char *str,uint32 arg_length, CHARSET_INFO *cs)
0 No conversion needed
1 Either character set conversion or adding leading zeros
(e.g. for UCS-2) must be done
NOTE
to_cs may be NULL for "no conversion" if the system variable
character_set_results is NULL.
*/
bool
String
::
needs_conversion
(
uint32
arg_length
,
...
...
@@ -256,7 +260,8 @@ bool String::needs_conversion(uint32 arg_length,
uint32
*
offset
)
{
*
offset
=
0
;
if
((
to_cs
==
&
my_charset_bin
)
||
if
(
!
to_cs
||
(
to_cs
==
&
my_charset_bin
)
||
(
to_cs
==
from_cs
)
||
my_charset_same
(
from_cs
,
to_cs
)
||
((
from_cs
==
&
my_charset_bin
)
&&
...
...
sql/stacktrace.c
View file @
53d2e32b
...
...
@@ -21,6 +21,7 @@
#ifdef HAVE_STACKTRACE
#include <unistd.h>
#include <strings.h>
#define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
...
...
@@ -44,7 +45,29 @@ void safe_print_str(const char* name, const char* val, int max_len)
}
#ifdef TARGET_OS_LINUX
#define SIGRETURN_FRAME_COUNT 2
#ifdef __i386__
#define SIGRETURN_FRAME_OFFSET 17
#endif
#ifdef __x86_64__
#define SIGRETURN_FRAME_OFFSET 23
#endif
static
my_bool
is_nptl
;
/* Check if we are using NPTL or LinuxThreads on Linux */
void
check_thread_lib
(
void
)
{
char
buf
[
5
];
#ifdef _CS_GNU_LIBPTHREAD_VERSION
confstr
(
_CS_GNU_LIBPTHREAD_VERSION
,
buf
,
sizeof
(
buf
));
is_nptl
=
!
strncasecmp
(
buf
,
"NPTL"
,
sizeof
(
buf
));
#else
is_nptl
=
0
;
#endif
}
#if defined(__alpha__) && defined(__GNUC__)
/*
...
...
@@ -90,7 +113,7 @@ inline uint32* find_prev_pc(uint32* pc, uchar** fp)
void
print_stacktrace
(
gptr
stack_bottom
,
ulong
thread_stack
)
{
uchar
**
fp
;
uint
frame_count
=
0
;
uint
frame_count
=
0
,
sigreturn_frame_count
;
#if defined(__alpha__) && defined(__GNUC__)
uint32
*
pc
;
#endif
...
...
@@ -100,28 +123,27 @@ void print_stacktrace(gptr stack_bottom, ulong thread_stack)
Attempting backtrace. You can use the following information to find out
\n
\
where mysqld died. If you see no messages after this, something went
\n
\
terribly wrong...
\n
"
);
#ifdef __i386__
#ifdef __i386__
__asm
__volatile__
(
"movl %%ebp,%0"
:
"=r"
(
fp
)
:
"r"
(
fp
));
if
(
!
fp
)
{
fprintf
(
stderr
,
"frame pointer (ebp) is NULL, did you compile with
\n
\
-fomit-frame-pointer? Aborting backtrace!
\n
"
);
return
;
}
#endif
#ifdef __x86_64__
__asm
__volatile__
(
"movq %%rbp,%0"
:
"=r"
(
fp
)
:
"r"
(
fp
));
#endif
#if defined(__alpha__) && defined(__GNUC__)
__asm
__volatile__
(
"mov $30,%0"
:
"=r"
(
fp
)
:
"r"
(
fp
));
#endif
if
(
!
fp
)
{
fprintf
(
stderr
,
"frame pointer
(fp)
is NULL, did you compile with
\n
\
fprintf
(
stderr
,
"frame pointer is NULL, did you compile with
\n
\
-fomit-frame-pointer? Aborting backtrace!
\n
"
);
return
;
}
#endif
/* __alpha__ */
if
(
!
stack_bottom
||
(
gptr
)
stack_bottom
>
(
gptr
)
&
fp
)
{
...
...
@@ -151,13 +173,16 @@ terribly wrong...\n");
:
"r"
(
pc
));
#endif
/* __alpha__ */
/* We are 1 frame above signal frame with NPTL and 2 frames above with LT */
sigreturn_frame_count
=
is_nptl
?
1
:
2
;
while
(
fp
<
(
uchar
**
)
stack_bottom
)
{
#if
def __i386__
#if
defined(__i386__) || defined(__x86_64__)
uchar
**
new_fp
=
(
uchar
**
)
*
fp
;
fprintf
(
stderr
,
"%p
\n
"
,
frame_count
==
SIGRETURN_FRAME_COUNT
?
*
(
fp
+
17
)
:
*
(
fp
+
1
));
#endif
/*
__386__
*/
fprintf
(
stderr
,
"%p
\n
"
,
frame_count
==
sigreturn_frame_count
?
*
(
fp
+
SIGRETURN_FRAME_OFFSET
)
:
*
(
fp
+
1
));
#endif
/*
defined(__386__) || defined(__x86_64__)
*/
#if defined(__alpha__) && defined(__GNUC__)
uchar
**
new_fp
=
find_prev_fp
(
pc
,
fp
);
...
...
sql/stacktrace.h
View file @
53d2e32b
...
...
@@ -19,16 +19,20 @@ extern "C" {
#endif
#ifdef TARGET_OS_LINUX
#if defined(HAVE_STACKTRACE) || (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__)))
#if defined(HAVE_STACKTRACE) || (defined (__
x86_64__) || defined (__
i386__) || (defined(__alpha__) && defined(__GNUC__)))
#undef HAVE_STACKTRACE
#define HAVE_STACKTRACE
extern
char
*
__bss_start
;
extern
char
*
heap_start
;
#define init_stacktrace() { heap_start = (char*) &__bss_start; }
#define init_stacktrace() do { \
heap_start = (char*) &__bss_start; \
check_thread_lib(); \
} while(0);
void
print_stacktrace
(
gptr
stack_bottom
,
ulong
thread_stack
);
void
safe_print_str
(
const
char
*
name
,
const
char
*
val
,
int
max_len
);
void
check_thread_lib
(
void
);
#endif
/* (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) */
#endif
/* TARGET_OS_LINUX */
...
...
strings/strtod.c
View file @
53d2e32b
...
...
@@ -30,7 +30,8 @@
#include <m_ctype.h>
#define MAX_DBL_EXP 308
#define MAX_RESULT_FOR_MAX_EXP 1.79769313486232
#define MAX_RESULT_FOR_MAX_EXP 1.7976931348623157
#define MIN_RESULT_FOR_MIN_EXP 2.225073858507202
static
double
scaler10
[]
=
{
1
.
0
,
1e10
,
1e20
,
1e30
,
1e40
,
1e50
,
1e60
,
1e70
,
1e80
,
1e90
};
...
...
@@ -57,10 +58,11 @@ double my_strtod(const char *str, char **end_ptr, int *error)
{
double
result
=
0
.
0
;
uint
negative
=
0
,
ndigits
,
dec_digits
=
0
,
neg_exp
=
0
;
int
exp
=
0
,
digits_after_dec_point
=
0
;
int
exp
=
0
,
digits_after_dec_point
=
0
,
tmp_exp
;
const
char
*
old_str
,
*
end
=
*
end_ptr
,
*
start_of_number
;
char
next_char
;
my_bool
overflow
=
0
;
double
scaler
=
1
.
0
;
*
error
=
0
;
if
(
str
>=
end
)
...
...
@@ -91,6 +93,7 @@ double my_strtod(const char *str, char **end_ptr, int *error)
while
((
next_char
=
*
str
)
>=
'0'
&&
next_char
<=
'9'
)
{
result
=
result
*
10
.
0
+
(
next_char
-
'0'
);
scaler
=
scaler
*
10
.
0
;
if
(
++
str
==
end
)
{
next_char
=
0
;
/* Found end of string */
...
...
@@ -114,6 +117,7 @@ double my_strtod(const char *str, char **end_ptr, int *error)
{
result
=
result
*
10
.
0
+
(
next_char
-
'0'
);
digits_after_dec_point
++
;
scaler
=
scaler
*
10
.
0
;
if
(
++
str
==
end
)
{
next_char
=
0
;
...
...
@@ -144,39 +148,54 @@ double my_strtod(const char *str, char **end_ptr, int *error)
}
while
(
str
<
end
&&
my_isdigit
(
&
my_charset_latin1
,
*
str
));
}
}
if
((
exp
=
(
neg_exp
?
exp
+
digits_after_dec_point
:
exp
-
digits_after_dec_point
))
)
tmp_exp
=
neg_exp
?
exp
+
digits_after_dec_point
:
exp
-
digits_after_dec_point
;
if
(
tmp_exp
)
{
double
scaler
;
if
(
exp
<
0
)
{
exp
=
-
exp
;
neg_exp
=
1
;
/* neg_exp was 0 before */
}
if
(
exp
+
ndigits
>=
MAX_DBL_EXP
+
1
&&
result
)
int
order
;
/*
Check for underflow/overflow.
order is such an integer number that f = C * 10 ^ order,
where f is the resulting floating point number and 1 <= C < 10.
Here we compute the modulus
*/
order
=
exp
+
(
neg_exp
?
-
1
:
1
)
*
(
ndigits
-
1
);
if
(
order
<
0
)
order
=
-
order
;
if
(
order
>=
MAX_DBL_EXP
&&
result
)
{
/*
This is not 100 % as we actually will give an owerflow for
17E307 but not for 1.7E308 but lets cut some corners to make life
simpler
*/
if
(
exp
+
ndigits
>
MAX_DBL_EXP
+
1
||
result
>=
MAX_RESULT_FOR_MAX_EXP
)
double
c
;
/* Compute modulus of C (see comment above) */
c
=
result
/
scaler
*
10
.
0
;
if
(
neg_exp
)
{
if
(
neg_exp
)
if
(
order
>
MAX_DBL_EXP
||
c
<
MIN_RESULT_FOR_MIN_EXP
)
{
result
=
0
.
0
;
else
goto
done
;
}
}
else
{
if
(
order
>
MAX_DBL_EXP
||
c
>
MAX_RESULT_FOR_MAX_EXP
)
{
overflow
=
1
;
goto
done
;
goto
done
;
}
}
}
scaler
=
1
.
0
;
exp
=
tmp_exp
;
if
(
exp
<
0
)
{
exp
=
-
exp
;
neg_exp
=
1
;
/* neg_exp was 0 before */
}
while
(
exp
>=
100
)
{
scaler
*=
1.0e100
;
result
=
neg_exp
?
result
/
1.0e100
:
result
*
1.0e100
;
exp
-=
100
;
}
scaler
*
=
scaler10
[
exp
/
10
]
*
scaler1
[
exp
%
10
];
scaler
=
scaler10
[
exp
/
10
]
*
scaler1
[
exp
%
10
];
if
(
neg_exp
)
result
/=
scaler
;
else
...
...
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