Commit graph

31456 commits

Author SHA1 Message Date
lars/lthalmann@mysql.com/dl145j.mysql.com
4c467cc438 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-11 13:17:51 +02:00
jonas@perch.ndb.mysql.com
7ff631e890 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-09-04 13:46:56 +02:00
jonas@perch.ndb.mysql.com
96ff8b4c52 bug#21965 - replication
fix deadlock if master switches log file in parallell with "show master logs"
2006-09-04 13:43:34 +02:00
jonas@perch.ndb.mysql.com
67a5d98c1d ndb - bug#21615
Improve error message when detecting corrupted REDO log
2006-08-28 10:26:21 +02:00
jonas@perch.ndb.mysql.com
7cb75fc850 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-24 07:18:04 +02:00
jonas@perch.ndb.mysql.com
b60be73461 ndb - bug#21800
read TransactionDeadlockTimeout (for scans) to cater for insane settings
2006-08-24 07:14:46 +02:00
jonas@perch.ndb.mysql.com
3cd1826ef0 ndb - bug#20708
init ndb_cache_check_time and honor value in my.cnf
2006-08-15 14:22:47 +02:00
jonas@perch.ndb.mysql.com
c22a8afc4b Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-14 11:55:13 +02:00
jonas@perch.ndb.mysql.com
a2f1b78083 ndb - bug#21536
Make sure updateNodeInfo is run on master also for temporary tables
2006-08-09 16:24:14 +02:00
jonas@perch.ndb.mysql.com
877950b610 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-08 08:00:22 +02:00
jonas@perch.ndb.mysql.com
c2ad5b4ba0 ndb - bug#21213
Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
  (only needed when >2 replica)
2006-08-08 07:59:52 +02:00
jonas@perch.ndb.mysql.com
7037fd564b Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-07 09:49:46 +02:00
jonas@perch.ndb.mysql.com
8754e59a8f ndb - bug#18475
Fix error message on copyfragref
2006-08-07 09:41:39 +02:00
jonas@perch.ndb.mysql.com
b6f2e59529 ndb - bug#21129
add missing function to mgmapi
2006-08-04 10:30:57 +02:00
jonas@perch.ndb.mysql.com
6285f743b3 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-04 10:16:42 +02:00
jonas@perch.ndb.mysql.com
8a825e3cfa ndb - bug#21400
Fix docs for NdbOpertation::sub_reg
2006-08-04 09:43:23 +02:00
jonas@perch.ndb.mysql.com
fe87ad292f Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-04 08:41:50 +02:00
jonas@perch.ndb.mysql.com
9bf1aec1c4 ndb - bug#20296 (recommit in 4.1)
Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
     Yeilding crash on following dml on tupel
2006-08-04 08:41:32 +02:00
jonas@perch.ndb.mysql.com
cb9f224a1f ndb - bug#21384
merge 4.1->5.0 (variable rename)
2006-08-03 15:38:04 +02:00
jonas@perch.ndb.mysql.com
ff9a106b24 ndb - bug#20892
Correction of bug#19852 (that also revealed another bug)
  Do grow noOfPagesToGrow with more than was actually allocated
2006-08-03 14:46:11 +02:00
jonas@perch.ndb.mysql.com
7d5a9b8df0 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-03 14:02:39 +02:00
jonas@perch.ndb.mysql.com
cfd29d00d2 ndb - bug#20892
Fix bug in tup buddy allocator, which made it make invalid access to cfreepagelist[16] (which is not defined)
2006-08-03 14:01:37 +02:00
jonas@perch.ndb.mysql.com
068b6770eb Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-02 09:13:43 +02:00
jonas@perch.ndb.mysql.com
b87f962945 ndb -
Make possible to build both debug/release from compile-ndb-autotest
2006-08-02 09:08:21 +02:00
jonas@perch.ndb.mysql.com
f14cf468cd Merge perch.ndb.mysql.com:/home/jonas/src/41-jonas
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-02 08:28:48 +02:00
grog@eucla.lemis.com
90c9c72605 BUG#13926: --order-by-primary fails if PKEY contains quote character.
Quote PKEY.
2006-08-02 11:26:08 +09:30
grog@eucla.lemis.com
8597ebaed0 mysqldump.c:
Tidy up style: no space before = or +=.
2006-08-02 10:48:47 +09:30
jonas@perch.ndb.mysql.com
deea543ead Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/41-jonas
2006-08-01 17:22:38 +02:00
jonas@perch.ndb.mysql.com
154d7af085 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-01 17:06:02 +02:00
jonas@perch.ndb.mysql.com
bcc9faee44 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-01 17:04:29 +02:00
jonas@perch.ndb.mysql.com
19be75811e ndb - fix error message 2006-08-01 17:03:17 +02:00
jonas@perch.ndb.mysql.com
ca88547839 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/41-work
2006-08-01 16:56:57 +02:00
jonas@perch.ndb.mysql.com
ba6c5beaa7 ndb - bug#21384
handle error in TCKEYREQ during TCINDXREQ better
2006-08-01 16:55:41 +02:00
jonas@perch.ndb.mysql.com
9339be3ab7 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/41-jonas
2006-08-01 16:41:02 +02:00
jonas@perch.ndb.mysql.com
cdce8b1066 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-08-01 16:26:22 +02:00
jonas@perch.ndb.mysql.com
05492af2ab Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-08-01 16:25:48 +02:00
jonas@perch.ndb.mysql.com
046e242e19 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/41-jonas
2006-08-01 16:22:15 +02:00
jonas@perch.ndb.mysql.com
5723b6f917 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/41-jonas
2006-08-01 16:21:45 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
d8d17559ee Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-08-01 06:09:41 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
d9f5416be5 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-08-01 06:08:09 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b3bc1d02de Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-08-01 02:10:30 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
3fc037db1b Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-07-31 21:32:57 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
635281619b Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-07-31 21:30:24 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
4a461fdae3 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-07-29 17:40:10 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5d948f5ec4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-29 17:26:06 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f2ec5d7128 configure.in:
Corrected typo
2006-07-29 17:24:48 +02:00
kroki/tomash@moonlight.intranet
cc98d26a23 Fix after manual merge. 2006-07-29 13:50:08 +04:00
kroki/tomash@moonlight.intranet
5c90b6f810 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-07-29 13:43:34 +04:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
bd47f4f3be udf_example.c, udf.test, Makefile.am:
Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336)
2006-07-29 04:41:50 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-28 23:40:05 +02:00