Commit graph

34170 commits

Author SHA1 Message Date
gluh@eagle.intranet.mysql.r18.ru
c8944add73 Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH 2006-05-12 15:09:25 +05:00
msvensson@neptunus.(none)
9f5c15cfa8 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-12 11:51:04 +02:00
aelkin@mysql.com
96ca030940 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug19728_regex_win
2006-05-12 12:40:56 +03:00
aelkin@mysql.com
f7f83cd04c Bug#19728: Test mysqldump failure
regex is fixed for windows.
2006-05-12 12:32:44 +03:00
msvensson@neptunus.(none)
46f1f3ed2c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-12 11:19:37 +02:00
holyfoot@mysql.com
4d4b5c8137 Merge 2006-05-12 14:16:20 +05:00
msvensson@neptunus.(none)
aa0b249fdd Correct spelling errors 2006-05-12 11:00:34 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
tnurnberg@mysql.com
ab69fac55d Merge mysql.com:/home/mysql-4.1-10418
into  mysql.com:/home/mysql-5.0-10418
2006-05-12 10:27:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9dffc3cd01 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-12 11:26:42 +03:00
msvensson@neptunus.(none)
058b14d162 Merge neptunus.(none):/home/msvensson/mysql/my50-bug19709
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-12 09:55:31 +02:00
msvensson@neptunus.(none)
d3dd075227 Bug#19709 rpl_tmporary fails on powermacg5
- Don't kill the active connection to the server, instead read 
   the connection id, switch connection and kill the first one from there.
2006-05-12 09:13:37 +02:00
msvensson@neptunus.(none)
de507975fa Fix after merge 5.0->5.1 2006-05-12 09:10:04 +02:00
msvensson@neptunus.(none)
47a578f4e4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-12 08:45:22 +02:00
tnurnberg@mysql.com
41c276aa89 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql-5.1-19509.19509
2006-05-12 06:37:50 +02:00
igor@rurik.mysql.com
d1417ad55a Added a test case for bug #18940:in 5.0 the optimizer chose
a worse execution plan than in 4.1 for some queries.
It happened due the fact that at some conditions the 
optimizer always preferred range or full index scan access
methods to lookup access methods even when the latter were much
cheaper. 
The problem was not observed in 4.1 for the reported query
because the WHERE condition was not of a form that could
cause the problem.
Equality propagation introduced on 5.0 added an extra 
predicate and changed the WHERE condition. The new condition
provoked the optimizer to make a bad choice.

The problem was fixed by the patch for bug 17379.
2006-05-11 19:47:00 -07:00
reggie@linux.site
e672bdc824 removed handlerton-win.cc (again) 2006-05-11 14:46:11 -05:00
jmiller@mysql.com
11d442a1c3 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-11 21:46:10 +02:00
tnurnberg@mysql.com
742996dc8b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql-5.1-19509
2006-05-11 21:46:10 +02:00
reggie@linux.site
aed0fca38a Merge linux.site:/home/reggie/work/mysql-5.1
into  linux.site:/home/reggie/work/mysql-5.1-test
2006-05-11 14:46:10 -05:00
sergefp@mysql.com
319ffaf55a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-merge6
2006-05-11 23:46:09 +04:00
sergefp@mysql.com
be11ca037a Merge mysql.com:/home/psergey/tmp_merge3
into  mysql.com:/home/psergey/mysql-5.1-merge6
2006-05-11 23:40:40 +04:00
reggie@big_geek.
59b3c197a6 Merge reggie@192.168.1.107:/home/reggie/work/mysql-5.1
into  big_geek.:C:/Work/mysql/mysql-5.1-test
2006-05-11 14:14:10 -05:00
tim@siva.hindu.god
5b9ecf1e28 Merge siva.hindu.god:/usr/home/tim/m/51/a
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
2006-05-11 13:14:10 -06:00
sergefp@mysql.com
431582afbb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-merge6
2006-05-11 23:14:09 +04:00
kent@mysql.com
39516f3886 configure.in:
Stepped up to 4.0.28
2006-05-11 19:48:57 +02:00
sergefp@mysql.com
e76acd803c Merge mysql.com:/home/psergey/tmp_merge2
into  mysql.com:/home/psergey/mysql-5.1-merge6
2006-05-11 20:44:31 +04:00
sergefp@mysql.com
acdc038a44 Bug#19136: Manual 5.0->5.1 merge 2006-05-11 20:41:11 +04:00
reggie@big_geek.
67a692f998 performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.
This is being pushed to a private tree and tested before being sent to the mainline.
2006-05-11 11:29:08 -05:00
jmiller@mysql.com
f1d1c98df6 changes for when NDB is default engine 2006-05-11 18:12:06 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
af922ea812 Removed duplicate test. 2006-05-11 19:06:36 +03:00
reggie@big_geek.
3def02edd1 bringing handlerton-win.cc back after incorrectly deleteing it. It is not needed for 5.1 or later but is used by 5.0 2006-05-11 11:06:35 -05:00
jani@a193-229-222-105.elisa-laajakaista.fi
e48db27c67 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-11 19:06:35 +03:00
sergefp@mysql.com
d2efab4d6f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-merge5
2006-05-11 20:06:34 +04:00
sergefp@mysql.com
22c71d3db8 Merge mysql.com:/home/psergey/tmp_merge
into  mysql.com:/home/psergey/mysql-5.1-merge5
2006-05-11 18:41:53 +04:00
cmiller@zippy.(none)
d24b4d6e99 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
2006-05-11 09:14:09 -04:00
gkodinov@mysql.com
0486cfbee2 BUG#7549: Missing error message for invalid view selection with subquery.
When a view statement is compiled on CREATE VIEW time, most of the 
optimizations should not be done. Finding the right optimization 
for a subquery is one of them.
Unfortunately the optimizer is resolving the column references of 
the left expression of IN subqueries in the process of deciding 
witch optimization to use (if needed). So there should be a 
special case in Item_in_subselect::fix_fields() : check the 
validity of the left expression of IN subqueries in CREATE VIEW 
mode and then proceed as normal.
2006-05-11 15:30:54 +03:00
jmiller@mysql.com
2efbd96b8e Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-11 13:46:43 +02:00
tnurnberg@mysql.com
133a5d17f7 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/mysql-4.1-10418
2006-05-11 12:48:49 +02:00
tnurnberg@mysql.com
e6563dea12 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql-5.1-19509
2006-05-11 12:33:43 +02:00
mats@mysql.com
aa47bfa986 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-05-11 11:14:15 +02:00
mats@mysql.com
1c419c8671 Bug#17400 (CRBR: Delete and update of table w/o PK fails on slave):
Fixing bug where UPDATE failed on slave and some cleanup of ndb_unpack_record().
2006-05-11 11:09:58 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
1b18d728ed Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-11 11:16:55 +03:00
kroki@mysql.com
0499b30151 Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-05-11 11:28:56 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
8a3d5e8f4f Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-11 04:20:07 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
95ea2395f2 Some fixes that were not done in original merge, compilation revealed. 2006-05-11 04:11:50 +03:00
tim@siva.hindu.god
94c1a70e96 Merge siva.hindu.god:/usr/home/tim/m/51/a
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
2006-05-10 18:10:17 -06:00
jmiller@mysql.com
79293053c4 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-11 01:41:39 +02:00
tnurnberg@mysql.com
9cd4c070c1 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/mysql-5.0-19263
2006-05-11 01:18:15 +02:00
jmiller@mysql.com
2ef6dffebf rpl_log.test:
Remove comments not needed
2006-05-11 00:59:34 +02:00