msvensson@neptunus.(none)
8238f355dc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554
2006-01-16 13:10:14 +01:00
msvensson@neptunus.(none)
81cef460b1
Merge bk-internal:/home/bk/mysql-4.0
...
into neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
2006-01-16 12:48:16 +01:00
msvensson@neptunus.(none)
e795f369c4
Merge neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
...
into neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554
2006-01-16 12:46:07 +01:00
msvensson@neptunus.(none)
b54920bce7
BUG#6554 Problem Building MySql on Fedora Core 3
...
- Remove the local static var
2006-01-16 12:17:30 +01:00
aivanov@mysql.com
c46f11fa96
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss14
2006-01-15 14:56:38 +03:00
aivanov@mysql.com
ee2b765751
Changes from innodb-4.1-ss14 snapshot
...
Fixed BUG#14056: Column prefix index on UTF-8 primary key
causes "Can't find record.."
Also fixed bug 15991.
2006-01-15 14:50:47 +03:00
gvb@phoenix.(none)
8885c80da2
item_timefunc.cc:
...
fix for bug #15828 after review
2006-01-14 16:06:51 +01:00
gvb@phoenix.(none)
421eededd3
item_timefunc.cc:
...
fix for bug#15828 after review
2006-01-14 09:53:12 +01:00
konstantin@mysql.com
48d48bc936
A fix and a test case for Bug#12734 " prepared statement may
...
return incorrect result set for a select SQL request"
2006-01-14 04:55:07 +03:00
joerg@mysql.com
1155bf20d9
Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1
2006-01-13 17:45:01 +01:00
joerg@mysql.com
bccbc740c3
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1
2006-01-13 17:26:16 +01:00
joerg@mysql.com
9d4562e5fe
extra/comp_err.c + scripts/mysqld_multi.sh :
...
Copyright string fixes (bug#16106)
2006-01-13 16:25:20 +01:00
gvb@phoenix.(none)
45db1c24b0
fix for bug#15828
...
problem was not checking 2nd parameter of str_to_date against NULL
2006-01-13 14:42:46 +01:00
bar@mysql.com
977731b3fc
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15377
2006-01-13 16:21:44 +04:00
bar@mysql.com
78e93fbbcf
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15377
2006-01-13 14:22:53 +04:00
bar@mysql.com
b061cacb0b
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15377
2006-01-13 14:16:16 +04:00
jonas@perch.ndb.mysql.com
972723b02e
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-01-13 09:29:24 +01:00
stewart@mysql.com
e5e61eb15b
BUG#11331 "Warning: could not add log destination" message does not provide enough info
...
Implement error reporting to Logger and associated classes.
2006-01-13 11:43:50 +11:00
jani@ua141d10.elisa.omakaista.fi
8c6a32b997
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2006-01-12 17:47:58 +02:00
jani@ua141d10.elisa.omakaista.fi
af845f6eff
NetWare specific change to increase thread stack size.
...
Changes to Netware specific mysqld_safe.c
2006-01-12 15:10:12 +02:00
monty@mysql.com
4d0fd66bdd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-01-12 14:40:39 +02:00
bar@mysql.com
45c84d0aa9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15581
2006-01-12 11:13:34 +04:00
konstantin@mysql.com
9105d06dd6
A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
...
rename sha1_* to mysql_sha1_*
2006-01-11 17:31:52 +03: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
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
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
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@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@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
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
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
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
konstantin@mysql.com
f7d6fa6f17
A fix for Bug#7209 "Client error with "Access Denied" on updates
...
when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.
2006-01-04 17:35:30 +03:00
joerg@mysql.com
d3f7770157
Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1
2006-01-04 13:53:18 +01:00
jonas@perch.ndb.mysql.com
aa6400a356
ndb - Make testDatabuffer clean up tables
2006-01-04 11:38:58 +01:00
pekka@mysql.com
ec753efd43
ndb - wl#2972 (4.1) copy detached trigger fix from 5.0
2005-12-31 10:54:36 +01:00
msvensson@neptunus.(none)
6de9519966
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
2005-12-29 09:19:25 +01:00
evgen@moonbone.local
535b23bec5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14583-bug-4.1-mysql
2005-12-28 16:00:10 +03:00
msvensson@neptunus.(none)
2fb6cb5a5a
BUG#15775 "drop user" command does not refresh acl_check_hosts
...
- DROP USER command didn't reload the acl_check_hosts cache causing subsequent
connect's via TCP to fail randomly.
- 4.1 version
2005-12-28 09:23:27 +01:00
evgen@moonbone.local
d91cbf34ff
Fix bug#14583
...
When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result.
Because my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.
my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.
2005-12-27 20:16:59 +03:00
ingo@mysql.com
44ef4989bb
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug5390
2005-12-27 10:36:19 +01:00
ingo@mysql.com
9014fef4f9
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug5390
2005-12-27 10:35:33 +01:00
serg@serg.mylan
7b049bf2cd
correct help text
2005-12-23 12:38:22 +01:00
jonas@perch.ndb.mysql.com
1d4ab650f0
bug#15908 - ndb
...
When scan is completed, but lqhkeyreq is outstanding on primary replica and
starting node dies, scan will not be closed leading to error handling of failed
node not completing
2005-12-21 16:31:58 +01:00
stewart@mysql.com
29454a64ed
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup
2005-12-21 12:44:26 +11:00