pcrews@pcrews-mac-local.local
0a62b5584c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/34468/mysql-5.1-build-34468
2008-02-14 11:54:56 -05:00
pcrews@pcrews-mac-local.local
dd71e64ae7
Bug#34468 - csv_not_null fails
...
Altered test to expect error on UPDATE SET <not_null_col> = NULL instead
of expecting warning and re-recorded .result file.
2008-02-14 08:17:47 -05:00
joerg@trift2.
cc72fa880e
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 17:08:48 +01:00
joerg@trift2.
480a15dc44
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 16:58:37 +01:00
joerg@trift2.
89d5b47c6e
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into trift2.:/MySQL/M50/push-5.0
2008-02-13 16:55:22 +01:00
df@pippilotta.erinye.com
c78d616938
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2008-02-13 14:44:56 +01:00
joerg@trift2.
9337cfbb39
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 13:49:49 +01:00
joerg@trift2.
51f81b0209
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 13:40:53 +01:00
joerg@trift2.
341258dba4
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 13:05:07 +01:00
joerg@trift2.
d500b8650d
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/push-5.0
2008-02-13 12:58:10 +01:00
joerg@trift2.
e31275c481
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2008-02-13 12:48:25 +01:00
df@pippilotta.erinye.com
72073063cb
Make this build on Windows.
2008-02-11 18:02:37 +01:00
anozdrin/alik@quad.
301ab0d8b7
Disable sporadically failing test cases (Bug#34454).
2008-02-11 14:34:53 +03:00
anozdrin/alik@quad.
524cbe2e4c
Disabling declaration of debug variable for non-debug builds.
...
(originally from Mats)
2008-02-11 14:05:27 +03:00
anozdrin/alik@quad.
a52a30e3e6
Patch to eliminate some valgrind warnings in debug printout code.
...
(originally from Mats)
2008-02-11 14:04:30 +03:00
kostja@dipika.(none)
b09af4bef4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-09 14:42:26 +03:00
kostja@dipika.(none)
84713274ba
Fix a buffer overflow with strmake().
2008-02-09 10:31:22 +03:00
malff@lambda.hsd1.co.comcast.net.
20e33c30a0
Fixed buffer overflow
2008-02-08 19:37:57 -07:00
anozdrin/alik@quad.
dbe77333d5
Bug#34424: query_cache_debug.test leads to valgrind warnings
...
Disable the test case.
2008-02-08 20:07:39 +03:00
anozdrin/alik@quad.
fab537bc89
Fix create.test: use latin1 instead ucs2.
2008-02-08 20:06:05 +03:00
kostja@dipika.(none)
add76ef5d5
Fix -ansi -pedantic compilation error
2008-02-08 19:33:24 +03:00
kostja@dipika.(none)
ef36b32ef0
Merge dipika.(none):/opt/local/work/mysql-5.0-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 19:01:57 +03:00
kostja@dipika.(none)
e9c887cc3d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 18:55:07 +03:00
kostja@dipika.(none)
0e4b6ea058
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dipika.(none):/opt/local/work/mysql-5.0-runtime
2008-02-08 18:51:07 +03:00
kostja@dipika.(none)
d956281e1e
Don't complain about a failure to write a log message if we were
...
simply killed.
2008-02-08 17:25:20 +03:00
kostja@dipika.(none)
209d3d2e18
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 15:54:21 +03:00
kostja@dipika.(none)
015cdcad4b
Silence the slow log errors (they won't make it to the client anyway).
2008-02-08 15:53:57 +03:00
davi@endora.local
9a5e3e103c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-08 10:48:16 -02:00
davi@mysql.com/endora.local
15409e87d2
Manual merge of Bug 33798
2008-02-08 10:47:25 -02:00
davi@endora.local
31b22496f4
Merge mysql.com:/Users/davi/mysql/mysql-5.0-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-08 10:21:58 -02:00
davi@mysql.com/endora.local
24b9abf36d
Bug#33798 prepared statements improperly handle large unsigned ints
...
The unsignedness of large integer user variables was not being
properly preserved when feeded to prepared statements. This was
happening because the unsigned flags wasn't being updated when
converting the user variable is converted to a parameter.
The solution is to copy the unsigned flag when converting the
user variable to a parameter and take the unsigned flag into
account when converting the integer to a string.
2008-02-08 08:55:55 -02:00
kostja@dipika.(none)
0d4667eb5c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 13:36:39 +03:00
kostja@dipika.(none)
956e955938
Give a more informative message if we failed to write to mysql.general_log
...
table.
2008-02-08 13:35:11 +03:00
davi@mysql.com/endora.local
24830674e8
Bug#31891 Meaningful stack trace
...
On crashes generate a user-friendly resolved and demangled stack
trace when libc provides the necessary functions (newer libc on i386,
x86_64, powerpc, ia64, alpha and s390). Otherwise print a numeric
stack trace as before, relying on resolve_stack_dump utility.
2008-02-07 19:58:06 -02:00
kostja@dipika.(none)
092cadbdd1
Merge dipika.(none):/opt/local/work/mysql-5.0-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-07 23:53:03 +03:00
kostja@dipika.(none)
bf7991ba2f
Fix compile warning about undefined rmdir() function.
2008-02-07 23:52:30 +03:00
hhunger@hh-nb.hungers
159bc5c73b
Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
...
into hh-nb.hungers:/work/merge/mysql-5.1-build
2008-02-07 20:31:15 +01:00
malff@lambda.hsd1.co.comcast.net.
5d5bed0bcc
test update
2008-02-07 12:00:48 -07:00
davi@endora.local
2e0ef9424d
Merge mysql.com:/Users/davi/mysql/bugs/32633-5.1
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-07 16:14:39 -02:00
msvensson@pilot.mysql.com
5d8061d344
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-runtime
2008-02-07 14:09:16 +01:00
msvensson@pilot.mysql.com
4df354a6c5
Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-runtime
2008-02-07 14:07:41 +01:00
msvensson@pilot.mysql.com
31a520551f
Merge bk-internal:/home/bk/mysql-5.1-runtime
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-runtime
2008-02-07 12:44:01 +01:00
msvensson@pilot.mysql.com
04ca458fcb
Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
2008-02-07 12:42:49 +01:00
davi@mysql.com/endora.local
1c6768c487
Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitution
...
The problem is that one can not create a stored routine if sql_mode
contains NO_ENGINE_SUBSTITUTION or PAD_CHAR_TO_FULL_LENGTH. Also when
a event is created, the mode is silently lost if sql_mode contains one
of the aforementioned. This was happening because the table definitions
which stored sql_mode values weren't being updated to accept new values
of sql_mode.
The solution is to update, in a backwards compatible manner, the various
table definitions (columns) that store the sql_mode value to take into
account the new possible values. One incompatible change is that if a event
that is being created can't be stored to the mysql.event table, an error
will be raised.
The tests case also ensure that new SQL modes will be added to the mysql.proc
and mysql.event tables, otherwise the tests will fail.
2008-02-07 08:47:39 -02:00
msvensson@pilot.mysql.com
51f2f81d43
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-07 10:02:59 +01:00
msvensson@pilot.mysql.com
670e938e74
Merge bk-internal:/home/bk/mysql-5.1-build
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-07 10:02:22 +01:00
msvensson@pilot.mysql.com
21e767aaa4
Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-02-07 10:01:36 +01:00
msvensson@pilot.mysql.com
8c11d95f30
Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my51-bug25988
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-07 10:00:34 +01:00
msvensson@pilot.mysql.com
fc937c52b5
Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my50-bug25988
...
into pilot.mysql.com:/data/msvensson/mysql/bug25988/my51-bug25988
2008-02-07 09:55:49 +01:00
msvensson@pilot.mysql.com
800725af95
Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my50-bug25988
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-02-07 09:55:12 +01:00