tomas@poseidon.ndb.mysql.com
c1d0294983
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 08:38:50 +02:00
aivanov@mysql.com
c66893cd54
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
...
into mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
2006-04-26 09:59:05 +04:00
aivanov@mysql.com
b748835897
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 09:56:06 +04:00
aivanov@mysql.com
7b8c526078
Files innodb.[test|result] are to be used by Innobase only.
...
Use files innodb_mysql.[test|result] instead.
2006-04-26 09:51:57 +04:00
andrey@lmy004.
679f609793
disable before investigation why test case for 19170 is failing on
...
some platforms.
2006-04-26 07:29:26 +03:00
tomas@poseidon.ndb.mysql.com
0e8ccc1bee
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 01:13:16 +02:00
tomas@poseidon.ndb.mysql.com
fc387e73c0
ndb: break out ndb backup compatability test, so that it can be disabled on mac
2006-04-26 01:11:40 +02:00
sergefp@mysql.com
867dffa8a4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug15827-r2
2006-04-26 00:30:54 +04:00
tomas@poseidon.ndb.mysql.com
f2d4d4cfaf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-25 22:21:47 +02:00
andrey@lmy004.
e0c68bffb4
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-new-clean
2006-04-25 23:14:49 +03:00
sergefp@mysql.com
1d4acfb668
BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes
...
too much memory. Instead, either create the equvalent SEL_TREE manually, or create only two ranges that
strictly include the area to scan
(Note: just to re-iterate: increasing NOT_IN_IGNORE_THRESHOLD will make optimization run slower for big
IN-lists, but the server will not run out of memory. O(N^2) memory use has been eliminated)
2006-04-25 23:33:31 +04:00
aelkin@mysql.com
3363effa52
Merge mysql.com:/home/elkin/MySQL/BARE/5.0
...
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
2006-04-25 20:05:15 +03:00
mleich@mysql.com
ec163e9d1e
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
2006-04-25 19:05:07 +02:00
mleich@mysql.com
3bddd31b92
Post merge correction for the Changeset
...
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
- Reactivation of testcase rpl_deadlock_innodb + updated file with expected results
- Removal of wrong entry within disabled.def
2006-04-25 18:28:29 +02:00
pem@mysql.com
f1374951c9
Post-merge fixes from 5.0.
2006-04-25 17:44:35 +02:00
jonas@perch.ndb.mysql.com
49d0bd9beb
reenable ndb_cache2 & ndb_cach_multi2 as I've fixed bug-18597
2006-04-25 17:02:50 +02:00
jonas@perch.ndb.mysql.com
e8797b49d2
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-25 17:02:49 +02:00
pem@mysql.com
0e2d20b1cb
Merge mysql.com:/extern/mysql/5.1/generic/mysql-5.0-merge
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-04-25 16:20:49 +02:00
evgen@moonbone.local
69b90fb2a8
Merge epotemkin@lsmy3:/data/users/bk/mysql-5.0-opt-bugs
...
into moonbone.local:/work/18739-bug-5.0-mysql
2006-04-25 17:45:31 +04:00
tomas@poseidon.ndb.mysql.com
3d8c52615f
modified ndb backup/restore to be byte order independant
...
- the replica info was not stored in byte order indepentent format
- backup/restore still compatible 5.0->5.1
- but patch makes previous 5.1 versions completely incompatible
2006-04-25 14:02:15 +02:00
ramil@mysql.com
8cdd68a830
Fix for bug #18501 : Server crashes with monthname().
2006-04-25 14:34:19 +05:00
evgen@moonbone.local
6ea27b1013
Manually merged
2006-04-25 13:04:39 +04:00
kroki@mysql.com
63157dca63
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
2006-04-25 13:01:27 +04:00
mskold@mysql.com
4d771e4fca
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
2006-04-25 10:36:39 +02:00
konstantin@mysql.com
f912a26b4a
A fix and a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE
...
supported in SP but not in PS": just enable them in prepared
statements, the supporting functionality was implemented when
they were enabled in stored procedures.
2006-04-25 04:27:23 +04:00
knielsen@mysql.com
854cbe88b6
Merge mysql.com:/usr/local/mysql/mysql-4.1
...
into mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix
2006-04-24 23:51:47 +02:00
tomas@poseidon.ndb.mysql.com
243965789e
Bug #14516 Restart of cluster can cause NDB API replication failure
...
- this behavior was already changed, adding testcase
2006-04-24 23:29:33 +02:00
cmiller@zippy.(none)
9ae7dd9e35
Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-04-24 16:17:50 -04:00
cmiller@zippy.(none)
693695850b
Manual merge fix.
2006-04-24 16:05:57 -04:00
andrey@lmy004.
7a314abaa9
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-new-clean
2006-04-24 23:04:15 +03:00
msvensson@neptunus.(none)
95cac67921
Revert use of octal numbers for chmod
2006-04-24 21:42:44 +02:00
cmiller@zippy.(none)
81d3a4fb05
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
Merge by hand. This may not be right.
2006-04-24 14:49:05 -04:00
evgen@moonbone.local
3c06a20bfe
having.test:
...
After merge fix for bug#18739
2006-04-24 20:59:23 +04:00
tomas@poseidon.ndb.mysql.com
5241916946
bug#18604 create logfile for MyISAM tables
...
- changed alter tablespace truct to work with handlerton pointer (to avoid crash in parser on unknown db type"
- pushed warnings when default storage engine is used and/or tablespace stuff is not supported by storage engine
2006-04-24 18:26:30 +02:00
dlenev@mysql.com
0fd2c5b53e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/mysql-5.0-bg11081
2006-04-24 19:00:37 +04:00
dlenev@mysql.com
2033f7ba45
Fix for bug#11081 "Using a CONVERT_TZ function in a stored function or
...
trigger fails".
In cases when CONVERT_TZ() function was used in trigger or stored function
(or in stored procedure which was called from trigger or stored function)
error about non existing '.' table was reported.
Statements that use CONVERT_TZ() function should have time zone related
tables in their table list. tz_init_table_list() function which is used
to produce part of table list containing those tables didn't set
TABLE_LIST::db_length/table_name_length members properly. As result time
zone tables needed for CONVERT_TZ() function were incorrectly handled by
prelocking algorithm and "Table '.' doesn't exist' error was emitted.
This fix changes tz_init_table_list() in such way that it properly inits
TABLE_LIST::table_name_length/db_length members and thus produces table list
which can be handled by prelocking algorithm correctly.
2006-04-24 18:57:00 +04:00
svoj@april.(none)
a83c4b6841
Merge april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-new
2006-04-24 19:53:38 +05:00
kroki@mysql.com
c77336c260
Bug#16501: IS_USED_LOCK does not appear to work
...
Update User_level_lock::thread_id on acquiring an existing lock,
and reset it on lock release.
2006-04-24 18:06:43 +04:00
tomas@poseidon.ndb.mysql.com
d999da80b0
Bug #18935 restore of apply_status table fails using old ndb backup
2006-04-24 16:05:02 +02:00
evgen@moonbone.local
1a6dc770e3
Manually merged
2006-04-24 17:52:15 +04:00
knielsen@mysql.com
17a80c9da4
Fix typo in mysql-test-run.pl (not caught by aotupush since it uses mysql-test-run.sh).
2006-04-24 15:34:01 +02:00
msvensson@neptunus.(none)
92cd4762af
Update disabled message to include bug no.
2006-04-24 14:25:34 +02:00
msvensson@neptunus.(none)
c2efcc4adf
Test it it works better to set no read access for a file by using 000 instead of -r
...
Looks like the trigger.test works that way
2006-04-24 13:51:21 +02:00
msvensson@neptunus.(none)
fd52c34124
Update help message for start-and-exit
2006-04-24 13:33:33 +02:00
msvensson@neptunus.(none)
9e49e393a4
Ad file "have_ndb_status_ok.require"
2006-04-24 13:25:50 +02:00
bell@sanja.is.com.ua
b2c810e847
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
2006-04-24 13:32:07 +03:00
msvensson@neptunus.(none)
b30df055af
Use "eval select" when evaluating the environment variable "$MYSQL_TEST_ROOT"
2006-04-24 12:01:16 +02:00
msvensson@neptunus.(none)
d1536ba0c9
Make have_ndb.in portable
2006-04-24 12:00:11 +02:00
andrey@lmy004.
6b3fe492ed
enable logs_tests
2006-04-24 12:30:17 +03:00
msvensson@neptunus.(none)
7e3593def8
Bug#19084 ./mysql-test-run.pl do not print bootstrap run info
...
- Log boostratp/install to var/log/boostrap.log
- Log output from mysqladmin to var/log/mysqladmin.log
- Remove old manager references
2006-04-24 11:26:41 +02:00