svoj@mysql.com/june.mysql.com
187b01a45f
BUG#30583 - Partition on DOUBLE key + INNODB + count(*) == crash
...
Issuing SELECT COUNT(*) against partitioned InnoDB table may cause
server crash.
Fixed that not all required fields were included into read_set.
2007-09-13 18:33:40 +05:00
svoj@april.(none)
fe4f440a2e
Merge april.(none):/home/svoj/devel/bk/mysql-5.1-engines
...
into april.(none):/home/svoj/devel/mysql/mysql-5.1-engines
2007-08-28 13:32:59 +05:00
antony@pcg5ppc.xiphis.org
edbe12ac02
Bug#30359
...
"Test federated_bug_25714 issues non-existing shell command"
Problem caused by missing '$' symbol in eval statement causing it
to always attempt to run test even if the test was not compiled.
2007-08-16 14:00:35 -07:00
gshchepa/uchum@gleb.loc
9308d43490
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-08-14 15:39:57 +05:00
gshchepa/uchum@gleb.loc
67c586ff5c
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-08-14 13:45:49 +05:00
gshchepa/uchum@gleb.loc
c40fe57fb5
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-14 13:44:15 +05:00
istruewing@synthia.local
50e3da81c2
Merge synthia.local:/home/mydev/mysql-5.0-axmrg
...
into synthia.local:/home/mydev/mysql-5.1-axmrg
2007-08-13 23:49:07 +02:00
istruewing@synthia.local
6d67419fb6
Merge synthia.local:/home/mydev/mysql-5.1-amain
...
into synthia.local:/home/mydev/mysql-5.1-axmrg
2007-08-13 23:46:25 +02:00
istruewing@synthia.local
6c95ced6c1
Merge synthia.local:/home/mydev/mysql-4.1-axmrg
...
into synthia.local:/home/mydev/mysql-5.0-axmrg
2007-08-13 22:00:30 +02:00
istruewing@synthia.local
f0c883f3fb
Merge synthia.local:/home/mydev/mysql-5.0-amain
...
into synthia.local:/home/mydev/mysql-5.0-axmrg
2007-08-13 20:45:36 +02:00
istruewing@synthia.local
45647d3bd9
Merge synthia.local:/home/mydev/mysql-4.1-amain
...
into synthia.local:/home/mydev/mysql-4.1-axmrg
2007-08-13 19:22:35 +02:00
gshchepa/uchum@gleb.loc
3368d2fb6b
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-08-11 03:37:43 +05:00
gshchepa/uchum@gleb.loc
db6ec3f71f
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-08-11 02:00:51 +05:00
gshchepa/uchum@gleb.loc
c04f57ccef
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-11 01:32:04 +05:00
gshchepa/uchum@gleb.loc
1b70ffee32
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-08-11 01:27:06 +05: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
gkodinov/kgeorge@magare.gmz
0ac8d08959
Bug 29536 : error message changed 5.0-opt -> 5.1-opt
2007-08-06 06:55:50 -07:00
gkodinov/kgeorge@magare.gmz
5068ebc1c5
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B29536-5.0-opt
2007-08-06 06:37:05 -07:00
gkodinov/kgeorge@magare.gmz
5af5954ab5
Merge magare.gmz:/home/kgeorge/mysql/work/B29536-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt
2007-08-06 06:34:21 -07:00
gkodinov/kgeorge@magare.gmz
117c3ff9d7
Bug #29536 : timestamp inconsistent in replication around 1970
...
MySQL replicates the time zone only when operations that involve
it are performed. This is controlled by a flag. But this flag
is set only on successful operation.
The flag must be set also when there is an error that involves
a timezone (so the master would replicate the error to the slaves).
Fixed by moving the setting of the flag before the operation
(so it apples to errors as well).
2007-08-06 04:57:28 -07: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
igor@olga.mysql.com
46c29c8797
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-08-06 01:08:28 -07:00
igor@olga.mysql.com
b8e85da37b
Removed a query from the test case for bug 39219 that displayed in valgrind
...
a problem for BIT type values different from the one reported for the bug.
2007-08-06 01:01:22 -07:00
igor@olga.mysql.com
9037f6d9b5
Post-merge fixes.
2007-08-06 00:53:32 -07: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
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
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