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
msvensson@pilot.mysql.com
c409f20695
Bug#33050 5.0.50 fails many SSL testcases
2008-02-07 08:48:28 +01:00
msvensson@pilot.mysql.com
af14030eda
Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-07 08:12:25 +01:00
msvensson@pilot.mysql.com
259263da7e
Bug#32025 ndb_waiter does too many roundtrips to ndb_mgmd
2008-02-07 08:08:43 +01:00
hhunger@hh-nb.hungers
81e68b2d64
Merge hh-nb.hungers:/work/merge/mysql-5.1-build
...
into hh-nb.hungers:/work/merge/mysql-5.1-bug34190
2008-02-06 15:56:29 +01:00
joerg@trift2.
5d2c9639cd
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2008-02-06 15:55:18 +01:00
davi@endora.local
8278d42586
Merge mysql.com:/Users/davi/mysql/bugs/21801-5.1
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-06 12:50:22 -02:00
joerg@trift2.
e2b16eca7a
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2008-02-06 15:49:23 +01:00
msvensson@pilot.mysql.com
42bebb4e7b
Merge pilot.mysql.com:/data/msvensson/mysql/bug32044/my51-bug32044
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-06 14:56:32 +01:00
davi@endora.local
6efa489780
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-06 11:22:18 -02:00
davi@mysql.com/endora.local
2af5e25c1d
Bug#32710: SHOW INNODB STATUS requires SUPER
...
Changed "SHOW ENGINE ... STATUS" and "SHOW ENGINE ... MUTEX"
to require the PROCESS privilege, instead of SUPER.
Fixed by Damien Katz
2008-02-06 11:20:15 -02:00
jperkin/mysqldev@mysql.com/production.mysql.com
21487efe0a
Raise version number after cloning 5.0.56
2008-02-06 14:18:26 +01:00
jperkin/mysqldev@production.mysql.com
1392a8a06d
Merge mysql.com:/data0/mysqldev/my/mysql-5.0
...
into mysql.com:/data0/mysqldev/my/build-200802061048-5.0.56/mysql-5.0-release
2008-02-06 14:13:05 +01:00
anozdrin/alik@quad.
3b60dc73a4
Add a test case for Bug#21380: DEFAULT definition not always
...
transfered by CREATE TABLE/SELECT to the new table.
2008-02-06 14:55:19 +03:00
msvensson@pilot.mysql.com
6ee61e1196
Merge pilot.mysql.com:/data/msvensson/mysql/bug19911/my51-bug19911
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-06 12:52:11 +01:00
davi@mysql.com/endora.local
bd4e875448
Bug#34311 main.lock_multi.test fails
...
Re-enable the test case for Bug 30331.
2008-02-06 09:40:59 -02:00
msvensson@pilot.mysql.com
784eaab4ec
Bug#19911 ndb does not work on sol10 x86
2008-02-06 11:44:07 +01:00
hhunger@hh-nb.hungers
23ebccac7e
Fixed differences in STATE in result file for bug#34190.
2008-02-06 11:02:45 +01:00
tsmith@ramayana.hindu.god
b499e62ce8
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
Also use the opportunity to fix a bad merge (remove
duplicate code in mysql-test-run.pl).
2008-02-05 23:20:12 -07:00
tsmith@ramayana.hindu.god
cb87f97c4e
Minor typo fix for mysql-test-run.pl
2008-02-05 23:16:52 -07:00
tsmith@ramayana.hindu.god
9226a45ed9
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 22:42:06 -07:00
tsmith@ramayana.hindu.god
57add90e18
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-05 22:41:10 -07:00
tsmith@ramayana.hindu.god
21817aef6c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 22:40:40 -07:00
mtaylor@solace.(none)
e12a6442d6
Merge solace.(none):/home/mtaylor/src/mysql-5.0-build
...
into solace.(none):/home/mtaylor/src/mysql-5.1-build
2008-02-06 05:33:25 +01:00
mtaylor@solace.(none)
9a2090fcdd
Strip comments from queries before explaining them. Fixes BUG#34339
2008-02-06 04:33:27 +01:00
tsmith@ramayana.hindu.god
8695c8fe68
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 16:32:03 -07:00
tsmith@ramayana.hindu.god
c99d06a5f3
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 16:15:07 -07:00
tsmith@ramayana.hindu.god
6726c9e32d
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-05 16:04:07 -07:00