Commit graph

31459 commits

Author SHA1 Message Date
unknown
e573a77592 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/sql_yacc.yy:
  Manual merge (rpl 4.1 -> rpl 5.0)
2006-09-11 13:50:41 +02:00
unknown
83e0c9d153 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge (main -> rpl 5.0)
mysql-test/t/mysqldump.test:
  Manual merge (main -> rpl 5.0)
2006-09-11 13:17:51 +02:00
unknown
2780bad053 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-11 11:25:55 +02:00
unknown
14bebaa2dc Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  merge
2006-09-04 13:46:56 +02:00
unknown
d2d605e4ea bug#21965 - replication
fix deadlock if master switches log file in parallell with "show master logs"
  


sql/log.cc:
  add raw_get_current_log which dont take log mutex
sql/sql_class.h:
  add raw_get_current_log which dont take log mutex
sql/sql_repl.cc:
  Fix lock order i.e first log_lock then index_lock
2006-09-04 13:43:34 +02:00
unknown
9c09d53312 BUG#18822 LOAD DATA FROM MASTER corrupts data
there is a bunch of dups. It has been decided to declare this feature as
deprecated.
  


sql/sql_yacc.yy:
  deprecation macro
2006-08-31 02:00:40 +03:00
unknown
b931e3ebad ndb - bug#21615
Improve error message when detecting corrupted REDO log


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Improve error message when detecting corrupted REDO log
2006-08-28 10:26:21 +02:00
unknown
84f393f7cc Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2006-08-24 07:18:04 +02:00
unknown
5d82bec5b8 ndb - bug#21800
read TransactionDeadlockTimeout (for scans) to cater for insane settings


ndb/src/ndbapi/NdbScanOperation.cpp:
  read TransactionDeadlockTimeout to cater for insane settings
2006-08-24 07:14:46 +02:00
unknown
4eb4493538 ndb - bug#20708
init ndb_cache_check_time and honor value in my.cnf


sql/ha_ndbcluster.cc:
  init ndb_cache_check_time and honor value in my.cnf
2006-08-15 14:22:47 +02:00
unknown
d0bd26886c Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
2006-08-14 11:55:13 +02:00
unknown
3d7cb87b00 ndb - bug#21536
Make sure updateNodeInfo is run on master also for temporary tables


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Run update nodeinfo also here to handle
    temprorary tables in some situations
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  new error insert
ndb/test/ndbapi/testSystemRestart.cpp:
  test case
2006-08-09 16:24:14 +02:00
unknown
ad2a2f57da Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-08-08 08:00:22 +02:00
unknown
6e5ad6914e ndb - bug#21213
Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
  (only needed when >2 replica)


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
2006-08-08 07:59:52 +02:00
unknown
78ead1feb2 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  merge
2006-08-07 09:49:46 +02:00
unknown
f4e01cf6a1 ndb - bug#18475
Fix error message on copyfragref


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Fix error message
2006-08-07 09:41:39 +02:00
unknown
b50642e899 ndb - bug#21129
add missing function to mgmapi


ndb/src/mgmapi/ndb_logevent.cpp:
  add missing function
2006-08-04 10:30:57 +02:00
unknown
9e78bbc220 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
2006-08-04 10:16:42 +02:00
unknown
bb285b44c3 ndb - bug#21400
Fix docs for NdbOpertation::sub_reg


ndb/include/ndbapi/NdbOperation.hpp:
  Fix docs for sub_reg
2006-08-04 09:43:23 +02:00
unknown
fc1eeba8be Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
2006-08-04 08:41:50 +02:00
unknown
f287b4a8c8 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



ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
        Yeilding crash on following dml on tupe
2006-08-04 08:41:32 +02:00
unknown
282ff5f149 ndb - bug#21384
merge 4.1->5.0 (variable rename)


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge #21384 4.1->5.0
    variable rename
2006-08-03 15:38:04 +02:00
unknown
d765c17530 ndb - bug#20892
Correction of bug#19852 (that also revealed another bug)
  Do grow noOfPagesToGrow with more than was actually allocated


ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Dont grow "noOfPagesToGrow" with more than was actually allocated
    (as it will then grow indefinitly)
2006-08-03 14:46:11 +02:00
unknown
fe2b9a8f76 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
unknown
42fd7e8f7d ndb - bug#20892
Fix bug in tup buddy allocator, which made it make invalid access to cfreepagelist[16] (which is not defined)


ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  loop from firstListToCheck -1 (as firstListToCheck has already been checked), when looking for less than requested pages
  add if-statement for firtListToCheck == 0
2006-08-03 14:01:37 +02:00
unknown
f3606fa846 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
unknown
753651c1db ndb -
Make possible to build both debug/release from compile-ndb-autotest


BUILD/compile-ndb-autotest:
  Make possible to build both debug/release from compile-ndb-autotest
2006-08-02 09:08:21 +02:00
unknown
cd80d12035 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
unknown
7fd78b848a BUG#13926: --order-by-primary fails if PKEY contains quote character.
Quote PKEY.


mysql-test/t/mysqldump.test:
  Test for BUG#13926: --order-by-primary fails if PKEY contains quote character
mysql-test/r/mysqldump.result:
  Test results for BUG#13926: --order-by-primary fails if PKEY contains quote character
client/mysqldump.c:
  Fix for BUG#13926: --order-by-primary fails if PKEY contains quote character.
  Quote PKEY.
2006-08-02 11:26:08 +09:30
unknown
08e6a3095e mysqldump.c:
Tidy up style: no space before = or +=.


client/mysqldump.c:
  Tidy up style: no space before = or +=.
2006-08-02 10:48:47 +09:30
unknown
9c0517831a 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
unknown
2f8bc2141e Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/test/ndbapi/testIndex.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge
2006-08-01 17:06:02 +02:00
unknown
eb94c0c9f2 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-08-01 17:04:29 +02:00
unknown
2f710b2d69 ndb - fix error message
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix printout
2006-08-01 17:03:17 +02:00
unknown
0752f2d52b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/41-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2006-08-01 16:56:57 +02:00
unknown
e80d95a7d6 ndb - bug#21384
handle error in TCKEYREQ during TCINDXREQ better


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Add 3 values to isIndexOp
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle error in TCKEYREQ during TCINDXREQ
ndb/test/ndbapi/testIndex.cpp:
  Add testcase
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase
2006-08-01 16:55:41 +02:00
unknown
8c08b4f6ae 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
unknown
a3ac499a5a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-08-01 16:26:22 +02:00
unknown
8509c31abb 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
unknown
02a5757e00 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
unknown
9f9ace13ab 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
unknown
edeea349b9 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
unknown
340053df4e 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
unknown
f3099ba3e0 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
unknown
03206fd717 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


extra/yassl/src/ssl.cpp:
  Auto merged
2006-07-31 21:32:57 +02:00
unknown
76f65b3fb3 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
unknown
10888499ee Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0


configure.in:
  Auto merged
2006-07-29 17:40:10 +02:00
unknown
66716f0984 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
2006-07-29 17:26:06 +02:00
unknown
189a687971 configure.in:
Corrected typo


configure.in:
  Corrected typo
2006-07-29 17:24:48 +02:00
unknown
1d0f873d56 Fix after manual merge.
tests/mysql_client_test.c:
  Fix after manual merge: add test for bug#21206.
2006-07-29 13:50:08 +04:00