igor@igor-inspiron.creware.com
fdce34a385
Merge igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
...
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
2005-06-13 06:28:23 -07:00
igor@igor-inspiron.creware.com
750fca61f9
ctype_utf8.test, ctype_utf8.result:
...
Added a test case for bug #11167 .
sql_select.cc:
Fixed bug #11167 .
In 4.1 char/varchar fields are limited by 255 characters in
length that make them longer than 255 bytes in size for such
character sets as UTF8. The functions store_record_in_cache
and read_cached_records did not take into account this
Moreover the code did not take into account that the size
of the varchar fields in 5.0 can be up to 65535 bytes
2005-06-13 06:10:19 -07:00
lars@mysql.com
d573d0c443
Merge mysql.com:/home/bk/b6883-mysql-4.1
...
into mysql.com:/home/bk/mysql-5.0
2005-06-13 11:56:45 +02:00
lars@mysql.com
928cb7ac13
Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0
2005-06-13 11:13:06 +02:00
lars@mysql.com
c199d7fd66
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b6883-mysql-4.1
2005-06-13 11:12:10 +02:00
joreland@mysql.com
ab1eaf0b32
merge
2005-06-13 10:42:12 +02:00
joreland@mysql.com
109b150314
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-13 09:12:51 +02:00
joreland@mysql.com
3bfc52d14a
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-13 09:10:45 +02:00
joreland@mysql.com
2d64907d12
bug#10294 - ndb restore with #concurrent transactions < parallelism
...
Enable retry on startTransaction
2005-06-13 09:09:50 +02:00
svoj@mysql.com
35dad7352d
Merge
2005-06-11 15:48:11 +05:00
jimw@mysql.com
55f962c0cf
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-10 20:11:20 -07:00
jimw@mysql.com
ff3f735c70
Merge jwinstead@production.mysql.com:my/mysql-4.1-10840
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-10 14:46:03 -07:00
reggie@mdk10.(none)
6a9ce670ea
Merge mdk10.(none):/home/reggie/bk/mysql-4.1-base
...
into mdk10.(none):/home/reggie/bk/mysql-5.0-base
2005-06-10 16:45:54 -05:00
jimw@mysql.com
481f763255
Merge mysql.com:/home/jimw/my/mysql-4.1-9500
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-10 14:44:25 -07:00
reggie@mdk10.(none)
dea4ede2dc
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mdk10.(none):/home/reggie/bk/50test2
2005-06-10 14:18:53 -05:00
reggie@mdk10.(none)
6271cf51ac
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/41test3
2005-06-10 14:17:32 -05:00
reggie@mdk10.(none)
b45bf71d9b
Bug #10947 mysqlshow wildcard failure on Windows
2005-06-10 14:03:22 -05:00
serg@serg.mylan
b41f9b36cb
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-10 20:23:37 +02:00
kent@mysql.com
811e51ec84
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-10 20:12:45 +02:00
serg@serg.mylan
c9ff2b5050
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-10 18:40:33 +02:00
serg@serg.mylan
f265b3eb2b
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-10 18:11:40 +02:00
pem@mysql.comhem.se
ca0a72f815
Post-merge fix.
2005-06-10 18:06:12 +02:00
serg@serg.mylan
6f45ac2cb6
bug#11225 - distinct.test fails
2005-06-10 18:02:19 +02:00
svoj@mysql.com
a822c1ffed
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-10 20:55:36 +05:00
svoj@mysql.com
75c13cbe0b
Merge with latest yaSSL.
...
Fixes IsAligned yaSSL assertion failure.
2005-06-10 20:09:41 +05:00
pem@mysql.com
b42bf3cc55
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-06-10 16:56:34 +02:00
pem@mysql.comhem.se
46619fa0e3
Post review and additional fix for BUG#10968: Stored procedures: crash if long loop.
...
Fixed valgrind complaints. This fixes the memory leak problems for
procedured, and partially for functions. There's still a leak involving
results from functions that turned out to be too involved, so it will be
fixed separately.
2005-06-10 16:14:01 +02:00
obarnir@mysql.com
a64115d1f0
Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/omer/source/src50_0609
2005-06-10 06:58:26 -07:00
lenz@mysql.com
d11be61a51
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0
2005-06-10 15:41:30 +02:00
lenz@mysql.com
abaae49cfd
Merge mysql.com:/space/my/mysql-4.1-merge
...
into mysql.com:/space/my/mysql-4.1-build
2005-06-10 15:37:21 +02:00
lenz@mysql.com
fc9ce0eeb9
Merge mysql.com:/space/my/mysql-4.1-merge
...
into mysql.com:/space/my/mysql-5.0.7-clone
2005-06-10 15:31:08 +02:00
lenz@mysql.com
a610a7749f
- added missing files std_data/server-cert.pem and std_data/server-key.pem to make
...
the SSL tests pass
2005-06-10 15:30:16 +02:00
joreland@mysql.com
77ef82cf55
ndb -
...
Fix mem leak in testBlobs
2005-06-10 15:13:44 +02:00
heikki@hundin.mysql.fi
6c38471e87
os0sync.c, os0file.c:
...
Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
2005-06-10 14:18:36 +03:00
serg@serg.mylan
e1870b7554
mysql-test/mysql-test-run.sh
...
don't start ndb cluster if no test uses it.
2005-06-10 12:58:05 +02:00
joreland@mysql.com
96789d5ecb
ndb - autotest
...
Fix stack overflow in ndb_cpcd on amd64
2005-06-10 12:31:55 +02:00
joreland@mysql.com
decf8ed04e
ndb - autotest
...
script fixes for solaris
2005-06-10 10:22:32 +02:00
serg@serg.mylan
71a61f9545
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-10 09:15:43 +02:00
jimw@mysql.com
4441b59711
Update test results. type_varchar changed because the size of the
...
key now gets changed along with the size of the field as long
as the original key had the same length as the length of the field
(or is unspecified originally, as in the test).
2005-06-09 21:20:34 -07:00
jimw@mysql.com
1055c36000
Merge mysql.com:/home/jimw/my/mysql-5.0-10543
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-09 19:29:55 -07:00
jimw@mysql.com
153f233627
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-09 19:27:45 -07:00
kent@mysql.com
155c322c59
mysqld.dsp:
...
Corrected typo
2005-06-10 04:09:42 +02:00
jimw@mysql.com
21f46b3940
Merge mysql.com:/home/jimw/my/mysql-4.1-11122
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:03:55 -07:00
jimw@mysql.com
bb8f2663ae
Merge mysql.com:/home/jimw/my/mysql-4.1-10566
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:03:18 -07:00
jimw@mysql.com
3c425f1f65
Merge mysql.com:/home/jimw/my/mysql-4.1-10931
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:02:04 -07:00
jimw@mysql.com
a5285b141e
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-09 18:00:47 -07:00
serg@serg.mylan
551bdecfd9
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-09 23:00:04 +02:00
brian@brian-akers-computer.local
12a7b7af04
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
2005-06-09 13:11:54 -07:00
serg@serg.mylan
8954b0d2d0
remove old libmysqld.a before assembling a new one
2005-06-09 22:04:05 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
5708d9a076
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-06-09 21:54:06 +03:00