jonas@perch.ndb.mysql.com
5067c4214b
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-22 12:42:56 +02:00
jonas@perch.ndb.mysql.com
770c2edcdd
ndb - reenable "random" failing test
2006-08-22 12:41:24 +02:00
jonas@perch.ndb.mysql.com
2ae18a6be4
ndb -
...
add another possible ok error in testcase
2006-08-22 11:55:25 +02:00
pekka@orca.ndb.mysql.com
b97a4b7f44
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-08-22 10:24:58 +02:00
jonas@perch.ndb.mysql.com
a1ea21bf26
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-22 09:49:28 +02:00
jonas@perch.ndb.mysql.com
66801f44f9
ndb -
...
reenable some test after adding sync_with_master to end of test
to make sure that binlog has been applied to slave before end of test
2006-08-22 09:48:15 +02:00
cmiller@zippy.cornsilk.net
d170f1b124
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-21 16:59:53 -04:00
rburnett@bk-internal.mysql.com
f98b21b732
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-21 20:27:32 +02:00
cmiller@zippy.cornsilk.net
f2f90320de
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-21 12:59:46 -04:00
cmiller@zippy.cornsilk.net
ff57b304a4
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-21 12:55:43 -04:00
tnurnberg@salvation.intern.azundris.com
f5ffa66c6e
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
2006-08-21 17:16:27 +02:00
joerg@trift2.
47d6296bc7
mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries,
...
because searching for them makes the script abort with all non-NDB builds.
2006-08-21 16:19:29 +02:00
tnurnberg@salvation.intern.azundris.com
92631046d9
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
2006-08-21 16:02:36 +02:00
sergefp@mysql.com
eefa3a6e94
BUG#21277: Wrong results in index_merge queries:
...
Remove the code that cleared "read fields set" for merged scans. That code
was based on assumption that "We're going to just read rowids", while
actually QUICK_RANGE_SELECT code would also need key part values to check
that retrieved record(s) fall within the scanned intervals.
2006-08-21 17:03:07 +04:00
rburnett@bk-internal.mysql.com
f669f944e5
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-21 14:41:50 +02:00
rburnett@bk-internal.mysql.com
e37e0786fc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-21 14:38:58 +02:00
sergefp@mysql.com
e3bdd6c6c2
Fix by Georgi Kodinov:
...
Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
- moved an InnoDB dependent test to the appropriate file
2006-08-21 14:20:03 +04:00
dlenev@mockturtle.local
320f8ccc2f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-bg21216-2
2006-08-21 13:08:49 +04:00
dlenev@mockturtle.local
a486f95547
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21216-2
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg19403-2
2006-08-21 12:28:35 +04:00
dlenev@mockturtle.local
186fa6c291
Fix for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causes
...
server to crash".
Crash caused by assertion failure happened when one ran SHOW OPEN TABLES
while concurrently doing DROP TABLE (or RENAME TABLE, CREATE TABLE LIKE
or any other command that takes name-lock) in other connection.
For non-debug version of server problem exposed itself as wrong output
of SHOW OPEN TABLES statement (it was missing name-locked tables).
Finally in 5.1 both debug and non-debug versions simply crashed in
this situation due to NULL-pointer dereference.
This problem was caused by the fact that table placeholders which were
added to table cache in order to obtain name-lock had TABLE_SHARE::table_name
set to 0. Therefore they broke assumption that this member is non-0 for
all tables in table cache which was checked by assert in list_open_tables()
(in 5.1 this function simply relies on it).
The fix simply sets this member for such placeholders to appropriate value
making this assumption true again.
This patch also includes test for similar bug 12212 "Crash that happens
during removing of database name from cache" reappeared in 5.1 as bug 19403.
2006-08-21 12:18:59 +04:00
msvensson@shellback.(none)
457a7702f6
Turn on reorder by default
2006-08-21 09:53:49 +02:00
msvensson@shellback.(none)
447d2fefdf
Break out and create new function 'run_testcase_check_skip_test'
2006-08-21 09:53:04 +02:00
jonas@perch.ndb.mysql.com
21bfd9849b
ndb - revert timeout changes, as a test depends on it, it mysterious ways
...
(mysql-test-run only)
2006-08-21 07:53:27 +02:00
evgen@moonbone.local
b4c2f3f8e5
Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
...
A date can be represented as an int (like 20060101) and as a string (like
"2006.01.01"). When a DATE/TIME field is compared in one SELECT against both
representations the constant propagation mechanism leads to comparison
of DATE as a string and DATE as an int. In this example it compares 2006 and
20060101 integers. Obviously it fails comparison although they represents the
same date.
Now the Item_bool_func2::fix_length_and_dec() function sets the comparison
context for items being compared. I.e. if items compared as strings the
comparison context is STRING.
The constant propagation mechanism now doesn't mix items used in different
comparison contexts. The context check is done in the
Item_field::equal_fields_propagator() and in the change_cond_ref_to_const()
functions.
Also the better fix for bug 21159 is introduced.
2006-08-21 00:23:57 +04:00
msvensson@neptunus.(none)
0f54eccbb0
Move the initialisation of "NDB_STATUS_OK" env variable to after cluster has been intalled
2006-08-20 20:46:50 +02:00
holyfoot/hf@mysql.com/deer.(none)
54e28cc90c
Merge mysql.com:/home/hf/work/mysql-4.1.15440
...
into mysql.com:/home/hf/work/mysql-5.0-mrg
2006-08-20 20:47:32 +05:00
holyfoot/hf@mysql.com/deer.(none)
cf76884b38
Fix for the failing gis.test
2006-08-18 22:29:35 +05:00
joerg@trift2.
1f79db41fa
mysql-test-run.pl : Fix the search path for "ndb_mgmd" and "ndbd". bug#21721
2006-08-18 18:24:38 +02:00
petr/cps@mysql.com/owlet
30ef47a93c
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2006-08-18 16:48:32 +04:00
jimw@rama.(none)
abc148000d
Bug #21288 : mysqldump segmentation fault when using --where
...
The problem was that the error handling was using a too-small buffer to
print the error message generated. We fix this by not using a buffer at
all, but by using fprintf() directly. There were also some problems with
the error handling in table dumping that was exposed by this fix that were
also corrected.
2006-08-17 14:09:24 -07:00
rburnett@bk-internal.mysql.com
4b7e3775be
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-17 22:30:32 +02:00
jonas@perch.ndb.mysql.com
40754dd6e3
ndb - rpl_ndb_basic
...
fix for change of deadlock timeout in config.ini
2006-08-17 20:59:42 +02:00
jonas@perch.ndb.mysql.com
560fc3e3b3
Merge perch.ndb.mysql.com:/home/jonas/src/51-clean
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-17 19:49:00 +02:00
tnurnberg@salvation.intern.azundris.com
d7cbdfaa3d
Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
2006-08-17 18:39:30 +02:00
cmiller@zippy.cornsilk.net
e65a3e97b5
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-17 12:38:30 -04:00
cmiller@zippy.cornsilk.net
c821fa8bc6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-17 12:17:52 -04:00
rburnett@bk-internal.mysql.com
d65095b451
Merge bk-internal.mysql.com:/data0/bk/tmp_reg
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1
2006-08-17 17:19:41 +02:00
cmiller@zippy.cornsilk.net
64092ca93b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:55:57 -04:00
evgen@moonbone.local
270629a158
ndb_condition_pushdown.result:
...
Corrected test case result after fix for bug#18165
view.result, view.test:
Corrected test case for bug#21261
2006-08-17 18:50:53 +04:00
cmiller@zippy.cornsilk.net
030ddb48f3
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:47:23 -04:00
cmiller@zippy.cornsilk.net
c627a6ce84
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:42:50 -04:00
rburnett@bk-internal.mysql.com
1bfe766869
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-17 16:37:16 +02:00
tnurnberg@maint1.mysql.com
781658d64b
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into maint1.mysql.com:/data/localhome/tnurnberg/mysql-5.1-maint-i51
2006-08-17 16:15:09 +02:00
tnurnberg@salvation.intern.azundris.com
d1e1ea2c27
temporarily disabled partition test, fails w/ PS protocol, filed as Bug#21658
2006-08-17 16:01:33 +02:00
mikael/pappa@dator5.(none)
ddbdc16a21
Merge dator5.(none):/home/pappa/bug21350
...
into dator5.(none):/home/pappa/bug21388
2006-08-17 09:32:13 -04:00
mikael/pappa@dator5.(none)
82e942ef97
merge fix
2006-08-17 09:08:53 -04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
907f5db856
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b20695
2006-08-17 11:36:03 +05:00
pgalbraith/patg@govinda.patg.net
dd1d46c2cd
merge warning test results (!)
2006-08-16 20:39:33 -07:00
pgalbraith/patg@govinda.patg.net
ceb7cb55e7
test result changes (non-functional) for 5.1-5.0 merge
2006-08-16 17:16:36 -07:00
iggy@rolltop.ignatz42.dyndns.org
00ab7be7b9
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
2006-08-16 19:31:33 -04:00