monty@mysql.com
4ab6bc4b43
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-03-27 12:07:59 +03:00
monty@mysql.com
3dcbbb7c4d
Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"
...
This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library
2006-03-27 12:02:23 +03:00
msvensson@shellback.(none)
3495ba51f7
Fix type "enfif" -> "endif"
2006-03-23 20:59:23 +01:00
kent@mysql.com
9d387d1c6e
Merge
2006-03-23 17:41:53 +01:00
kent@mysql.com
3c93e6efa5
config-win.h:
...
If CYBOZU defined, set character sets etc
2006-03-23 17:25:49 +01:00
bar@mysql.com
8620ac4d64
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15376
2006-03-23 14:29:43 +04:00
bar@mysql.com
796647f711
m_ctype.h:
...
Bug##15376
After merge fix: removing redundant macros.
2006-03-23 14:17:48 +04:00
bar@mysql.com
36e92839fc
m_ctype.h:
...
Removing duplicate old definition.
After merge fix for bug#15375
2006-03-23 13:05:13 +04:00
bar@mysql.com
1008146d86
Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 12:41:28 +04:00
bar@mysql.com
82de23010b
Merge mysql.com:/usr/home/bar/mysql-4.1.b17374
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 10:17:31 +04:00
bar@mysql.com
da8a68b4ca
Bug#17374: select ... like 'A%' operator fails to find value on columuns with key
...
Fixed that LIKE worked case insensitively for latin2_czech_cs,
which was wrong for a case sensitive collation.
2006-03-20 16:28:25 +04:00
msvensson@shellback.(none)
2fe3e20597
Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-16 09:37:47 +01:00
msvensson@shellback.(none)
42a3ff3f99
Bug#18195 MySQL on Windows not built with YaSSL correctly
...
- Add HAVE_OPENSSL and HAVE_YASSL to config-win.h
2006-03-14 14:51:48 +01:00
ingo@mysql.com
972c2a4abc
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug14980
2006-03-10 22:28:50 +01:00
joerg@mysql.com
cc8faec9b6
Include the system header file "pthread.h" even in a non-threaded build.
...
Fixes bug#15861
2006-03-10 17:13:54 +01:00
ingo@mysql.com
1173185891
Merge mysql.com:/home/mydev/mysql-4.1-bug14980
...
into mysql.com:/home/mydev/mysql-5.0-bug14980
2006-03-10 15:06:04 +01:00
ingo@mysql.com
d0c6eb885d
Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
...
For "count(*) while index_column = value" an index read
is done. It consists of an index scan and retrieval of
each key.
For efficiency reasons the index scan stores the key in
the special buffer 'lastkey2' once only. At the first
iteration it notes this fact with the flag
HA_STATE_RNEXT_SAME in 'info->update'.
For efficiency reasons, the key retrieval for blobs
does not allocate a new buffer, but uses 'lastkey2'...
Now I clear the HA_STATE_RNEXT_SAME flag whenever the
buffer has been polluted. In this case, the index scan
copies the key value again (and sets the flag again).
2006-03-10 15:03:04 +01:00
msvensson@neptunus.(none)
44a2855382
Bug#17716 Slave crash in net_clear on qnx
...
- Set FD_SETSIZE before including "sys/select.h"
2006-02-27 10:08:35 +01:00
monty@mysql.com
82b77cdd90
Fixes to embedded server to be able to run tests with it
...
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
msvensson@neptunus.(none)
40fe710394
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
holyfoot@deer.(none)
053d90a234
WL#2645 (CHECK TABLE FOR UPGRADE)
...
necessary implementation in the server
mysql_upgrade script added
2006-02-17 10:52:32 +04:00
msvensson@neptunus.(none)
cb9b610586
#define popen(A,B) _popen((A),(B))
2006-02-16 23:05:15 +01:00
konstantin@mysql.com
98091b152a
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-02-02 18:17:18 +03:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a69827f152
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 09:29:59 -05:00
serg@serg.mylan
ae3d815b41
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
jani@ua141d10.elisa.omakaista.fi
617585eb33
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-01-12 20:28:23 +02: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
reggie@linux.site
b03abd2888
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into linux.site:/home/reggie/work/mysql-5.0
2006-01-11 16:34:51 -06:00
reggie@linux.site
8de137a3aa
simple Windows compile fixes.
2006-01-11 16:18:11 -06:00
konstantin@mysql.com
4d272aba67
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-11 17:49:56 +03: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
anozdrin@mysql.com
b04b851ef9
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
...
There are two main idea of this fix:
- introduce a common function for server and client to split user value
(<user name>@<host name>) into user name and host name parts;
- dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03: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@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
serg@serg.mylan
8dc77f267b
merged
2006-01-06 18:26:59 +01: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
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
knielsen@mysql.com
f13dff7a72
EADDRINUSE is not defined on Windows.
2006-01-04 16:38:54 +01:00
konstantin@mysql.com
6502e6bba7
Merge mysql.com:/opt/local/work/mysql-4.1-7209-new
...
into mysql.com:/opt/local/work/mysql-5.0-merge
2006-01-04 17:49:45 +03: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
serg@serg.mylan
30c09d6dc0
merged
2006-01-03 18:12:03 +01:00
serg@serg.mylan
14f94dc0ca
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
joerg@mysql.com
59ea719936
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0
2005-12-29 13:41:56 +01:00
kent@mysql.com
eaffb7eb73
config-win.h:
...
Backported Windows MAX_INDEXES handling from 5.1
2005-12-28 18:35:22 +01:00
serg@serg.mylan
d5d6b51422
remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source
2005-12-24 14:32:50 +01:00
ingo@mysql.com
340358481d
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0
2005-12-14 18:20:19 +01:00
ramil@mysql.com
fa5f802746
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/usr/home/ram/work/mysql-5.0-release
2005-12-13 16:49:37 +04:00
ramil@mysql.com
8f1b038e72
Fix for bug#15209: MySQL installation problem on Windows ME.
2005-12-13 12:20:05 +04:00