kostja@bodhi.(none)
46b8a07dc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-15 17:46:20 +04:00
kostja@bodhi.(none)
91fe15bb9d
Fix doxygen warnings.
2007-08-15 17:43:08 +04:00
malff/marcsql@weblab.(none)
2989cbe05a
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-cleanup
2007-08-14 20:31:54 -06:00
malff/marcsql@weblab.(none)
f5dc545cb1
Changed whitespace and indentation only, no logic change.
2007-08-14 20:31:06 -06:00
kostja@bodhi.(none)
9bf39c6fe9
Merge bodhi.(none):/opt/local/work/mysql-5.1-target-5.1.22
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-11 14:09:15 +04:00
kostja@bodhi.(none)
9c72c3dfdb
A fix for Bug#29049 lock_multi fails in rare case.
...
The patch changes the test case only.
The fix is to replace all 'sleep's with wait_condition. This makes
the test deterministic and also ~300 times faster.
2007-08-11 14:07:49 +04:00
kostja@bodhi.(none)
da84df71e8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-11 01:19:51 +04:00
kostja@bodhi.(none)
8f9168df53
A fix for Bug#30212 events_logs_tests not deterministic; SLEEP(2), others
...
Make the test deterministic.
2007-08-11 01:11:56 +04:00
malff/marcsql@weblab.(none)
b3cc3d4a9d
Bug#25930 (CREATE TABLE x SELECT ... parses columns wrong when ran with
...
ANSI_QUOTES mode)
This patch contains a test case only, showing that the bug has been fixed.
The issue was related to parsing <"blah">, where the lexical analyser
would not properly delimit the start and end of the token.
Properly making the token boundaries has been fixed in sql_lex.cc
with the patch for bug 25411 : see the Lex_input_stream class.
2007-08-09 17:31:00 -06: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
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
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
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
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