Commit graph

22832 commits

Author SHA1 Message Date
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
joreland@mysql.com
9d0c542838 ndb - autotest
update make-config script
2005-05-06 15:37:51 +02:00
monty@mishka.local
3d03746899 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
2005-05-06 16:34:09 +03: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
82f4a0b021 Merge bk-internal.mysql.com:/users/rburnett/bug10245
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
2005-05-06 15:21:30 +02:00
rburnett@bk-internal.mysql.com
ad6de2c05a Merge bk-internal.mysql.com:/users/rburnett/bug9721
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
2005-05-06 15:15:48 +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 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
lars@mysql.com
05cbb3962c Manual merge 5.0->5.1 2005-05-06 15:04:07 +02:00
joreland@mysql.com
deba12e775 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 14:46:19 +02:00
joreland@mysql.com
749a1f9a2b ndb - add support for mysql servers in autotest 2005-05-06 14:44:43 +02:00
ramil@ram-book.(none)
6a7306823b A fix (bug : defaults-extra-file throws no error when file is inaccessible). 2005-05-06 16:51:58 +05:00
ramil@ram-book.(none)
e1b6b7fe36 A fix (bug : CONFIG_NR_CPUS not defined for kernel header percpu.h). 2005-05-06 16:12:42 +05:00
monty@mishka.local
015cd1cd21 merge 2005-05-06 13:51:58 +03:00
jani@ibmlab.site
0e91a7131f Merge ibmlab.site:/home/my/bk/mysql-4.1
into ibmlab.site:/home/my/bk/mysql-5.0
2005-05-06 13:42:30 +03:00
jan@hundin.mysql.fi
ec60f79958 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-05-06 13:42:29 +03:00
jan@hundin.mysql.fi
8cf0957dfa Merge hundin.mysql.fi:/home/jan/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-05-06 13:38:18 +03: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
marko@hundin.mysql.fi
403b00481c Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0.4
2005-05-06 12:48:37 +03:00
marko@hundin.mysql.fi
ec0052cda4 After merge fix 2005-05-06 12:43:10 +03:00
jani@ibmlab.site
fa25b9b49d A fix for Bug#8467. 2005-05-06 12:18:37 +03:00
marko@hundin.mysql.fi
2f0424cd62 Merge 2005-05-06 11:45:59 +03:00
stewart@mysql.com
a17bf3f465 Bug#10193
Invalid DataDir in config causes ndbd segfault
2005-05-06 10:43:29 +02:00
monty@mishka.local
a9f6aab4c9 Fixes while reviewing new code
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03:00
ramil@ram-book.(none)
50579df606 A fix (bug : select 0/0 returns 0). 2005-05-06 13:31:48 +05:00
bar@mysql.com
5496b7babb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0
2005-05-06 13:31:47 +05:00
bar@mysql.com
b1431c222a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0
2005-05-06 13:08:28 +05:00
dlenev@mysql.com
917cb3dfbc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg9841
2005-05-06 11:18:37 +04: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
bar@mysql.com
1f14cfcb35 merging cp932 from 4.1 2005-05-06 12:00:25 +05:00
ramil@mysql.com
788678d392 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0
2005-05-06 11:48:55 +05:00
bar@mysql.com
b93385de8f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0
2005-05-06 11:48:54 +05:00
ramil@mysql.com
802360fbc2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0
2005-05-06 08:34:50 +05: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
b4d43939fb Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-05-06 00:18:13 +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
holyfoot@hf-ibm.(none)
8f3647005c Tests and results fixed with last precision/decimal related modifications 2005-05-06 01:01:39 +05:00
holyfoot@mysql.com
196a87cbd6 Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.0.prec
2005-05-06 00:58:07 +05: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
gbichot@quadita2.mysql.com
74032c3644 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-05 18:37:38 +02:00
gbichot@quadita2.mysql.com
688d9ee03c making rpl_sp.test hostname-independent 2005-05-05 18:28:54 +02:00
bar@noter.(none)
153b928c10 Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci
We cannot propagate constants with tricky collations.
2005-05-05 21:13:57 +05:00
dlenev@brandersnatch.localdomain
d60674d665 Fix for bug "Unexpected read lock when trying to update a view in
a stored procedure" (version 2).

To handle updates and inserts into view in SP properly we should set
lock types for tables of the view's main select when we are opening
view for prelocking purproses.
2005-05-05 19:49:15 +04:00
rburnett@bk-internal.mysql.com
8e286b7934 Bug 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 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