kent@mysql.com
4e289272b2
mysqlbinlog.test:
...
Windows have no 'cat' command, use <
mysql.test:
Windows can't handle single quotes in --exec line
2005-09-24 04:11:51 +02:00
sergefp@mysql.com
061d660615
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-merge-sept24
2005-09-24 03:33:26 +04:00
sergefp@mysql.com
9a05a887de
Manually merged
2005-09-24 02:39:52 +04:00
sergefp@mysql.com
d0a97917a2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug13419
2005-09-24 01:55:09 +04:00
jimw@mysql.com
844d1244d7
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-23 14:44:41 -07:00
sergefp@mysql.com
d90b988da7
BUG#12232: Addressing docs team feedback: s/inequal/unequal/
2005-09-24 01:39:50 +04:00
paul@kite-hub.kitebird.com
d69589c1c8
Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-09-23 16:00:48 -05:00
paul@kite-hub.kitebird.com
67a643f931
mysqld.cc:
...
Fix out-of-order status variable.
2005-09-23 15:59:32 -05:00
jimw@mysql.com
e80673d69d
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-23 13:59:14 -07:00
paul@kite-hub.kitebird.com
b83f29d56d
mysqld.cc:
...
Fix out-of-order status variable.
2005-09-23 14:14:34 -05:00
heikki@hundin.mysql.fi
7dc5e67b59
row0ins.c:
...
Fix a compilation error: Visual C++ does not seem to allow variable declaration in the middle of a program block
2005-09-23 21:36:07 +03:00
dlenev@mysql.com
19b2cd58e8
Fix for yet another compilation failure on Windows which was introduced during
...
work on WL#2787 "Add view definer/owner to the view definition (.frm) to check
privileges on used tables and stored routines when using a VIEW."
(aka bug #13402 "Windows VS 2003 Compiler error")
2005-09-23 21:28:47 +04:00
jimw@mysql.com
3cd331c29f
Merge mysql.com:/home/jimw/my/mysql-5.0-13361
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-23 10:03:29 -07:00
dlenev@mysql.com
d68f3ea17d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13407
2005-09-23 18:30:08 +04:00
osku@127.(none)
93671fb91e
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql/5.0/clean
2005-09-23 16:46:59 +03:00
osku@127.(none)
d563a01afe
Merge 127.(none):/home/osku/mysql/5.0/clean
...
into 127.(none):/home/osku/mysql/5.0/3443
2005-09-23 16:44:25 +03:00
osku@127.(none)
d61708d1c9
Fix bug #3443 , better foreign key error messsages.
2005-09-23 16:22:27 +03:00
dlenev@mysql.com
77ac122350
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13407
2005-09-23 17:10:05 +04:00
dlenev@mysql.com
3f9163b074
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-rmuqf
2005-09-23 17:03:49 +04:00
dlenev@mysql.com
b37c586ffe
Fixed race conditions in rpl_multi_update and rpl_multi_delete tests which
...
caused spurious test failures.
2005-09-23 16:59:19 +04:00
msvensson@neptunus.(none)
22c1bb4e6d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-23 14:38:26 +02:00
msvensson@neptunus.(none)
d55eeed8fd
Merge from 4.1 to 5.0
2005-09-23 14:37:22 +02:00
osku@127.(none)
06077eb1eb
InnoDB: Minor fixes.
2005-09-23 14:31:31 +03:00
sergefp@mysql.com
40ba88ca07
Fix for BUG#13419: In "ref" optimizer, take into account that item=Item_func_in(x,y) is
...
not equivalent to "x=y" when item->negated == TRUE.
2005-09-23 13:43:20 +04:00
osku@127.(none)
945ea8a98b
Merge 127.(none):/home/osku/mysql/5.0/clean
...
into 127.(none):/home/osku/mysql/5.0/13315
2005-09-23 11:22:05 +03:00
osku@127.(none)
e6b3261556
InnoDB: Fix bug #13315 , index columns having a maximum length of 767.
2005-09-23 11:20:34 +03:00
msvensson@neptunus.(none)
02c7645cc1
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-23 09:18:56 +02:00
brian@zim.(none)
f5c00b0dbd
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/fix-5.0
2005-09-22 19:46:16 -07:00
brian@zim.(none)
8eea3e5be0
This fixed bug 13369. Note, I dislike goto's as well.
...
The alias structure now is a bit more simple and just uses a pointer to replace with the currect name. The giant case statement should go away in the next patch.
2005-09-22 16:58:09 -07:00
konstantin@mysql.com
2d4c54ba1b
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
msvensson@neptunus.(none)
4f03ab4943
Bug #13384 mysqltest, no protocol when script contains only lines with eval
2005-09-22 21:52:04 +02:00
msvensson@neptunus.(none)
4700631aa8
Bug #13384 mysqltest, no protocol when script contains only lines with eval
2005-09-22 21:24:57 +02:00
dlenev@mysql.com
87dcb3c6f5
Fix for bug #13407 "Remote connecting crashes server" and couple of similar
...
problems which were introduced during work on WL#2787 "Add view definer/owner
to the view definition (.frm) to check privileges on used tables and stored
routines when using a VIEW."
In some cases it is better to use value from Security_context::host_or_ip
instead of value from Security_context::host since the latter can be NULL
in certain situations (When we can't resolve hostname or we have not done
this yet).
2005-09-22 23:03:53 +04:00
jimw@mysql.com
90d6195f04
Fix handling of NULL values in decimal fields in FORMAT(). (Bug #13361 )
2005-09-22 11:40:22 -07:00
joerg@mysql.com
cb77a6accb
Fixes needed to build 5.0.13 on Windows:
...
- reflect two "Makefile.am" changes in the respective "VC project" files,
- correct a typo in a (normally) unused macro parameter.
2005-09-22 18:57:07 +02:00
msvensson@neptunus.(none)
306dcf0620
Merge neptunus.(none):/home/msvensson/mysql/bug13164/my50-bug13164
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-22 12:29:11 +02:00
msvensson@neptunus.(none)
139601f997
Bug #13164 yassl: "SSL connection error" on several platforms
...
- it's a requirement fo yaSSL that either /dev/urandom or /dev/random is available on the target system.
- Added a fix that tries to open /dev/random if /dev/urandom is not available.
2005-09-22 12:19:09 +02:00
marko@hundin.mysql.fi
ff8127ffaa
InnoDB: correct two misleading comments
2005-09-22 13:09:14 +03:00
ramil@mysql.com
5cf4eb0e26
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b11553
2005-09-22 13:05:48 +05:00
ramil@mysql.com
8660ccd9e1
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b11553
2005-09-22 12:53:37 +05:00
gluh@mysql.com
47807ba5ab
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Merge/4.1
2005-09-22 12:46:50 +05:00
gluh@eagle.intranet.mysql.r18.ru
88ef33e542
Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
...
set auto_increment_field_not_null to true to preserve zero values
for autoincrement fields during LOAD DATA execution if
NO_AUTO_VALUE_ON_ZERO sql mode is set
2005-09-22 12:46:01 +05:00
jonas@perch.ndb.mysql.com
2a002fc1ef
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-22 09:20:23 +02:00
jonas@perch.ndb.mysql.com
1694447823
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 09:13:14 +02:00
jonas@perch.ndb.mysql.com
1f84a13977
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-22 09:10:11 +02:00
jonas@perch.ndb.mysql.com
f5761aa4e8
Add testcase for bug#13316
...
ndb big alter table
2005-09-22 09:09:27 +02:00
ramil@mysql.com
92306dd089
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b11553
2005-09-22 11:46:54 +05:00
ramil@mysql.com
66929c9540
a fix ( #11553 : gives error if aggregate user-defined function in HAVING clause).
2005-09-22 11:45:16 +05:00
ramil@mysql.com
d9eb8958a2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b11553
2005-09-22 11:39:01 +05:00
jonas@perch.ndb.mysql.com
ac29fd0051
bug#13316
...
ndb alter table with big dicttabinfo
send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE
2005-09-22 08:35:27 +02:00