svoj@april.(none)
70bb06685b
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1
2006-01-18 00:02:25 +04:00
msvensson@devsrv-b.mysql.com
df2fefd1e9
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug14634/my41-bug14634
...
into devsrv-b.mysql.com:/space/magnus/my41-bug14634
2006-01-17 19:40:40 +01:00
joerg@mysql.com
0caa010440
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/M40/mysql-4.0
2006-01-17 17:37:07 +01:00
msvensson@neptunus.(none)
c4ddf67710
Bug #14634 Running out of diskspace on tmpdir returns an inappropriate error
2006-01-17 16:48:26 +01:00
svoj@april.(none)
f84b301bd1
BUG#3074: Unversioned symbols in shared library
...
libmysqlclient versioning when linked with GNU ld.
2006-01-17 18:51:08 +04:00
joerg@mysql.com
e2b3b1f398
Increase the version number to 4.1.18
2006-01-17 12:55:30 +01:00
joerg@mysql.com
38e5a8f6d8
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2006-01-17 09:05:18 +01:00
konstantin@mysql.com
59b1c9c87a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-root
2006-01-17 01:13:55 +03:00
konstantin@mysql.com
739ba76d64
A fix for Bug#13337 "ps test fails if configure wo/ usc2"
2006-01-17 01:03:03 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2659e797ed
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2006-01-16 21:23:29 +02:00
andrey@lmy004.
7b2238d484
Merge
2006-01-16 16:21:41 +01:00
gvb@phoenix.(none)
8c69d6abaf
date_formats.test:
...
fix for bug #15828 after review
doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values
2006-01-16 15:46:37 +01:00
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