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
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
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
kent@mysql.com
9f399bbabd
my_pthread.h:
...
Bug#15629: Increased thread stack for all 64 bit platforms,
else test case 'sp' and 'call fib(20)' gives stack overrun
2005-12-13 00:45:32 +01:00
ingo@mysql.com
270cad2f63
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-07 19:47:55 +01:00
ingo@mysql.com
a588622a66
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-06 08:19:23 +01:00
serg@serg.mylan
e5e22395c9
compatibility define for Bug#15293
2005-12-05 20:47:15 +01:00
kent@mysql.com
9fd13ba93d
my_global.h:
...
Make __cxa_pure_virtual weak symbol
2005-12-03 20:52:34 +01:00
ingo@mysql.com
6b18dbef31
Bug#10932 - Building server with key limit of 128, makes test cases fail
...
Allow for configuration of the maximum number of indexes per table.
Added and used a configure.in macro.
Replaced fixed limits by the configurable limit.
Limited MyISAM indexes to its hard limit.
Fixed a bug in opt_range.cc for many indexes with InnoDB.
Tested for 2, 63, 64, 65, 127, 128, 129, 255, 256, and 257 indexes.
Testing this part of the bugfix requires rebuilding of the server
with different options. This cannot be done with our test suite.
Therefore I added the necessary test files to the bug report.
If you repeat the tests, please note that the ps_* tests fail for
everything but 64 indexes. This is because of differences in the
meta data, namely field lengths for index names etc.
2005-12-02 16:27:18 +01:00
knielsen@mysql.com
ce63d425b2
Merge mysqldev@production:my/mysql-4.1.16-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.0
2005-11-28 16:29:07 +01:00
knielsen@mysql.com
9248dfc840
Minor Win32 compile fixes for 4.1.16 release.
2005-11-28 15:07:20 +01:00
serg@serg.mylan
122b597fc3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-26 08:56:59 +01:00
serg@serg.mylan
10df921c96
documenting HA_STATUS_xxx flags
2005-11-26 08:54:13 +01:00
konstantin@mysql.com
9fd6204ad1
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-11-25 13:57:13 +03:00
monty@mysql.com
f5804869e3
Don't use PATH_MAX for FN_REFLEN as this uses too much stack space
...
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk
2005-11-24 02:36:28 +02:00
msvensson@neptunus.(none)
9301123eb3
Bug #14514 Creating table with packed key fails silently
...
- Backport from 5.0
2005-11-21 12:27:58 +01:00
kent@mysql.com
bcdd552d6e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 11:20:52 +01:00
ingo@mysql.com
74781d6559
Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
...
Version for 5.0.
It fixes three problems:
1. The cause of the bug was that we did not check the table version for
the HANDLER ... READ commands. We did not notice when a table was
replaced by a new one. This can happen during ALTER TABLE, REPAIR
TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
Though the function comment clearly said it must.
I changed the code so that the locking is done when required. I call
the fix for this problem "the secondary fix".
3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in
concur with FLUSH TABLES WITH READ LOCK. I call the fix for this
problem "the 5.0 addendum fix".
2005-11-15 21:57:02 +01:00
SergeyV@selena.
450909f0d3
Merge selena.:H:/MYSQL/bkt/mysql-5.0-rel
...
into selena.:H:/MYSQL/bkt/mysql-5.0
2005-11-14 16:16:29 +03:00
SergeyV@selena.
00990f9774
Fixes bug #13377 . my_open() & my_create() functions changed to use
...
my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to
allow deleting opened files. my_sopen() implementation is added to
support this functionality.
2005-11-14 16:01:10 +03:00
kent@mysql.com
7966c4ddac
config-win.h:
...
Disabled yaSSL support for now
2005-11-14 04:07:24 +02:00
kent@mysql.com
4742f585b1
Merge
2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-04 01:15:35 +01:00
msvensson@neptunus.(none)
8e7dfad543
BUG#14514 Creating table with packed key fails silently
2005-11-02 15:53:04 +01:00
sergefp@mysql.com
09a4d0c7a7
4.1->5.0 merge
2005-10-29 02:36:57 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
1fdee50f16
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
2005-10-28 14:04:06 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
28cb5aefcf
NetWare specific change to use a LibC API instead of a
...
kernel function to prevent CPU hogs.
2005-10-28 14:01:00 +03:00
jani@ua141d10.elisa.omakaista.fi
74b8b449a4
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-28 03:26:56 +03:00
kent@mysql.com
a49940c359
Makefile.am:
...
Added "base64.h" to enable "make dist" to work
2005-10-28 02:17:41 +02:00
jani@ua141d10.elisa.omakaista.fi
cbe21a8eb6
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-27 23:43:20 +03:00
reggie@big_geek.
dec2640dbf
changed define from EXTERN_C to EXTERNC so it doesn't conflict with
...
another macro defined in the Windows header files.
2005-10-25 23:51:05 -05:00