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
igor@olga.mysql.com
676c5ef471
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug30219
2007-08-05 18:39:12 -07: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
igor@olga.mysql.com
88703939ad
Fixed compiler error for Windows in the patch for bug 30219.
2007-08-05 17:12:57 -07: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
igor@olga.mysql.com
a8debc6503
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30219
2007-08-05 14:21:36 -07:00
igor@olga.mysql.com
5f6df1b232
Fix bug #30219 .
...
This bug manifested itself for queries with grouping by columns of
the BIT type. It led to wrong comparisons of bit-field values and
wrong result sets.
Bit-field values never cannot be compared as binary values. Yet
the class Field_bit had an implementation of the cmp method that
compared bit-fields values as binary values.
Also the get_image and set_image methods of the base class Field
cannot be used for objects of the Field_bit class.
Now these methods are declared as virtual and specific implementations
of the methods are provided for the class Field_bit.
2007-08-05 14:16:49 -07: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
gkodinov/kgeorge@magare.gmz
e53af13d1e
rpl_row_tabledefs_2myisam.result:
...
merged 5.1-main to 5.1-opt : error numbers changed.
Many files:
merged 5.1-main to 5.1-opt : error numbers changed
rpl_extraCol_innodb.result:
merged 5.1-main to 5.1-opt : error numbers changed
2007-08-05 14:02:33 +03: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
igor@olga.mysql.com
a5e4e70100
Merge olga.mysql.com:/home/igor/mysql-5.1
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
2007-08-04 22:36:54 -07:00
igor@olga.mysql.com
d9373125e1
Merge olga.mysql.com:/home/igor/mysql-5.0
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-merge
2007-08-04 20:53:26 -07:00
igor@olga.mysql.com
fd3be5034e
Removed warnings after fix for bug 28404.
2007-08-04 20:31:48 -07:00
igor@olga.mysql.com
e39d06e7d3
Made the test case for bug 28404 platform independent.
2007-08-04 17:15:33 -07:00
igor@olga.mysql.com
3b1dd15e0d
Made sure that the test case for bug 28404 use the correct statistics.
2007-08-04 13:41:01 -07:00
igor@olga.mysql.com
4acba86e59
Post-merge fix.
2007-08-04 03:12:43 -07: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
igor@olga.mysql.com
d51731a322
Fixed a memory leak in the patch for bug 28404.
2007-08-03 21:10:57 -07: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
kent@mysql.com/kent-amd64.(none)
abf4895367
CMakeLists.txt:
...
Removed space between '-D' and symbol
2007-08-04 00:26:46 +02:00
kent@kent-amd64.(none)
6b9ac5b7cf
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-03 22:57:21 +02:00
df@pippilotta.erinye.com
eba0752b45
after-merge fix
2007-08-03 22:02:19 +02:00
kent@mysql.com/kent-amd64.(none)
a6d082f36d
CMakeLists.txt, README, configure.js
...
Several adjustments to make client libraries pass the link test
on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
2007-08-03 21:51:37 +02:00
iggy@amd64.(none)
3ed9739c82
Bug#29903 The CMake build method does not produce the embedded library.
...
- Changes to correct and test Windows embedded build.
2007-08-03 14:43:12 -04:00
mkindahl@dl145h.mysql.com
92d4958eb7
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
2007-08-03 19:04:59 +02:00
mkindahl@dl145h.mysql.com
ea9848094a
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
2007-08-03 18:59:16 +02:00
df@pippilotta.erinye.com
7c29bcda22
merge fix
2007-08-03 18:57:18 +02:00
mkindahl@dl145h.mysql.com
efb82b3aac
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
2007-08-03 18:56:06 +02:00
dfischer@bk-internal.mysql.com
1230d8fb68
.del-readme.txt-grumble-grumble:
...
Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble
2007-08-03 18:31:54 +02:00
igor@olga.mysql.com
9c09b7d523
Merge olga.mysql.com:/home/igor/mysql-5.1-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug28404
2007-08-03 08:46:01 -07:00
df@pippilotta.erinye.com
493634e4c7
Merge bk-internal:/home/bk/mysql-5.1-marvel
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
2007-08-03 17:15:23 +02:00
mkindahl@dl145h.mysql.com
6cc184aa1b
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2007-08-03 17:14:46 +02:00
mkindahl@dl145h.mysql.com
008d2b2537
Fixes to eliminate valgrind warnings.
2007-08-03 17:12:00 +02:00
df@pippilotta.erinye.com
3d986fde8d
Merge bk-internal:/home/bk/mysql-5.1-engines
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
2007-08-03 16:53:06 +02:00
gkodinov/kgeorge@magare.gmz
b2661dd379
Merge magare.gmz:/home/kgeorge/mysql/work/B25228-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B25228-5.1-opt
2007-08-03 15:44:40 +03:00