tsmith@ramayana.hindu.god
bde833896a
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-13 12:47:12 -06:00
tsmith@ramayana.hindu.god
541203b360
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-13 12:46:35 -06:00
tsmith@ramayana.hindu.god
7812c2d38a
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-13 12:46:02 -06:00
msvensson@pilot.(none)
732356b152
Bug#29804 UDF parameters don't contain correct string length
...
- Export 'check_const_len_init' from udf_example.dll
2007-08-13 09:46:09 +02:00
msvensson@pilot.(none)
62102f54a2
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/my51-bug29804
2007-08-09 10:37:50 +02:00
msvensson@pilot.(none)
9d06483f72
Bug#29804 UDF parameters don't contain correct string length
...
- Fix warnings
- Export 'check_const_len' from udf_example.dll
2007-08-09 10:21:28 +02:00
cmiller@zippy.cornsilk.net
867ae4ccc4
Correct bad merge, and remove version numbers from test case.
2007-08-08 12:21:04 -04:00
kostja@bodhi.(none)
3ecef8c0b9
A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system
2007-08-08 15:49:19 +04:00
kostja@bodhi.(none)
a3b210d408
Apply patch for Bug#27806 table comments not passed in to storage engine
...
during "CREATE ... LIKE ..."
Only affects engine writers.
No change in server behaviour.
2007-08-08 14:02:07 +04:00
kostja@bodhi.(none)
b4eb961fef
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-08 11:45:13 +04:00
kostja@bodhi.(none)
28f1f1828d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-08 11:36:55 +04:00
kostja@bodhi.(none)
3c6eb0002d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-08-08 11:34:35 +04:00
cmiller@zippy.cornsilk.net
cdc03f7a19
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-08-07 06:53:40 -04:00
cmiller@zippy.cornsilk.net
c2df7e082a
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my50-bug27562
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-08-07 06:52:34 -04:00
cmiller@zippy.cornsilk.net
da83da434c
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my51-bug27562
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-08-07 06:49:58 -04:00
cmiller@zippy.cornsilk.net
e0139d23d9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-08-07 06:48:46 -04:00
cmiller@zippy.cornsilk.net
1380fb167d
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my50-bug27562
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my51-bug27562
2007-08-07 06:22:52 -04:00
cmiller@zippy.cornsilk.net
0221888e39
Bug#27562: ascii.xml invalid?
...
Two character mappings were way off (backtick and tilde were "E"
and "Y"!), and three others were slightly rotated. The first
would cause collisions, and the latter was probably benign.
Now, assign the character mappings exactly to their normal values.
2007-08-07 05:35:20 -04:00
tsmith@ramayana.hindu.god
2073c488af
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-06 16:34:30 -06:00
kostja@bodhi.(none)
256450d881
Fix one more warning.
2007-08-06 23:43:53 +04:00
jbruehe/mysqldev@mysql.com/production.mysql.com
0afb19f555
Raise version number after cloning 5.1.21-beta
2007-08-06 21:11:09 +02:00
kostja@bodhi.(none)
4cc808b7cf
Fix "db_cl_altered might be used uninitialized" warning.
2007-08-06 22:52:50 +04:00
kostja@bodhi.(none)
057ab256cc
Fix warnings.
2007-08-06 22:49:47 +04:00
kostja@bodhi.(none)
0c4d8e0032
Fix failing ddl_i18n* tests in the team tree.
2007-08-06 22:42:13 +04:00
cmiller@zippy.cornsilk.net
869da2dd55
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-08-06 08:17:49 -04:00
kostja@bodhi.(none)
f4cfa793e5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-08-06 14:29:56 +04:00
kostja@bodhi.(none)
ec5464d2e0
A fix and a test case for Bug#29306 "Truncated data in MS Access with decimal (3,1) columns in a
...
VIEW".
mysql_list_fields() C API function would incorrectly set MYSQL_FIELD::decimals
member for some view columns.
The problem was in an incomplete implementation of
Item_ident_for_show::make_field(), which is responsible for view
columns metadata.
2007-08-06 14:22:24 +04:00
kent@kent-amd64.(none)
add9cb76b5
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-06 08:33:20 +02:00
kent@mysql.com/kent-amd64.(none)
d75c7a58c1
make_win_bin_dist:
...
Corrected install path
2007-08-06 08:31:09 +02:00
kent@mysql.com/kent-amd64.(none)
f9fdd5ae8c
make_win_bin_dist:
...
Copy embedded .pdb and static debug lib
2007-08-06 08:28:16 +02:00
dkatz@damien-katzs-computer.local
a933f28a93
Bug #29804 UDF parameters don't contain correct string length
...
Previously, UDF *_init functions were passed constant strings with erroneous lengths.
The length came from the containing variable's size, not the length of the value itself.
Now the *_init functions get the constant as a null terminated string with the correct
length supplied.
2007-08-05 21:37:55 -04:00
dkatz@damien-katzs-computer.local
3fe2098964
Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-08-05 21:08:08 -04:00
kent@kent-amd64.(none)
0065e85e32
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-06 01:35:43 +02:00
kent@mysql.com/kent-amd64.(none)
6ab4112c37
mysql-test-run.pl:
...
Search "relwithdebinfo" directory in CMake Visual Studio build
Search for "mysqld-debug" even in source tree
2007-08-06 01:29:53 +02:00
df@pippilotta.erinye.com
239f6aa312
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-08-05 16:43:03 +02:00
df@pippilotta.erinye.com
17e76114c9
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-08-05 16:37:34 +02:00
df@pippilotta.erinye.com
0285a32afb
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-08-05 16:37:20 +02:00
dlenev@mockturtle.local
c3e3a5e188
Added test for bug #21281 "Pending write lock is incorrectly removed
...
when its statement being KILLed". The bug itself was fixed by separate
patch in 5.0 tree.
2007-08-05 13:55:37 +04:00
dlenev@mockturtle.local
ec2aeb4fae
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2
2007-08-05 13:26:10 +04:00
dlenev@mockturtle.local
a43431b3a1
Fix for bug #21281 "Pending write lock is incorrectly removed when its
...
statement being KILLed".
When statement which was trying to obtain write lock on then table and
which was blocked by existing read lock was killed, concurrent statements
that were trying to obtain read locks on the same table and that were
blocked by the presence of this pending write lock were not woken up and
had to wait until this first read lock goes away.
This problem was caused by the fact that we forgot to wake up threads
which pending requests could have been satisfied after removing lock
request for the killed thread.
The patch solves the problem by waking up those threads in such situation.
Test for this bug will be added to 5.1 only as it has much better
facilities for its implementation. Particularly, by using I_S.PROCESSLIST
and wait_condition.inc script we can wait until thread will be blocked on
certain table lock without relying on unconditional sleep (which usage
increases time needed for test runs and might cause spurious test
failures on slower platforms).
2007-08-05 13:17:07 +04:00
df@pippilotta.erinye.com
f0f9652988
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-08-04 11:08:11 +02:00
df@pippilotta.erinye.com
ec7dccce7f
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-08-04 09:55:45 +02:00
iggy@amd64.(none)
b880985ea7
Post Merge Fixup.
2007-08-04 02:51:58 -04:00
iggy@amd64.(none)
64b6c61108
Merge amd64.(none):/src/mysql-5.1-maint
...
into amd64.(none):/src/mysql-5.1-build_29903
2007-08-03 21:44:59 -04:00
cbell/Chuck@mysql_cab_desk.
3b39789e4e
Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl-push
...
into mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
2007-08-03 21:43:25 -04:00
iggy@amd64.(none)
171f402ad4
Bug#29903 The CMake build method does not produce the embedded library.
...
- GCov fix.
2007-08-03 21:08:48 -04:00
iggy@amd64.(none)
35b1a59841
Bug#29903 The CMake build method does not produce the embedded library.
...
- Additional changes to correct link failure in Do-linkall script.
2007-08-03 18:56:24 -04:00
df@pippilotta.erinye.com
db15f4daeb
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-08-04 00:46:33 +02:00
df@pippilotta.erinye.com
d268c7e0fc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-08-04 00:44:51 +02:00
kent@kent-amd64.(none)
405522690d
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-04 00:29:47 +02:00