ingo@mysql.com
fc85125a93
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-773/mysql-5.0
2006-01-10 21:57:47 +01:00
ingo@mysql.com
4c447ea454
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2006-01-10 20:03:28 +01:00
jani@hasky.mysql.fi
5182d40412
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hasky.mysql.fi:/home/jani/mysql-5.0
2006-01-10 20:56:24 +02:00
aivanov@mysql.com
cdf3e4c02e
Post-merge changes
2006-01-10 21:03:02 +03:00
jani@ua141d10.elisa.omakaista.fi
d9d6dfea3a
Changed function prototype.
2006-01-10 19:19:56 +02:00
monty@mysql.com
2970e71ce8
Re-run fix-fields on condition if table was reopened in HANDLERREAD
2006-01-10 19:13:12 +02:00
jani@ua141d10.elisa.omakaista.fi
df801decef
Fixed refresh_status function.
2006-01-10 18:56:23 +02:00
aivanov@mysql.com
2871e85f2e
Merge mysql.com:/home/alexi/dev/mysql-4.1-15805
...
into mysql.com:/home/alexi/dev/mysql-5.0-15805
2006-01-10 19:22:47 +03:00
monty@mysql.com
3143daf8ac
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-01-10 18:03:54 +02:00
aivanov@mysql.com
16004acce1
Commenting out testcases which cause type_time.test failure.
...
To be uncommented after fixing bug 15805.
2006-01-10 17:57:46 +03:00
ingo@mysql.com
0f7f9c67d6
Merge mysql.com:/home/mydev/mysql-4.1-bug5390
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2006-01-10 15:56:47 +01:00
msvensson@neptunus.(none)
a09473e652
Fix for crashing mysqltest
2006-01-10 15:56:30 +01:00
aelkin@mysql.com
9f0b5092e3
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-10 14:40:05 +02:00
aelkin@mysql.com
d7eb02f439
BUG#9483 test was overworked to account reviews finally to leave only REVOKE check.
...
There is a specific rpl_ignore_grant test case for GRANT.
2006-01-10 13:44:08 +02:00
msvensson@neptunus.(none)
86e8958a4e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-10 09:57:59 +01:00
igor@rurik.mysql.com
32c7a0b62f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-09 21:46:33 -08:00
igor@rurik.mysql.com
a3a2f065fb
Ajustement after merge
2006-01-09 21:44:42 -08:00
igor@rurik.mysql.com
e4b1399b5a
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-01-09 15:20:01 -08:00
msvensson@neptunus.(none)
e0d3410a3e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-09 20:12:18 +01:00
msvensson@neptunus.(none)
8dab567f25
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 18:06:16 +01:00
monty@mysql.com
3c808fe928
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-01-09 18:52:22 +02:00
msvensson@neptunus.(none)
33d5dc041d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 17:18:49 +01:00
msvensson@neptunus.(none)
4bcf141799
Bug #15598 Server crashes in specific case during setting new password
...
- Comparing host string against NULL caused crash.
- If host.hostname is NULL treat it as ""
2006-01-09 17:12:26 +01:00
msvensson@neptunus.(none)
0e7953d8b3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
2006-01-09 15:31:38 +01:00
msvensson@devsrv-b.mysql.com
74d5ae2437
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into devsrv-b.mysql.com:/space/magnus/my41-bug15598
2006-01-09 15:29:25 +01:00
ingo@mysql.com
211734c36e
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug5390
2006-01-09 12:56:09 +01:00
ingo@mysql.com
e72e4fc35f
Merge mysql.com:/home/mydev/mysql-4.0-bug5390
...
into mysql.com:/home/mydev/mysql-4.1-bug5390
2006-01-09 12:54:24 +01:00
msvensson@neptunus.(none)
7bda1e9191
Merge neptunus.(none):/home/msvensson/mysql/bug15598/my41-bug15598
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 11:16:29 +01:00
msvensson@devsrv-b.mysql.com
175a946e55
Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598
...
into devsrv-b.mysql.com:/space/magnus/my41-bug15598
2006-01-09 10:57:28 +01:00
msvensson@neptunus.(none)
2a05a6ba87
Bug #15598 Server crashes in specific case during setting new password
...
- When acl_user->host.hostname is NULL compare it as ""
2006-01-09 10:31:07 +01:00
monty@mysql.com
1378eda3c4
After merge fix (Lines lost in manual merge)
2006-01-09 11:10:49 +02:00
msvensson@neptunus.(none)
dad7268273
Add yassl libs to libmysqlclient_r as well.
...
Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
Similiar to readline)
2006-01-09 10:01:07 +01:00
igor@rurik.mysql.com
7acc12de98
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-08 19:16:36 -08:00
pekka@mysql.com
44ea4f5441
ndb - wl#2972 ndb api test_event_merge 5.0+5.1
2006-01-09 01:09:42 +01:00
monty@mysql.com
c44d6124ed
Merge mysql.com:/home/my/mysql-4.0
...
into mysql.com:/home/my/mysql-4.1
2006-01-08 19:07:49 +02:00
igor@rurik.mysql.com
bf78fd5438
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-07 23:10:08 -08:00
igor@rurik.mysql.com
05947d9916
Fixed bug #14274 : a query with a having clause containing only set function returned a wrong result set.
2006-01-07 23:00:06 -08:00
knielsen@mysql.com
8139f36417
BUG#16282: Remove unused gcc.cpp linker input that causes failure in make -j.
2006-01-08 07:42:40 +01:00
igor@rurik.mysql.com
d2cfad167b
Fixed bug #16016 : MIN/MAX optimization was not applied to views.
2006-01-06 22:28:26 -08:00
monty@mysql.com
fd4a040325
Fixes during review of new pushed code:
...
Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Safety fix for bug #13855 "select distinct with group by caused server crash"
2006-01-06 21:42:17 +02:00
jimw@mysql.com
d8a4aafe33
Merge mysql.com:/home/jimw/my/mysql-5.0-14212
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-01-06 08:34:55 -08:00
knielsen@mysql.com
be8f21e8f1
Fix compile failure on QNX.
2006-01-06 14:30:25 +01:00
monty@mysql.com
64cab9d767
After merge fix and a safety fix for handler
2006-01-06 12:48:14 +02:00
monty@mysql.com
b0a5ea01ef
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-01-06 01:08:48 +02:00
monty@mysql.com
6e22e29de6
Review fixes of new pushed code
...
- Fixed tests
- Optimized new code
- Fixed some unlikely core dumps
- Better bug fixes for:
- #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
- #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null
2006-01-06 00:47:49 +02:00
knielsen@mysql.com
b197c9abea
Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-01-05 23:41:10 +01:00
knielsen@mysql.com
71215d0cbc
Port to Win64/x64 in Visual Studio 2005
2006-01-05 23:39:45 +01:00
jimw@mysql.com
7d551b8a4e
Merge mysql.com:/home/jimw/my/mysql-5.0-15185
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-01-05 10:27:06 -08:00
knielsen@mysql.com
ed7c09da36
Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-01-05 10:45:34 +01:00
konstantin@mysql.com
1938052ba6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-merge
2006-01-04 21:47:00 +03:00