mwagner@ultrafly.mysql.com
8945bb5d1d
Merge bk-internal:/home/bk/mysql-4.1
...
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1
2005-05-08 19:16:37 +02: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
lenz@mysql.com
f09fc52bc4
- Windows compile fix for ha_blackhole.cc - use #include "mysql_priv.h" instead of
...
#include <mysql_priv.h>
2005-05-07 22:04:10 +02:00
antony@ltantony.mysql.com
a5e9523364
Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666
...
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
2005-05-07 14:46:54 +01:00
antony@ltantony.mysql.com
687417be74
Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725
...
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
2005-05-07 14:43:03 +01:00
antony@ltantony.mysql.com
1af671bf36
Bug#9666 - Can't use 'DEFAULT FALSE' for column of type bool
...
Fix bug by moving TRUE/FALSE in with other literals.
2005-05-07 13:51:29 +01:00
antony@ltantony.mysql.com
1ebc9e37ea
Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update"
...
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
Fix so that protocol doesn't break by properly ignoring dups.
2005-05-07 13:31:37 +01:00
jimw@mysql.com
ef183de687
Merge mysql.com:/home/jimw/my/mysql-4.1-8497
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-07 01:00:24 -07:00
ramil@mysql.com
7217b4e9a4
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/ram/work/4.1
2005-05-07 09:06:11 +05:00
antony@ltantony.mysql.com
91e04912cd
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
2005-05-06 17:30:36 +01: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
ramil@ram-book.(none)
bec93d485b
fix for bug #4082 : Integer lengths cause truncation with DISTINCT CONCAT and InnoDB
2005-05-06 20:11:01 +05:00
bar@noter.(none)
6a47698468
Bug#6611: wrong sorting order.
...
Adding cp1250_croatian_ci collation.
2005-05-06 20:11:00 +05: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
bar@noter.(none)
b20cac254c
Bug#6505 Wrong sorting order:
...
latin2_croatian_ci collation was fixed.
2005-05-06 18:41:41 +05: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
27ee605090
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ibmlab.site:/home/my/bk/mysql-4.1
2005-05-06 13:22:56 +03:00
bar@noter.(none)
59129d9bbe
bug#6504 Upper/Lower conversion bug:
...
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
2005-05-06 15:22:55 +05:00
jani@ibmlab.site
fa25b9b49d
A fix for Bug#8467.
2005-05-06 12:18:37 +03:00
marko@hundin.mysql.fi
f9e7e2ee90
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-05-06 10:15:58 +03:00
lenz@mysql.com
22a8b93cc5
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2005-05-06 00:21:20 +02:00
lenz@mysql.com
7550b0b4ea
- fixed typo in variable name that caused compile errors on many platforms (tmp_error -> tmp_errno)
2005-05-06 00:16:33 +02:00
shuichi@mysql.com
2244ae8cef
Added cp932 character set
2005-05-05 11:37:52 -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
gluh@mysql.com
9f5a51e8d6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Devel/mysql-4.1
2005-05-05 16:23:39 +05:00
konstantin@mysql.com
15dbab1c12
A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it
...
should return a non empty one"
(see comments for the changed files for details).
2005-05-05 12:55:09 +04:00
gluh@mysql.com
665cbabe07
Bug #5843 : Server code does not check whether PID file was successfully written
2005-05-05 12:24:10 +05:00
jan@hundin.mysql.fi
3cddcc63fa
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-05 10:15:15 +03:00
kent@mysql.com
c4acdc6e0f
terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:
...
Initial Metrowerks CodeWarrior compiler support
2005-05-05 09:15:14 +02:00
jan@hundin.mysql.fi
71f620890c
Fig compiler error.
2005-05-05 08:08:39 +03:00
jan@hundin.mysql.fi
91640e9d60
Initial value for a auto_increment can now be set using ALTER TABLE
...
AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
change is backported from 5.0 (Bug #7061 ).
2005-05-04 12:24:56 +03:00
jan@hundin.mysql.fi
df8380e0dd
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-04 12:24:55 +03:00
konstantin@mysql.com
018b8025c0
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-4.1-9096-fresh
2005-05-03 12:49:22 +04:00
konstantin@mysql.com
3589e78fda
A fix and test case for Bug#9096 "select doesn't return all matched
...
records if prepared statements is used".
This fix changes equality evaluation method of basic constants from
by-name to by-value, thus effectively enabling use of parameter markers
in some optimizations (constants propagation, evaluation of possible
keys for query).
2005-05-03 12:47:27 +04:00
jan@hundin.mysql.fi
2f65c531a8
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-03 09:46:52 +03:00
jimw@mysql.com
8e87db9318
Merge mysql.com:/home/jimw/my/mysql-4.1-9947
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:12:27 -07:00
jimw@mysql.com
0b0e4f1166
Merge mysql.com:/home/jimw/my/mysql-4.1-9761
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:12:03 -07:00
jimw@mysql.com
2aea94f483
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:05:58 -07:00
jan@hundin.mysql.fi
d3b849466c
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-02 07:30:17 +03:00
sergefp@mysql.com
acca8f7af3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug9228
2005-05-01 19:03:49 +04:00
monty@mysql.com
aa84afb983
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-30 03:45:12 +03:00
sergefp@mysql.com
96aeab05d1
Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions about
...
relative sizes of int/long/longlong.
2005-04-30 01:05:15 +04:00
evgen@moonbone.local
4b9f462da7
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/usr/src/mysql-4.1
2005-04-29 22:20:16 +04: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
jimw@mysql.com
78ff49437f
Manually resolve merge
2005-04-29 08:46:03 -07:00
monty@mysql.com
fbf31c4a8c
CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036 )
...
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467 )
Fix compiler problems with MinGW (Bug #8872 )
2005-04-29 17:03:34 +03:00
mskold@mysql.com
0fc5a1678c
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-29 14:10:26 +02:00
mskold@mysql.com
56499dbe54
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-29 11:56:38 +02:00
mskold@mysql.com
2428e7b1cc
Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug
2005-04-29 11:37:47 +02:00
jan@hundin.mysql.fi
8e7ebf88b3
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-04-29 10:07:03 +03:00