evgen@moonbone.local
6dd8772bfc
Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-07-18 23:30:09 +04:00
jimw@rama.(none)
0bdb8fcd0b
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into rama.(none):/home/jimw/my/mysql-5.0-17903
2006-07-18 10:58:44 -07:00
evgen@moonbone.local
ed8eb31412
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-07-18 21:32:25 +04:00
evgen@moonbone.local
a8d230c672
Merge moonbone.local:/work/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-07-18 21:30:26 +04:00
jimw@rama.(none)
8b91a02728
Merge bk-internal:/home/bk/mysql-5.0-engines
...
into rama.(none):/home/jimw/my/mysql-5.0-17608
2006-07-18 10:25:04 -07:00
jimw@rama.(none)
78a2b9420c
Merge bk-internal:/home/bk/mysql-5.0-kt
...
into rama.(none):/home/jimw/my/mysql-5.0-12673
2006-07-18 09:43:23 -07:00
gluh@mysql.com/vva.(none)
7c0930c4ae
after merge fix
2006-07-18 20:13:13 +05:00
gluh@myoffice.izhnet.ru
f76aec6d90
Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge
...
into myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1
2006-07-18 18:43:55 +05:00
mikael/pappa@dator5.(none)
4b71f42dd3
BUG#20340: NODEGROUP in information_schema.partitions integer =>
...
error in error log when "default is put into it
NODEGROUP string to cater for "default" in it
2006-07-18 09:33:40 -04:00
msvensson@neptunus.(none)
601d948099
Fix erroneous join function use
2006-07-18 15:15:43 +02:00
msvensson@neptunus.(none)
da214608b4
Add verbose printouts for im_start and im_stop
2006-07-18 14:53:50 +02:00
msvensson@neptunus.(none)
2d43d0675e
Bug#18539 uncompress(d) is null: impossible?
...
- Add a check that length of field to uncompress is longer than 4 bytes.
This can be dones as the length of uncompressed data is written as
first four bytes of field and thus it can't be valid compressed data.
2006-07-18 12:41:41 +02:00
msvensson@neptunus.(none)
ec183566cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-18 09:50:46 +02:00
patg@govinda.patg.net
51d8bcf627
"BUG #18764 : Delete conditions causing inconsistencies in Federated tables"
...
Removed logic in ha_federated::write_row, which checks field query ids in the
loop which builds the query to run on the remote server.
2006-07-17 16:45:04 -07:00
igor@rurik.mysql.com
31a7bdfcf6
Post-merge fix.
2006-07-17 15:28:24 -07:00
iggy@rolltop.ignatz42.dyndns.org
ad12809f35
Bug# 20221- Dumping of multiple databases containing view(s) yields maleformed dumps.
2006-07-17 18:07:08 -04:00
igor@rurik.mysql.com
3d83d5aa03
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-07-17 13:24:43 -07:00
jimw@rama.(none)
9f308f676a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into rama.(none):/home/jimw/my/mysql-5.0-18539
2006-07-17 12:21:30 -07:00
igor@olga.mysql.com
59e7a26177
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2006-07-17 11:41:27 -07:00
andrey@lmy004.
0404763d81
WL#3337 (Events new architecture)
...
Small updates before patch submit.
2006-07-17 16:52:45 +02:00
evgen@moonbone.local
b0b1fe3bd8
select.result, select.test:
...
Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.
2006-07-17 16:12:42 +04:00
kroki/tomash@moonlight.intranet
ed2d8cce57
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21013
2006-07-17 15:17:18 +04:00
mikael/pappa@dator5.(none)
bae61f209d
Fixed test case
2006-07-17 06:53:46 -04:00
kroki/tomash@moonlight.intranet
5a64e5c24f
Bug#21013: Performance Degrades when importing data that uses Trigger
...
and Stored Procedure
The essence of the bug was that for every re-execution of stored
routine or prepared statement new items for character set conversions
were created, thus increasing the number of items and the time of their
processing, and creating memory leak.
No test case is provided since current test suite can't cover such type
of bugs.
2006-07-17 14:48:40 +04:00
mikael/pappa@dator5.(none)
6019ac9b71
Fixes for strange appearance of db.opt file
2006-07-17 06:41:12 -04:00
evgen@moonbone.local
51a636293e
mysql.test, mysql.result:
...
Corrected the test case after fixing bug#10977
2006-07-17 14:22:21 +04:00
igor@rurik.mysql.com
21469f84ac
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-07-16 12:10:46 -07:00
mikael/pappa@dator5.(none)
3d44231064
Minor fix
2006-07-15 17:05:47 -04:00
evgen@moonbone.local
f1346cf8f6
Fixed bug#10977: No warning issued if a column name is truncated
...
When an alias is set to a column leading spaces are removed from the alias.
But when this is done on aliases set by user this can lead to confusion.
Now Item::set_name() method issues the warning if leading spaces were removed
from an alias set by user.
New warning message is added.
2006-07-16 00:45:38 +04:00
mikael/pappa@dator5.(none)
1c1a131675
Remove files that tests leave behind
2006-07-15 12:01:46 -04:00
mikael/pappa@dator5.(none)
27b06d9dd0
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 11:59:39 -04:00
mikael/pappa@dator5.(none)
cc545cc6cf
Fixes to make tests work in conjunction with other tests
2006-07-15 07:28:31 -04:00
mikael/pappa@dator5.(none)
30989a77a7
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 04:06:31 -04:00
mikael/pappa@dator5.(none)
cacbb674b1
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:59:53 -04:00
mikael/pappa@dator5.(none)
a6f310d0c2
Merge dator5.(none):/home/pappa/bug20852
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:49:01 -04:00
mikael/pappa@dator5.(none)
425c8883bb
Merge dator5.(none):/home/pappa/bug20770
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:46:01 -04:00
mikael/pappa@dator5.(none)
5a2edb5065
Merge dator5.(none):/home/pappa/bug20767
...
into dator5.(none):/home/pappa/push_tree_w28
2006-07-15 03:41:41 -04:00
mikael/pappa@dator5.(none)
cfc65ef720
BUG#20389: Crash when using index scan in reverse order
2006-07-15 03:38:34 -04:00
igor@rurik.mysql.com
38cd55a758
Fixed bug #20869 .
...
The bug caused a crash of the server if a subquery with
ORDER BY DESC used the range access method.
The bug happened because the method QUICK_SELECT_DESC::reset
was not reworked after MRR interface had been introduced.
2006-07-15 00:28:21 -07:00
tsmith/tim@siva.hindu.god
6971ddee1a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
2006-07-15 00:33:24 -06:00
igor@olga.mysql.com
4de3186ae1
Fixed bug #20519 .
...
The bug was due to a loss happened during a refactoring made
on May 30 2005 that modified the function JOIN::reinit.
As a result of it for any subquery the value of offset_limit_cnt
was not restored for the following executions. Yet the first
execution of the subquery made it equal to 0.
The fix restores this value in the function JOIN::reinit.
2006-07-14 19:28:58 -07:00
kostja@bodhi.local
231565c206
Fix information_schema.result after a manual merge.
2006-07-15 03:08:56 +04:00
kostja@bodhi.local
f536f361d9
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
2006-07-15 01:04:51 +04:00
igreenhoe/greenman@anubis.greendragongames.com
20de038887
4.1 -> 5.0 merge
2006-07-14 13:30:23 -07:00
sergefp@pylon.mylan
2834bc1eae
Merge mysql.com:/home/psergey/tmp_merge-2
...
into mysql.com:/home/psergey/mysql-5.1-merge-2
2006-07-14 19:10:54 +04:00
igreenhoe/greenman@anubis.greendragongames.com
9beb95f0ed
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/merge-4.1_2_5.0
2006-07-14 06:52:25 -07:00
igreenhoe/greenman@anubis.greendragongames.com
b170112cae
4.1 -> 5.0 merge fixes
2006-07-14 05:56:30 -07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0d15e5e340
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b15195
2006-07-14 16:58:51 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b57efe738a
--{skip-}merge option added which allows the user to disable merge engine and
...
to avoid the potential security problem.
(see bug #15195 : Security Breach with MERGE table)
2006-07-14 16:26:58 +05:00
tnurnberg@mysql.com/salvation.intern.azundris.com
00ec3973f7
Bug#21014: Segmentation fault of mysqldump on view
...
mysqldump did not select the correct database before trying to dump
views from it. this resulted in an empty result set, which in turn
startled mysql-dump into a core-dump. this only happened for views,
not for tables, and was only visible with multiple databases that
weren't by sheer luck in the order mysqldump required, anyway. this
fixes by selecting the correct database before dumping views; it also
catches the empty set-condition if it should occur for other reasons.
2006-07-14 12:50:00 +02:00