Commit graph

399 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
6c809561fe Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:07:17 +01:00
stewart@mysql.com
05696de46f Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
2006-02-16 15:51:37 +11:00
jonas@perch.ndb.mysql.com
e9d9261d63 ndb dd -
Fix bug in tsman undo
2006-02-15 13:20:15 +01:00
serg@serg.mylan
48b8e842ca Automerge 2006-02-15 00:01:46 +01:00
serg@serg.mylan
63cfd11859 dbug changes:
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
2006-02-14 22:36:11 +01:00
tomas@poseidon.ndb.mysql.com
0262bb9a11 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-14 17:05:35 +01:00
tomas@poseidon.ndb.mysql.com
a185ce2f39 Bug #16445 ndb, schema version error 241 after mysqld restart
- table dictionary status was checked only for Invalid
2006-02-14 17:03:35 +01:00
svoj@april.(none)
7e8b145b94 BUG#17117: header fille "plugin.h" does not have a namespace prefix
plugin.h has been moved into include/mysql/plugin.h
2006-02-14 13:51:25 +04:00
jonas@perch.ndb.mysql.com
a4d419320d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-02-14 08:09:45 +01:00
jonas@eel.(none)
7ee44703f9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  eel.(none):/home/jonas/src/mysql-5.1-new
2006-02-14 08:01:57 +01:00
jonas@eel.(none)
635ce25bc3 ndb dd -
fix undo of bitmap
2006-02-14 07:57:43 +01:00
tomas@poseidon.ndb.mysql.com
ce10983ead forgot to commit in prev patch 2006-02-13 17:07:13 +01:00
tomas@poseidon.ndb.mysql.com
7db7cd462f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-13 16:15:41 +01:00
tomas@poseidon.ndb.mysql.com
9a3b27dae9 manual merge 2006-02-13 14:25:31 +01:00
jonas@perch.ndb.mysql.com
bb043db2c9 ndb - Change block constructor for more flexibility
Remove old typedef's ArrayFifoList, ArrayList
2006-02-13 13:12:47 +01:00
kent@mysql.com
eb9683442d Merge 2006-02-12 20:45:03 +01:00
tomas@poseidon.ndb.mysql.com
f0d95d0af3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-10 18:04:46 +01:00
joerg@mysql.com
6c464815c9 Several Netware specific fixes.
Originally, done by Jani and pushed to the general 5.1 tree
as ChangeSet 2006/02/02 16:22:31+02:00 jani@ua141d10.elisa.omakaista.fi
now just copied to the 5.1.6 build clone.
2006-02-10 13:50:22 +01:00
joerg@mysql.com
e252af334c storage/innobase/include/univ.i : Get rid of "extern inline" (part of innodb-5.0-149/162 snapshots). 2006-02-10 12:39:31 +01:00
aivanov@mysql.com
f8f8af970e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-02-10 01:15:45 +03:00
aivanov@mysql.com
e22d2f1150 Fixed BUG#9680: Wrong error from cascading update
Applied 9680.patch (by Osku Salerma)
2006-02-09 20:43:10 +03:00
konstantin@mysql.com
2a267fed2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 14:22:34 +03:00
konstantin@mysql.com
e1f807af26 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 13:35:59 +03:00
brian@zim.tangent.org
01a8c54406 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-08 21:55:40 -08:00
konstantin@mysql.com
5ed755d0d8 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 23:53:45 +03:00
joerg@mysql.com
c84e41e3b9 Link errors in 5.1.6 on Solaris in debug builds, overcome by not building two NDB test programs. 2006-02-08 19:01:54 +01:00
konstantin@mysql.com
790c9a05f4 Post merge-fixes.
Apply a patch by Jonas for NDB diskdata.
2006-02-08 15:03:09 +03:00
jonas@perch.ndb.mysql.com
05a17d95a3 5.1.6 release ndb dd - fix problem with O_DIRECT on some platforms 2006-02-08 11:59:45 +01:00
konstantin@mysql.com
0831fd611e Apply the diskdata patch by Jonas. 2006-02-08 13:05:16 +03:00
jonas@eel.(none)
044c51abf7 ndb dd - fix bug with deletes during LCP, that link between mm and dd could get lost 2006-02-08 09:04:58 +01:00
brian@zim.tangent.org
23d99ee03c The handlerton structures for archive and CSV had not been updated. Nicht so gute. I also fixed CSV to use fast alter table and put in a test in archive in case someone tries to do the same there (hint... it won't work). 2006-02-07 22:42:57 -08:00
jonas@eel.(none)
bcca33e9e3 ndb dd -
fix a SR bug (lcp impl. in pgman)
2006-02-08 07:10:37 +01:00
jonas@perch.ndb.mysql.com
67835c1336 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-07 12:16:25 +01:00
jonas@perch.ndb.mysql.com
fbad43132d bug#16924 - ndb - insert wo/ specifying null on varsize attribute
init both pos and len
2006-02-07 11:27:11 +01:00
tomas@poseidon.ndb.mysql.com
69ed898ec2 MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event 2006-02-07 10:26:32 +01:00
tomas@poseidon.ndb.mysql.com
28e925454a MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event 2006-02-07 10:03:03 +01:00
jonas@perch.ndb.mysql.com
1efd256eae merge 2006-02-06 21:47:30 +01:00
jonas@perch.ndb.mysql.com
78e437e868 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-06 21:31:34 +01:00
jonas@perch.ndb.mysql.com
20646cf331 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-06 11:48:38 +01:00
jonas@perch.ndb.mysql.com
d65edca7a1 bug#16873 -
Print creating of dd objects during ndb_restore
2006-02-06 10:07:15 +01:00
jonas@perch.ndb.mysql.com
4982376560 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-06 09:38:13 +01:00
jonas@eel.(none)
e77aa473f5 ndb dd -
fix uninit variable in lgman
2006-02-06 08:01:58 +01:00
jonas@eel.(none)
98d87fc55e ndb
Fix for wierd var key restore problem
2006-02-06 07:30:12 +01:00
pekka@mysql.com
09eab9a8b1 ndb - TUP scan: unlock outstanding locks on scan close (lost+found patch) 2006-02-05 23:51:47 +01:00
pekka@mysql.com
66c52cbdb8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-05 19:13:05 +01:00
pekka@mysql.com
738db4f1a2 ndb - rbr blobs works now (or again) 2006-02-05 19:11:11 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
d955abd292 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
2006-02-05 11:06:29 +02:00
jonas@perch.ndb.mysql.com
420204c994 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-02-03 15:37:36 +01:00
jonas@perch.ndb.mysql.com
e9692dffa5 ndb dd
Fix a copule of dd bugs
    typo in lgman, potential run-time crash
    inconsistency in tup, potentially causing crash after SR
2006-02-03 15:30:24 +01:00
jonas@eel.(none)
e29db06753 ndb dd -
Fix possible deadlock when running with small log buffer, causing buffer to be full, but not page getting flushed
2006-02-03 10:53:43 +01:00