df@pippilotta.erinye.com
da487329dd
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
2007-11-19 16:05:10 +01:00
df@pippilotta.erinye.com
de9eeef2e4
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-18431
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-19 16:02:15 +01:00
df@pippilotta.erinye.com
d3b0403a1b
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-18431
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-11-19 15:42:12 +01:00
df@pippilotta.erinye.com
af3e8cb12d
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-18431
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-18431
2007-11-19 14:55:15 +01:00
df@pippilotta.erinye.com
44ab4b2e7d
Update readline to version 5.2. This fixes bug#18431.
2007-11-19 14:38:08 +01:00
tsmith@ramayana.hindu.god
587c27e1d8
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2007-11-16 14:57:47 -07:00
tsmith@ramayana.hindu.god
de0d55edf4
Eliminate 'unused variable' warnings when compiling non-debug build
2007-11-16 14:56:37 -07:00
joerg@trift2.
6ae0172fef
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-11-16 17:41:35 +01:00
joerg@trift2.
9ffd927e7d
In the "spec" file for RPM builds, handle the debug server tests different from the standard server.
2007-11-16 17:36:13 +01:00
mkindahl@dl145h.mysql.com
6baad48043
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-11-16 15:56:24 +01:00
mkindahl@dl145h.mysql.com
e0ae105055
Bug#32435:
...
DROP DATABASE statement writes changes to mysql.proc table under RBR
When replicating a DROP DATABASE statement with a database holding
stored procedures, the changes to the mysql.proc table was recorded
in the binary log under row-based replication.
With this patch, the thread uses statement-logging format for the
duration of the DROP DATABASE statement. The logging format is
(already) reset at the end of the statement, so no additional code
for resetting the logging format is necessary.
2007-11-16 15:55:22 +01:00
joerg@trift2.
1ea3b1ba56
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-11-16 13:12:29 +01:00
joerg@trift2.
31114adb6b
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2007-11-16 13:07:21 +01:00
joerg@trift2.
07b6bec842
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-11-16 11:12:13 +01:00
joerg@trift2.
61a9d77784
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-11-16 10:42:32 +01:00
joerg@trift2.
4ede405d87
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-11-16 10:34:36 +01:00
mkindahl@dl145h.mysql.com
60fa29c847
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-11-15 13:31:39 +01:00
tnurnberg@white.intern.koehntopp.de
074a1dbd02
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/misc/mysql/31700/51-31700
2007-11-15 12:31:40 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
f1adcf9d75
Bug#31700: thd->examined_row_count not incremented for 'const' type queries
...
tests adjusted for Windows
2007-11-15 12:30:35 +01:00
gluh@mysql.com/eagle.(none)
3b38836e6d
updated result file
2007-11-15 11:58:42 +04:00
mkindahl@dl145h.mysql.com
d7f570c056
Post-merge fixes.
2007-11-14 21:08:59 +01:00
gluh@mysql.com/eagle.(none)
f3600c9437
updated result file
2007-11-14 20:40:07 +04:00
joerg@trift2.
839b0cf971
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-11-14 16:25:24 +01:00
joerg@trift2.
eaf9ae8889
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-11-14 16:11:52 +01:00
gluh@eagle.(none)
6fefa58d90
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-11-14 18:56:49 +04:00
gluh@mysql.com/eagle.(none)
b56f668ca3
after merge fix
2007-11-14 18:56:14 +04:00
joerg@trift2.
3bf8f6534a
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2007-11-14 15:48:44 +01:00
mkindahl@dl145h.mysql.com
379b67b967
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2007-11-14 15:41:33 +01:00
joerg@trift2.
86674bc412
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-11-14 15:26:38 +01:00
joerg@trift2.
96aaa245e2
Merge trift2.:/MySQL/M40/mysql-4.0
...
into trift2.:/MySQL/M41/push-4.1
2007-11-14 15:22:55 +01:00
joerg@trift2.
02464c6868
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-11-14 15:11:37 +01:00
gluh@eagle.(none)
602e972905
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-11-14 17:31:17 +04:00
gluh@eagle.(none)
58336411c9
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-11-14 17:30:16 +04:00
gluh@eagle.(none)
294c872fa5
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-11-14 17:26:59 +04:00
gluh@eagle.(none)
246c6c35a9
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-11-14 17:26:22 +04:00
gluh@mysql.com/eagle.(none)
ea3bfdb26d
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
2007-11-14 17:22:03 +04:00
mkindahl@dl145h.mysql.com
23cd47e0e1
Reverting changes to debug printouts to ha_ndbcluster.cc.
2007-11-14 14:04:33 +01:00
gshchepa/uchum@gleb.loc
95e7cccfee
Merge gleb.loc:/home/uchum/work/bk/5.1-opt-32034
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-11-14 15:49:57 +04:00
mkindahl@dl145h.mysql.com
a8bbce6569
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2007-11-14 11:19:34 +01:00
mkindahl@dl145h.mysql.com
6b5cb11dba
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
2007-11-14 11:07:30 +01:00
gkodinov/kgeorge@magare.gmz
82ce901ded
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.1-opt
2007-11-14 12:03:28 +02:00
gshchepa/uchum@gleb.loc
70f36562bc
Fixed bug #32034 : On 64bit platforms assigning values of
...
storage engine system variables was not validated and
unexpected value was assigned.
The check_func_enum function used subtraction from the uint
value with the probably negative result. That result of
type uint was compared with 0 after casting to signed long
type. On architectures where long type is longer than int
type the result of comparison was unexpected.
2007-11-14 13:48:21 +04:00
holyfoot/hf@hfmain.(none)
19c3bd89f8
Merge mysql.com:/home/hf/work/32067/my51-32067
...
into mysql.com:/home/hf/work/31305/my51-31305
2007-11-13 23:16:48 +04:00
holyfoot/hf@hfmain.(none)
fbac43bbba
Merge mysql.com:/home/hf/work/31305/my41-31305
...
into mysql.com:/home/hf/work/31305/my50-31305
2007-11-13 23:15:03 +04:00
holyfoot/hf@hfmain.(none)
acd198d5fa
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/31305/my50-31305
2007-11-13 23:13:59 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0c15068ff8
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/31305/my41-31305
2007-11-13 23:12:55 +04:00
holyfoot/hf@hfmain.(none)
b10c63646c
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/31305/my51-31305
2007-11-13 23:12:45 +04:00
gkodinov/kgeorge@magare.gmz
7f571c68cf
merge bug 31562 to 5.1 : changed SHOW CREATE VIEW format
2007-11-13 19:32:12 +02:00
gkodinov/kgeorge@magare.gmz
70f9ec3c8d
Merge magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B31562-5.1-opt
2007-11-13 19:15:49 +02:00
gkodinov/kgeorge@magare.gmz
eea70871f1
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.0-opt
2007-11-13 19:00:45 +02:00