istruewing@stella.local
62d79a1019
Merge stella.local:/home/mydev/mysql-4.1-axmrg
...
into stella.local:/home/mydev/mysql-5.0-axmrg
2007-09-14 10:56:16 +02:00
istruewing@stella.local
cbc48e51d0
Merge stella.local:/home/mydev/mysql-5.0-amain
...
into stella.local:/home/mydev/mysql-5.0-axmrg
2007-09-14 10:55:48 +02:00
istruewing@stella.local
b321fb953d
Merge stella.local:/home/mydev/mysql-5.0-ateam
...
into stella.local:/home/mydev/mysql-5.0-axmrg
2007-09-14 10:54:56 +02:00
gshchepa@devsrv-b.mysql.com
e6e56ccc01
Merge devsrv-b.mysql.com:/users/gshchepa/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
2007-09-14 10:11:51 +02:00
gshchepa/uchum@gleb.loc
72e36e0aa3
Merge gshchepa@bk-internal.mysql.com:/users/gshchepa/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt-27695
2007-09-14 13:11:50 +05:00
istruewing@stella.local
de7e0c9e73
Merge stella.local:/home/mydev/mysql-4.1-amain
...
into stella.local:/home/mydev/mysql-4.1-axmrg
2007-09-14 10:10:29 +02:00
gshchepa/uchum@gleb.loc
7284a865df
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-14 12:16:19 +05:00
joerg@trift2.
1dc3246fe3
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M50/tmp-5.0
2007-09-13 23:42:17 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
3c6ca8d6ed
Bug #15327 : configure: --with-tcp-port option being partially ignored
...
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)
2007-09-13 16:19:46 +02:00
gshchepa/uchum@gleb.loc
e4eadcfbdd
Fixed bug #27695 .
...
Declaring an all space column name in the SELECT FROM DUAL or in a view
leads to misleading warning message:
"Leading spaces are removed from name ' '".
The Item::set_name method has been modified to raise warnings like
"Name ' ' has become ''" in case of the truncation of an all
space identifier to an empty string identifier instead of the
"Leading spaces are removed from name ' '" warning message.
2007-09-13 18:41:50 +05:00
anozdrin/alik@station.
ef3bcaf3dd
Bug#16918: Aborted_clients > Connections.
...
The problem was that aborted_threads variable was updated
twice when a client connection had been aborted.
The fix is to refactor a code to have aborted_threads updated
only in one place.
2007-09-13 17:30:44 +04:00
svoj@june.mysql.com
6a04238e41
Merge mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-5.0-engines
2007-09-13 16:42:23 +05:00
svoj@mysql.com/june.mysql.com
84a9e656e0
BUG#30590 - delete from memory table with composite btree primary key
...
DELETE query against memory table with btree index may remove
not all matching rows. This happens only when DELETE uses
index read method to find matching rows. E.g. for queries
like DELETE FROM t1 WHERE a=1.
Fixed by reverting fix for BUG9719 and applying proper solution.
2007-09-13 15:39:16 +05:00
mskold/marty@linux.site
f2159e2d21
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-09-13 10:35:11 +02:00
mskold/marty@mysql.com/linux.site
44b6c2edad
bug#27494 An invalid subselect crashes mysql server: Added check for missing arguments
2007-09-13 09:47:21 +02:00
gshchepa/uchum@gleb.loc
2e7306d503
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-13 11:48:58 +05:00
gshchepa/uchum@gleb.loc
ff042427cf
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-12 23:41:35 +05:00
sergefp@mysql.com
1ff0caf49d
Better wording in comments
2007-09-12 18:13:19 +04:00
tomas@whalegate.ndb.mysql.com
df552c310d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-12 14:01:51 +02:00
tomas@whalegate.ndb.mysql.com
83eed4d876
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
2007-09-12 13:55:22 +02:00
tomas@whalegate.ndb.mysql.com
461a3dccac
BUG#23354 revert
2007-09-12 13:53:32 +02:00
tomas@whalegate.ndb.mysql.com
f1674d1b66
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-12 07:34:42 +02:00
sergefp@mysql.com
06f12f66e8
Post-merge fixes
2007-09-12 01:52:27 +04:00
sergefp@mysql.com
6f702a4b42
Post-merge fixes
2007-09-11 02:41:42 +04:00
sergefp@pylon.mylan
d276ce3402
Merge mysql.com:/home/psergey/mysql-4.1-bug30385
...
into mysql.com:/home/psergey/mysql-5.0-bug30385
2007-09-11 02:24:08 +04:00
sergefp@mysql.com
da04109de2
BUG#30385: Server crash when deleting with ORDER BY and LIMIT
...
in get_index_for_order(), don't walk over the end of the index key parts
when matching index description and needed ordering.
2007-09-10 16:26:51 +04:00
lars/lthalmann@dl145j.mysql.com
1e265379a7
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-09-10 14:17:12 +02:00
lars/lthalmann@dl145h.mysql.com
4f29c65ae1
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-09-10 13:15:04 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
cc5fa8d649
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-09-10 13:14:35 +02:00
mats@capulet.net
46c83227fc
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into capulet.net:/home/bk/mysql-5.0-rpl
2007-09-08 23:01:34 +02:00
jperkin@production.mysql.com
29b0900ddd
Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27693
...
into production.mysql.com:/usersnfs/jperkin/bk/trees/50/mysql-5.0
2007-09-07 17:24:17 +02:00
jperkin@production.mysql.com
5133eeff45
Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27520
...
into production.mysql.com:/usersnfs/jperkin/bk/trees/50/mysql-5.0
2007-09-07 15:32:47 +02:00
kaa@polly.(none)
8da409ac16
This patch is a part of work on bug #5731 "key_buffer_size not properly restricted to 4GB".
...
The patch limits read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms for the following reasons:
- I/O code in mysys, code in mf_iocache.c and in some storage engines do not currently work with sizes > 2 GB for those buffers
- even if the above had been fixed, Windows POSIX read() and write() calls are not 2GB-safe, so setting those buffer to sizes > 2GB would not work correctly on 64-bit Windows.
2007-09-07 11:58:04 +04:00
gshchepa/uchum@gleb.loc
d330a49105
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-06 22:27:13 +05:00
rburnett/Administrator@xp64.
da13b58127
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into xp64.:C:/work/mysql-5.0-build
2007-09-05 16:32:38 -05:00
rburnett/Administrator@xp64.
a29c72d89d
Adding batch files for building with nmake make files
2007-09-05 16:30:38 -05:00
dkatz@damien-katzs-computer.local
9fead4bd6a
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50_udf_const
2007-09-05 15:15:48 -04:00
dkatz@damien-katzs-computer.local
f672f5dcd2
Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into damien-katzs-computer.local:/Users/dkatz/mysql50
2007-09-05 15:08:30 -04:00
dkatz@damien-katzs-computer.local
d8e67d4556
Bug #29804 UDF parameters don't contain correct string length
...
Previously, UDF *_init functions were passed constant strings with erroneous lengths.
The length came from the containing variable's size, not the length of the value itself.
Now the *_init functions get the constant as a null terminated string with the correct
length supplied too.
2007-09-05 15:06:10 -04:00
joerg@trift2.
04b56132a7
libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".
2007-09-05 09:30:50 +02:00
malff/marcsql@weblab.(none)
f4b671d8bc
Fixed whitespace
2007-09-04 16:40:27 -06:00
malff/marcsql@weblab.(none)
3a7bcd72f3
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-09-04 14:38:26 -06:00
joerg@trift2.
7fc80ef6eb
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2007-09-04 19:43:44 +02:00
joerg@trift2.
1aa9d47832
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-09-04 19:41:33 +02:00
joerg@trift2.
150b9a5f20
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-09-04 19:37:45 +02:00
df@pippilotta.erinye.com
c5a33802b5
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-04 11:06:02 +02:00
df@pippilotta.erinye.com
59b504a5e3
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-09-04 10:49:54 +02:00
thek@adventure.(none)
b1d1204576
Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-09-03 13:46:10 +02:00
thek@adventure.(none)
a8b9bd9f67
- Fix cross compatibility issues by exchanging pthread_yield with my_sleep(0)
2007-09-03 13:42:32 +02:00
mhansson@dl145s.mysql.com
b1cc84ec1d
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/mhansson/my50-bug30234-push
2007-09-03 12:44:17 +02:00