holyfoot@hf-ibm.(none)
1851a38b2f
Fix for bug #10493 (SJIS fields are not correctly saved)
2005-05-10 02:15:59 +05:00
mwagner@ultrafly.mysql.com
b0774772d9
errmsg.txt:
...
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195 ).
2005-05-08 19:14:28 +02:00
jimw@mysql.com
17b6789cf2
Merge
2005-05-07 08:35:55 -07:00
gbichot@production.mysql.com
a1948f769c
[backport of 4.1, because 4.0 autobuild now hits the same problem;
...
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
2005-05-07 11:35:14 +02:00
antony@ltantony.mysql.com
67bcc9707f
Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616
...
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
2005-05-06 16:16:05 +01:00
antony@ltantony.mysql.com
bf17b75a28
Bug#6616
...
MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
Infinite loop caused by missing update to thd version.
2005-05-06 14:42:28 +01:00
rburnett@bk-internal.mysql.com
c95e33fadf
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
...
into bk-internal.mysql.com:/users/rburnett/bug9721
2005-05-06 15:10:01 +02:00
jani@ibmlab.site
fa25b9b49d
A fix for Bug#8467.
2005-05-06 12:18:37 +03:00
shuichi@mysql.com
f0fb08dd79
Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql
2005-05-05 10:46:14 -07:00
shuichi@mysql.com
720418fe46
Added cp932 character set
2005-05-05 10:36:17 -07:00
rburnett@bk-internal.mysql.com
e7d7c0f236
Bug #9721 net_write_timeout not used on Windows
...
Added an extra parameter to all calls to timeout().
1 means we want to set the write timeout
0 means we wnat to set the read timeout
viossl.c:
Add which parameter to ssl timeout routine
vio_priv.h:
Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
Add which parameter to vio_timeout sigs
net_serv.cc:
Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
Set the appropriate timeout in vio_timeout
2005-05-05 17:17:57 +02:00
tulin@dl145b.mysql.com
ccac26a27a
logging_ok:
...
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
BUG#10287
2005-05-04 10:16:03 +02:00
evgen@moonbone.local
b11705a2b0
Fix bug #9703 "Error 1032 with GROUP BY query and large tables"
...
Reset old error if tmp table was successfully created.
Test data is large and can be found in bug report along with test query.
2005-04-29 21:19:39 +04:00
acurtis@xiphis.org
e82edda6c6
Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
...
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
2005-04-08 21:40:50 +01:00
gluh@mysql.com
decfc86fbb
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f
Fix for bug #9286 : SESSION/GLOBAL should be disallowed for user variables
2005-04-06 14:13:06 +05:00
serg@serg.mylan
4962ba7f8a
merged
2005-04-05 19:44:39 +02:00
serg@serg.mylan
3c3defaa0a
add changeset key to the bk commit mail
2005-04-05 15:16:15 +02:00
kent@mysql.com
bb713b13df
Do-compile:
...
Added option --with-big-tables
2005-03-30 02:41:08 +02:00
serg@serg.mylan
2dd1847bc2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-26 19:49:24 +01:00
serg@serg.mylan
091f069671
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-23 21:10:01 +01:00
gbichot@quadita2.mysql.com
19499229ed
"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
...
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
2005-03-23 19:19:36 +01:00
serg@serg.mylan
1ccb9dd214
don't allow to commit as mysqldev
2005-03-18 09:00:46 +01:00
paul@frost.snake.net
cf5f436236
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
2005-03-17 11:43:56 -06:00
paul@frost.snake.net
86f9b77756
Update URL.
2005-03-17 11:33:07 -06:00
gbichot@quadxeon.mysql.com
7ee2ecbe5d
Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
...
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon
2005-03-17 17:00:44 +01:00
gbichot@quadxeon.mysql.com
3cb85a4740
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
2005-03-17 15:51:52 +01:00
gbichot@quadxeon.mysql.com
d823bee92a
safer creation of temp files used in replication of LOAD DATA INFILE.
...
When we come to create these, they may already exist and it's necessary to delete these old, useless copies.
2005-03-17 14:39:39 +01:00
paul@snake-hub.snake.net
4af3c8a23a
mysql.1.in:
...
Fix path that needs no parameterization.
2005-03-14 19:59:00 -06:00
reggie@mdk10.(none)
75e1b9e765
Bug #6660 mysqldump creates bad pathnames on Windows
...
This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows. However, this patch fixes the bug in mysqldump.c
mysqldump.c:
Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows
2005-03-14 16:47:35 -06:00
msvensson@neptunus.(none)
13ec961c3a
BUG#6554 Problem Building MySql on Fedora Core 3
...
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3
2005-03-14 12:07:49 +01:00
georg@lmy002.wdf.sap.corp
473f2f9409
New Project files for Windows Ithanium 64-bit builds
2005-03-06 14:22:28 +01:00
igor@linux.local
6d7862aeaf
logging_ok:
...
Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
Added a test case for bug #8893 .
opt_sum.cc:
A misplaced initialization for the returned parameter
prefix_len in the function find_key_for_maxmin caused
usage of a wrong key prefix by the min/max optimization
in cases when the matching index was not the first index
that contained the min/max field.
2005-03-04 20:24:13 -08:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 13:00:00 +02:00
jimw@mysql.com
7e499384b4
Merge mysql.com:/home/jimw/my/mysql-4.0-clean
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:46:33 -08:00
jimw@mysql.com
4decbce5ea
Merge mysql.com:/home/jimw/my/mysql-4.0-no-merge-spam
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-17 13:45:20 -08:00
jimw@mysql.com
af41813cff
Make post-commit trigger not send emails when the message would not contain
...
any actual changes. (Often the case in merges where the only change involves
renumbering ChangeSet entries.)
2005-02-16 14:03:16 -08:00
dean@mysql.com
ace1d892f0
Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
...
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-15 17:30:40 -06:00
dean@mysql.com
c962d060ac
ft_nlq_search.c:
...
Added bounds check to avoid accessing unallocated FT_DOC array. (BUG #8522 )
2005-02-15 17:27:23 -06:00
svoj@mysql.com
643b602832
Bug#8351
...
Fix for crash when using a double quote in boolean fulltext query.
2005-02-14 18:54:12 +04:00
igor@rurik.mysql.com
e528a1c777
Manual merge
2005-02-11 10:44:03 -08:00
jimw@mysql.com
6daef0229c
Fix extra blank line in emails sent by post-commit trigger.
2005-02-10 20:31:23 -08:00
jimw@mysql.com
3d265e9777
Merge commit trigger
2005-02-10 14:32:01 -08:00
jimw@mysql.com
b3d2e434ee
Merge bk-internal:/home/bk/mysql-4.0
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-10 14:23:05 -08:00
ramil@mysql.com
0d7228fff2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1
2005-02-04 15:53:14 +04:00
ramil@mysql.com
f76ccd63cb
type_float.result.es updated.
2005-02-04 15:35:08 +04:00
ramil@mysql.com
611e0e3e82
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/usr/home/ram/work/4.0
2005-02-04 13:59:13 +04:00
mikael@orca.ndb.mysql.com
0bb030a145
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into orca.ndb.mysql.com:/export/home/mikael/mysql-4.1
2005-02-03 21:13:28 +01:00
brian@zim.(none)
630e020d3e
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-01-31 11:03:57 -08:00
tulin@mysql.com
bc317a19ce
BUG#8208 don't fsync unless something has been written
...
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1
2005-01-31 11:47:10 +01:00