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
ramil@mysql.com
db3abccfa2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/ram/work/4.1
2005-05-06 18:41:42 +05: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
534dd73692
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
...
into bk-internal.mysql.com:/users/rburnett/bug10245
2005-05-06 15:24:07 +02: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
rburnett@bk-internal.mysql.com
e4523c2319
Bug #9721 net_write_timeout not used on Windows
...
viosocket.c:
Use ?: syntax to simplify code for setting both timeouts
2005-05-06 15:08:10 +02:00
ramil@ram-book.(none)
e1b6b7fe36
A fix (bug #7970 : CONFIG_NR_CPUS not defined for kernel header percpu.h).
2005-05-06 16:12:42 +05:00
stewart@mysql.com
a37c95d4bd
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
2005-05-06 12:31:51 +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
stewart@mysql.com
a17bf3f465
Bug#10193
...
Invalid DataDir in config causes ndbd segfault
2005-05-06 10:43:29 +02: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
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
8e286b7934
Bug #10245 VC++ compiler error with mysql.cc
...
Only print the read line version if we are on a platform that supports readline
mysql.cc:
Add #ifdef to only print readline version if we are on a platform that supports readline
2005-05-05 17:48:50 +02: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
kent@mysql.com
5198f49639
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-05 09:36:19 +02:00
kent@mysql.com
038ef8f865
mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper:
...
Initial Metrowerks CodeWarrior compiler support
new file
2005-05-05 09:34:15 +02: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
lenz@mysql.com
60c4ce90fc
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-bug9444
2005-05-04 15:07:29 +02:00
lenz@mysql.com
59930b6e84
- adjusted the start and stop priority level in the mysql.server init script for chkconfig on
...
Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux
(e.g. RHEL3/RHEL4)
2005-05-04 14:58:43 +02: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
lenz@mysql.com
236754a534
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-05-04 11:24:54 +02:00
lenz@mysql.com
e84f31ad03
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2005-05-04 11:11:41 +02:00
lenz@mysql.com
210969a3d9
- added missing el_term.h to the source distribution (BUG#10352)
2005-05-04 10:49:42 +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
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
7370017daf
Merge mysql.com:/home/jimw/my/mysql-4.1-9136
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:11:32 -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