innobase/dict/dict0boot.c:
Remove dummy code to work around bug in the pgcc compiler.
innobase/include/ut0dbg.h:
UT_DBG_PANIC: Avoid exit(), as lexyy.c re-#defines exit().
Move the code to the function ut_dbg_panic() instead.
innobase/ut/ut0dbg.c:
[__NETWARE__] Add function ut_dbg_panic()
Merge with latest yaSSL.
extra/yassl/include/lock.hpp:
Merge with latest yaSSL.
extra/yassl/include/socket_wrapper.hpp:
Merge with latest yaSSL.
extra/yassl/mySTL/helpers.hpp:
Merge with latest yaSSL.
extra/yassl/src/lock.cpp:
Merge with latest yaSSL.
extra/yassl/src/log.cpp:
Merge with latest yaSSL.
extra/yassl/src/socket_wrapper.cpp:
Merge with latest yaSSL.
extra/yassl/src/ssl.cpp:
Merge with latest yaSSL.
extra/yassl/src/timer.cpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/include/misc.hpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/include/random.hpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/include/types.hpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/src/asn.cpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/src/integer.cpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/src/misc.cpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/src/random.cpp:
Merge with latest yaSSL.
mysql-test/include/show_msg80.inc:
Post review fixes: improved description
mysql-test/r/mysqltest.result:
Updated result
mysql-test/t/mysqltest.test:
one sub testcase added
This fixes the problem in 5.0 in the correct way.
The previous patch (for 4.1) is only valid for 4.1 and is done at the right time
for 4.1.
ndb/src/kernel/main.cpp:
The ndbd angel process keeps the mgm connection open as it retains a reference
to the socket.
this means that when the mgm server is killed, the socket stays in CLOSE_WAIT
(the ndb process will close() it okay in 5.0, as we reused it for a transporter
but this isn't enough as the angel process still has a reference to that socket).
so, by adding in a theConfig->closeConfiguration(); in the angel process, the ndb
process is left with the only reference to the socket - which it can close whenever
it likes (namely when the connection is terminated).
The 4.1 fix is not valid for 5.0. Remove it.
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
This fix is not valid for 5.0 as we use the mgm server connection for more than
just fetching the initial configuration
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_select.cc:
Auto merged
- replace @message by $message
--> The annoying protocol line "SET @message= <value>" will disappear.
- extended description
- some examples added
mysql-test/include/show_msg.inc:
replace @message by $message
mysql-test/include/show_msg80.inc:
- replace @message by $message
- extended description
- some examples added
mysql-test/r/mysqltest.result:
updated results
mysql-test/t/mysqltest.test:
sub testcases for the show_msg*.inc scripts modified, because the script properties are altered
Added test case for bug #11283.
field.h, field.cc:
Fixed bug #11283: wrong conversion from varchar to decimal.
Added methods Field_string::val_decimal,
Field_varstring::val_decimal, Field_blob::val_decimal.
They are not inherited from the base class Field_longstr
anymore.
sql/field.cc:
Fixed bug #11283: wrong conversion from varchar to decimal.
Added methods Field_string::val_decimal,
Field_varstring::val_decimal, Field_blob::val_decimal.
They are not inherited from the base class Field_longstr
anymore.
sql/field.h:
Fixed bug #11283: wrong conversion from varchar to decimal.
Added methods Field_string::val_decimal,
Field_varstring::val_decimal, Field_blob::val_decimal.
They are not inherited from the base class Field_longstr
anymore.
mysql-test/t/cast.test:
Added test case for bug #11283.
mysql-test/r/cast.result:
Added test case for bug #11283.
mysql-test/r/func_math.result:
test result fixed
mysql-test/t/func_math.test:
test case added
strings/decimal.c:
handling of round_digit changed - we have to check all the digits after
the point if round_digit is 0
mysql-test/r/cast.result:
test result fixed
mysql-test/t/cast.test:
test case added
sql/item_func.cc:
checks for NULL added
strings/decimal.c:
we need to return specified 'scale' for the rounded decimal
Added a teast case for bug #11284.
sql_select.cc:
Fixed bug #11284.
Optimization with empty inner table currently cannot be
used in the case of nested outer join.
sql/sql_select.cc:
Fixed bug #11284.
Optimization with empty inner table currently cannot be
used in the case of nested outer join.
mysql-test/t/join_nested.test:
Added a teast case for bug #11284.
Added a test case for bug #11285.
sql_select.cc:
Fixed bug #11285.
The problem occurred with Item_equal in an 'on expression'
that was evaluated to false.
sql/sql_select.cc:
Fixed bug #11285.
The problem occurred with Item_equal in an 'on expression'
that was evaluated to false.
mysql-test/t/join_outer.test:
Added a test case for bug #11285.
mysql-test/r/join_outer.result:
Added a test case for bug #11285.
