tnurnberg@salvation.intern.azundris.com
4550b9d044
manual merge
2006-08-16 23:45:01 +02:00
iggy@rolltop.ignatz42.dyndns.org
ca6532af50
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
2006-08-16 16:16:10 -04:00
tnurnberg@salvation.intern.azundris.com
2c16439d02
Merge tnurnberg@maint1:/data/localhome/tnurnberg/i51
...
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51
2006-08-16 21:34:20 +02:00
mikael/pappa@dator5.(none)
b738fd4db8
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
...
into dator5.(none):/home/pappa/bug21388
2006-08-16 14:46:30 -04:00
iggy@rolltop.ignatz42.dyndns.org
a86f035a08
Bug#20328 - Correction to test/result for broken Windows build.
2006-08-16 13:55:16 -04:00
pgalbraith/patg@govinda.patg.net
370f22418b
merge 5.0 -> 5.1, re-enabling federated, disabled partition
2006-08-16 10:47:53 -07:00
igor@rurik.mysql.com
cabb55a64f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-08-16 10:21:23 -07:00
patg@govinda.patg.net
b56ff54805
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
2006-08-16 10:05:24 -07:00
patg@govinda.patg.net
79ad722e39
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
2006-08-16 10:03:24 -07:00
igor@rurik.mysql.com
067d6fdfca
Fixed bug #18165 .
...
Made [NOT]BETWEEN predicates SARGable in respect to the second and
the third arguments.
2006-08-16 09:37:19 -07:00
rburnett@bk-internal.mysql.com
38a36da86d
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-16 17:47:20 +02:00
reggie@big_geek.
55165b2f55
small fix to enable the test suite to find executables and scripts on Windows
2006-08-16 10:19:48 -05:00
msvensson@shellback.(none)
da60a5194c
Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 17:14:40 +02:00
msvensson@shellback.(none)
c400562897
Merge shellback.(none):/home/msvensson/mysql/bug20328/my51-bug20328
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-16 17:07:58 +02:00
msvensson@shellback.(none)
496a04ccfa
Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328
...
into shellback.(none):/home/msvensson/mysql/bug20328/my51-bug20328
2006-08-16 17:05:43 +02:00
msvensson@shellback.(none)
98eaa07600
Bug#20328 mysql client: dumb about trailing spaces on 'help' command
...
Fix testcase to also work on windows
2006-08-16 17:03:41 +02:00
mikael/pappa@dator5.(none)
a6df8abf2c
Merge dator5.(none):/home/pappa/bug21143
...
into dator5.(none):/home/pappa/bug21388
2006-08-16 10:53:20 -04:00
mikael/pappa@dator5.(none)
8d8b2b38df
Merge dator5.(none):/home/pappa/bug21173
...
into dator5.(none):/home/pappa/bug21388
2006-08-16 10:47:13 -04:00
mikael/pappa@dator5.(none)
142af8c26f
Merge dator5.(none):/home/pappa/bug15890
...
into dator5.(none):/home/pappa/bug21388
2006-08-16 10:41:17 -04:00
mikael/pappa@dator5.(none)
9ba77eb876
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug21388
2006-08-16 10:36:01 -04:00
evgen@sunlight.local
db17048cac
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into sunlight.local:/local_work/21261-bug-5.0-mysql
2006-08-16 18:17:58 +04:00
rburnett@bk-internal.mysql.com
8baecf7ed6
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-16 16:04:10 +02:00
rburnett@bk-internal.mysql.com
f23643cc54
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-16 15:58:25 +02:00
msvensson@shellback.(none)
27a4154631
Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 15:52:52 +02:00
msvensson@shellback.(none)
b963293595
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 15:50:50 +02:00
msvensson@shellback.(none)
685937a702
Merge shellback.(none):/home/msvensson/mysql/bug20219/my51-bug20219
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-16 15:43:02 +02:00
msvensson@shellback.(none)
a163faf0d3
Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219
...
into shellback.(none):/home/msvensson/mysql/bug20219/my51-bug20219
2006-08-16 15:29:58 +02:00
msvensson@shellback.(none)
ba1ac55acf
Bug#20219 make bin-dist produces unportable for testing tarball
...
- Setup LD_LIBRARY_PATH to favor local libs
2006-08-16 15:25:30 +02:00
msvensson@shellback.(none)
f03e672c4e
Fix indentation
2006-08-16 13:47:01 +02:00
jonas@perch.ndb.mysql.com
a13d114d02
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-16 11:06:56 +02:00
jonas@perch.ndb.mysql.com
1425f18373
ndb -
...
Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
This will hopefully remove some volatile testfailures in pushbuild
(i've seen a couple by looking at logs)
2006-08-16 11:05:02 +02:00
msvensson@shellback.(none)
40983a32dc
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-16 10:43:08 +02:00
msvensson@shellback.(none)
0c41fd3abb
Move initializations of environment variables that are constant during the whole testrun to 'environment_setup'
...
Split out functions that detects if we need master or slave restarts
2006-08-16 10:30:22 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
39860d67de
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b9509
2006-08-16 12:42:22 +05:00
holyfoot/hf@mysql.com/deer.(none)
c965eea789
Merge bk@192.168.21.1:mysql-5.0-kt
...
into mysql.com:/home/hf/work/mysql-5.0.20910
2006-08-16 09:57:05 +05:00
ramil/rkalimullin@production.mysql.com
4ef5116425
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
2006-08-16 06:37:39 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
b1f9b63a54
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b9509
2006-08-16 09:31:24 +05:00
brian@zim.(none)
8d83366bac
Merge zim.(none):/home/brian/mysql/dep-5.1
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-15 13:53:13 -07:00
evgen@moonbone.local
9b10c3a0fc
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/15950-bug-5.0-opt-mysql
2006-08-15 21:48:07 +04:00
evgen@sunlight.local
dd9a07706b
Fixed bug#21261: Wrong access rights was required for an insert into a view
...
SELECT right instead of INSERT right was required for an insert into to a view.
This wrong behaviour appeared after the fix for bug #20989 . Its intention was
to ask only SELECT right for all tables except the very first for a complex
INSERT query. But that patch has done it in a wrong way and lead to asking
a wrong access right for an insert into a view.
The setup_tables_and_check_access() function now accepts two want_access
parameters. One will be used for the first table and the second for other
tables.
2006-08-15 21:45:24 +04:00
cmiller@maint1.mysql.com
a90dd98bd1
Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908
...
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
2006-08-15 19:34:53 +02:00
cmiller@maint1.mysql.com
686074f077
Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908
...
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-new-maint
2006-08-15 19:33:51 +02:00
sergefp@mysql.com
7c73d0b2d6
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-opt-bug21282-r2
2006-08-15 21:32:09 +04:00
cmiller@maint1.mysql.com
bebdc62840
Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908
...
into maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908
2006-08-15 19:30:24 +02:00
sergefp@mysql.com
f68d8cf994
BUG#21077: 4.1->5.0 merge
2006-08-15 21:16:02 +04:00
sergefp@mysql.com
1230f3ad38
BUG#21282: Incorrect query results for "t.key NOT IN (<big const list>)
...
In fix for BUG#15872, a condition of type "t.key NOT IN (c1, .... cN)"
where N>1000, was incorrectly converted to
(-inf < X < c_min) OR (c_max < X)
Now this conversion is removed, we dont produce any range lists for such
conditions.
2006-08-15 21:08:22 +04:00
evgen@moonbone.local
8364a646a9
Fixed bug#15950: NOW() optimized away in VIEWs
...
This bug is a side-effect of bug fix #16377 . NOW() is optimized in
BETWEEN to integer constants to speed up query execution. When view is being
created it saves already modified query and thus becomes wrong.
The agg_cmp_type() function now substitutes constant result DATE/TIME functions
for their results only if the current query isn't CREATE VIEW or SHOW CREATE
VIEW.
2006-08-15 21:02:55 +04:00
cmiller@maint1.mysql.com
53bb6a47cd
Bug #20908 : Crash if select @@""
...
Zero-length variables caused failures when using the length to look
up the name in a hash. Instead, signal that no zero-length name can
ever be found and that to encounter one is a syntax error.
2006-08-15 18:41:21 +02:00
sergefp@mysql.com
86c5cad4e0
BUG#21077: Possible crash caused by invalid sequence of handler::* calls:
...
The crash was caused by invalid sequence of handler::** calls:
ha_smth->index_init();
ha_smth->index_next_same(); (2)
(2) is an invalid call as it was not preceeded by any 'scan setup' call
like index_first() or index_read(). The cause was that QUICK_SELECT::reset()
didn't "fully reset" the quick select- current QUICK_RANGE wasn't forgotten,
and quick select might attempt to continue reading the range, which would
result in the above mentioned invalid sequence of handler calls.
5.x versions are not affected by the bug - they already have the missing
"range=NULL" clause.
2006-08-15 20:33:14 +04:00
pgalbraith/patg@govinda.patg.net
67513cafa5
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
2006-08-15 09:02:53 -07:00