tomas@whalegate.ndb.mysql.com
955c40dece
WL#3303
...
- get the ndb flags right, so that the behaviour is as before
2007-06-19 11:31:25 +02:00
tomas@whalegate.ndb.mysql.com
6a51e0f8a2
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-18 23:55:48 +02:00
tomas@whalegate.ndb.mysql.com
7d4467766f
correction
2007-06-18 15:41:02 +02:00
tomas@whalegate.ndb.mysql.com
e5565db7c6
Bug #28989 hpux11 ps_row warnings
...
- also remove printout for error 4009
2007-06-18 15:38:37 +02:00
lars/lthalmann@dl145h.mysql.com
a2d93c53db
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-18 12:10:36 +02:00
lars/lthalmann@dl145j.mysql.com
ae52876fd0
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-18 09:42:22 +02:00
tomas@whalegate.ndb.mysql.com
6b8e7c9484
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 19:47:56 +02:00
tomas@whalegate.ndb.mysql.com
ff804bc546
Bug #28989 hpux11 ps_row warnings
...
- do not print 701 dictionary busy error
2007-06-17 19:47:20 +02:00
tomas@whalegate.ndb.mysql.com
830be6deac
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 17:21:27 +02:00
istruewing@chilla.local
938fc3d66e
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-16 13:14:23 +02:00
tomas@whalegate.ndb.mysql.com
8d31148899
Bug #28949
...
- handler binlog's must be shutdoem before logger.cleanup_base
2007-06-16 11:16:02 +02:00
iggy@alf.
e0adab8ce7
Merge alf.:D:/src/mysql-5.1-maint
...
into alf.:D:/src/mysql-5.1-maint_winemb
2007-06-15 14:45:44 -04:00
iggy@alf.
c15a2647a0
Embedded Server doesn't build on Windows.
...
- Add build configuration parameter EMBEDDED_ONLY which will configure
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
2007-06-15 14:32:16 -04:00
istruewing@chilla.local
875cac1ffb
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-15 20:23:20 +02:00
tsmith@maint1.mysql.com
a9ae34b56c
Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 18:56:11 +02:00
tsmith@maint1.mysql.com
9f4134267a
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 18:03:59 +02:00
tsmith@quadxeon.mysql.com
73035c274f
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-15 17:59:04 +02:00
mats@kindahl-laptop.dnsalias.net
a35a3cff8e
BUG#29130 (The logic for using delete_all_rows() is wrong):
...
Correcting the logic for deciding when to use delete_all_rows() so that
the behavior of TRUNCATE to not be dependent on binary logging
format in effect.
A TRUNCATE statement is always logged as a statement, so in this case,
delete_all_rows() can always be used provided the other logic is correct.
If a DELETE FROM without a WHERE clause is used, and row-based binlogging
is used, the rows has to be deleted from the table on a per-row basis.
2007-06-15 13:50:56 +02:00
dkatz@damien-katzs-computer.local
3a1a561322
Merge damien-katzs-computer.local:/Users/dkatz/mysql51
...
into damien-katzs-computer.local:/Users/dkatz/51_win
2007-06-14 20:48:11 -04:00
tsmith@maint1.mysql.com
664fa012c0
Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/51
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 02:36:37 +02:00
tsmith@quadxeon.mysql.com
918090030b
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
2007-06-15 01:57:33 +02:00
antony@ppcg5.local
21c233440d
Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6
...
into ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge
2007-06-14 16:04:52 -07:00
cmiller@zippy.cornsilk.net
85caa3540e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-06-14 18:17:26 -04:00
tsmith@quadxeon.mysql.com
87fdad4ce8
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-14 23:23:30 +02:00
cmiller@zippy.cornsilk.net
d37e579411
Bug#21723: Should be able to dump core after setuid() under Linux
...
In many cases, binaries can no longer dump core after calling setuid().
Where the PR_SET_DUMPABLE macro is set, use the prctl() system call
to tell the kernel that it's allowed to dump the core of the server.
2007-06-14 14:24:59 -04:00
mskold/marty@linux.site
c487c38111
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-06-14 16:10:11 +02:00
holyfoot/hf@hfmain.(none)
1e9373fd60
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 16:42:43 +05:00
holyfoot/hf@hfmain.(none)
8ccc50b303
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-06-14 16:41:10 +05:00
holyfoot/hf@hfmain.(none)
76e0a0768a
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 16:35:20 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
6d2ffe7b8e
Bug#26402 Server crashes with old-style named table
...
Problem: crash on attempt to open a table
having "#mysql50#" prefix in db or table name.
Fix: This prefix is reserved for "mysql_upgrade"
to access 5.0 tables whose file names are not encoded
according to "5.1 tablename to filename encoded".
Don't try open tables whose db name or table name
has this prefix.
2007-06-14 16:28:33 +05:00
dkatz@damien-katzs-computer.local
65e47d59db
Bug #28897 UUID() returns non-unique values when query cache is enabled
...
Removed the ability to cache queries with UUID() and UUID_SHORT().
2007-06-13 17:25:16 -04:00
dkatz@damien-katzs-computer.local
471173c57c
Bug #28953 Using events in a replication let the slave crash.
...
Fixed where the slave code would try to update the Lex->sphead which is NULL on an "alter table" commands.
2007-06-13 16:24:21 -04:00
dkatz@damien-katzs-computer.local
1481bfc87b
Bug #28897 UUID() returns non-unique values when query cache is enabled
...
Removed the ability to cache queries containing "UUID()".
2007-06-13 14:23:25 -04:00
igor@olga.mysql.com
20ad515003
Fixed bug #28980 : the result of ROUND(<decimal expr>,<int column>)
...
was erroneously converted to double, while the result of
ROUND(<decimal expr>, <int literal>) was preserved as decimal.
As a result of such a conversion the value of ROUND(D,A) could
differ from the value of ROUND(D,val(A)) if D was a decimal expression.
Now the result of the ROUND function is never converted to
double if the first argument is decimal.
2007-06-13 09:32:36 -07:00
mats@kindahl-laptop.dnsalias.net
4ecdd55b49
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
2007-06-13 15:18:39 +02:00
mats@kindahl-laptop.dnsalias.net
c6bfb5b4ef
Fixing some trivial test problems.
2007-06-13 15:16:33 +02:00
mats@kindahl-laptop.dnsalias.net
0cf7e502ee
BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
...
Post-merge fixes.
2007-06-13 12:28:35 +02:00
antony@ppcg5.local
3bb1769bc0
Bug#25800
...
"Embedded server requires mysql.plugin"
Embedded builds should not print any error when the mysql.plugin
table does not exist. This is achieved by checking for the existance
of the mysql.plugin table before attempting to open it and proceed
silently if it does not exist.
2007-06-12 19:28:05 -07:00
mats@kindahl-laptop.dnsalias.net
143a895b4f
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
2007-06-12 22:14:54 +02:00
mats@kindahl-laptop.dnsalias.net
ec58bfb28a
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
2007-06-12 22:02:46 +02:00
mats@kindahl-laptop.dnsalias.net
526a0cecda
BUG#23051 (READ COMMITTED breaks mixed and statement-based
...
replication):
Patch to add binlog format capabilities to the InnoDB storage engine.
The engine will not allow statement format logging when in READ COMMITTED
or READ UNCOMMITTED transaction isolation level.
In addition, an error is generated when trying to use READ COMMITTED
or READ UNCOMMITTED transaction isolation level in STATEMENT binlog
mode.
2007-06-12 21:47:00 +02:00
gkodinov/kgeorge@magare.gmz
72f395a559
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27816-5.1-opt
2007-06-12 19:24:48 +03:00
gkodinov/kgeorge@magare.gmz
eb1fb60975
5.0-opt -> 5.1-opt merge
2007-06-12 18:41:56 +03:00
cmiller@zippy.cornsilk.net
da33797903
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
2007-06-12 10:33:39 -04:00
cmiller@zippy.cornsilk.net
5ee2d957cb
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-06-12 10:33:22 -04:00
gkodinov/kgeorge@magare.gmz
fbefe9d552
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
2007-06-12 16:34:54 +03:00
cmiller@zippy.cornsilk.net
10e6bf0f3f
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-06-12 08:56:00 -04:00
cmiller@zippy.cornsilk.net
33c59b5d02
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
2007-06-12 08:48:30 -04:00
cmiller@zippy.cornsilk.net
4c9af55908
Bug#28984: crasher on connect with out of range password length in \
...
protocol
Fixed duplicated code, same as last commit.
One could send a malformed packet that caused the server to SEGV. In
recent versions of the password protocol, the client tells the server
what length the ciphertext is (almost always 20). If that length was
large enough to overflow a signed char, then the number would jump to
very large after being casted to unsigned int.
Instead, cast the *passwd char to uchar.
2007-06-12 08:47:36 -04:00
gkodinov/kgeorge@magare.gmz
32d9644489
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B28992-5.0-opt
2007-06-12 14:37:14 +03:00