mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33803 commits 2774 branches 343 tags 1.6 GiB
Commit graph

33803 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
stewart@mysql.com
ebbff7ee3f BUG#19340 small leak in ndbd 
small cleanup fixes in kernel/vm/Configuration
 2006-04-25 10:04:46 -07: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
jonas@perch.ndb.mysql.com
c19ab931c6 ndb - 
Fix bootstrap/compile error
 2006-04-25 17:02:48 +02:00
jonas@perch.ndb.mysql.com
4e9c9e2f14 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-25 17:02:47 +02:00
tomas@poseidon.ndb.mysql.com
fde6059554 ndb_restore: more compatablitity checks 2006-04-25 17:02:46 +02:00
ingo@mysql.com
d49ecc49c8 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug18129
 2006-04-25 16:32:38 +02:00
jonas@perch.ndb.mysql.com
76b666e299 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-04-25 16:31:21 +02:00
jonas@perch.ndb.mysql.com
4c3abf617a ndb - 
Fix so that testDict can use/handle disk tables
 2006-04-25 16:30:44 +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
tomas@poseidon.ndb.mysql.com
e005a6900b Merge jonas@perch:src/51-work/ 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-25 16:19:57 +02:00
jonas@perch.ndb.mysql.com
f4e3c711fd Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-25 16:03:21 +02:00
jonas@perch.ndb.mysql.com
ef29fc68b3 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-04-25 16:01:54 +02:00
jonas@perch.ndb.mysql.com
a23944b988 ndb - bug#18597 
Handle early abort of scan, so that resources are correctly freed
 2006-04-25 16:01:08 +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
mskold@mysql.com
8d04fd256d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-25 14:07:41 +02: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
jonas@perch.ndb.mysql.com
834d349f19 ndb - 
1) relax version check for restore block since no changes has happend since 5.1.6
   and improve error message on check failure
   
2) improve lcp/backup max write size...
 2006-04-25 13:32:10 +02:00
tomas@poseidon.ndb.mysql.com
b51074f281 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-25 13:09:06 +02:00
mskold@mysql.com
051e6ac994 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-25 12:46:40 +02:00
mskold@mysql.com
b7ce4c94b4 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-25 12:42:22 +02:00
mskold@mysql.com
435c1028fc Fixed memleak detected by valgrind 2006-04-25 12:40:31 +02:00
ramil@mysql.com
815da9ccee Fix for bug #7643: ALTER TABLE fails for CSV, EXAMPLE, ARCHIVE engines 2006-04-25 15:27:28 +05:00
tomas@poseidon.ndb.mysql.com
03af14c9b9 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 12:22:54 +02:00
evgen@moonbone.local
6ea27b1013 Manually merged 2006-04-25 13:04:39 +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
mskold@mysql.com
b36469ba82 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
 2006-04-25 10:23:16 +02:00
mskold@mysql.com
5eb07ec747 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-25 08:48:10 +02:00
tomas@poseidon.ndb.mysql.com
f21fd09403 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 08:01:47 +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
eb53a5b02c Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0-mtr-fix 
into  mysql.com:/data0/knielsen/mysql-5.0-mtr-fix
 2006-04-24 23:56:36 +02: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
acurtis@xiphis.org
e2ac9dda83 WL#3201 
post-merge fixes
 2006-04-24 14:32:45 -07: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
acurtis@xiphis.org
53d4594cfe Merge xiphis.org:/home/antony/work2/wl3201.3 
into  xiphis.org:/home/antony/work2/wl3201.merge
 2006-04-24 13:36:15 -07: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
svoj@april.(none)
afdb3faae1 after merge fix 2006-04-24 20:19:32 +05: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
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