Commit graph

13788 commits

Author SHA1 Message Date
unknown
cbfac1be39 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-12 12:29:41 +02:00
unknown
84f312be1c Fix for diskless 2004-08-12 12:28:48 +02:00
unknown
55f964e45c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4878
2004-08-12 14:50:29 +05:00
unknown
edf128faa9 Init signal before continueb 2004-08-12 11:35:42 +02:00
unknown
7a414bf452 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-12 11:09:03 +02:00
unknown
1d399d1d95 testTransaction
Resources in SUMA


ndb/src/kernel/blocks/suma/Suma.cpp:
  release table attributes/fragments when releasing table.
  add #if 0-ed READ_CONFIG_REQ (todo)
2004-08-12 10:36:44 +02:00
unknown
11b2abb20d Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
2004-08-12 14:21:35 +06:00
unknown
caa525d8cc Added tests for fix of bug#4730 2004-08-12 10:15:53 +02:00
unknown
c190de541f bug#4997 - --log-error sometimes generates incorrect default name.
Now replacing domain name by 'err'. If host name doesn't have a
domain name, '.err' is appended as before.
2004-08-12 09:40:32 +02:00
unknown
00c547d3ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-12 08:57:15 +02:00
unknown
db2db3c088 testScan -n ScanRandomTable
testDict -n FragmentType


ndb/test/ndbapi/testDict.cpp:
  Drop table before trying to create with special fragmentation
ndb/test/ndbapi/testScan.cpp:
  testScan -n ScanRandomTable
ndb/test/src/NDBT_Tables.cpp:
  testScan -n ScanRandomTable
2004-08-12 08:54:21 +02:00
unknown
a7d2c573f1 A fix (Bug #4878: Service crashes on query execution) 2004-08-12 11:28:39 +05:00
unknown
330e3b1f8c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-12 07:49:13 +02:00
unknown
05589d7933 Add ndb binaries to ignore list
BitKeeper/etc/ignore:
  added ndb/src/cw/cpcd/ndb_cpcd ndb/src/kernel/ndbd ndb/src/kernel/blocks/backup/restore/ndb_restore ndb/src/mgmclient/ndb_mgm ndb/src/mgmsrv/ndb_mgmd ndb/tools/ndb_delete_all ndb/tools/ndb_desc ndb/tools/ndb_drop_index ndb/tools/ndb_drop_table ndb/tools/ndb_select_all ndb/tools/ndb_select_count ndb/tools/ndb_show_tables ndb/tools/ndb_waiter
2004-08-12 07:48:18 +02:00
unknown
0ce3a41e71 Bug#5005 collation cp852_bin makes server crash
ctype-simple.c:
  Check that unicode map was loaded
cp852.xml:
  Missing cp852_bin was added.


sql/share/charsets/cp852.xml:
  Missing cp852_bin was added.
strings/ctype-simple.c:
  Check that unicode map was loaded
2004-08-12 10:46:16 +05:00
unknown
245d37a9e4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-12 07:46:12 +02:00
unknown
b37a736110 Fix for BUG#4488: first portion: sign aware '<' and '>' comparisons. 2004-08-11 23:08:20 +04:00
unknown
e21380034c Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-11 15:28:48 +02:00
unknown
89e9a2e28e bug fixed: when inited=0, can_be_used should be 0 too. (BUG#4901)
mysys/mf_keycache.c:
  bug fixed: when inited=0, can_be_used should be 0 too. (BUG#4901)
  end spaces removed (no merge problems as this file doesn't change much)
2004-08-11 15:25:02 +02:00
unknown
f54f4b2c69 ctype_uca.test, ctype_uca.result, ctype-uca.c:
Slovak collation didn't work: typo fix in the tailoring rules


strings/ctype-uca.c:
  Slovak collation didn't work: typo fix in the tailoring rules
mysql-test/r/ctype_uca.result:
  Slovak collation didn't work: typo fix in the tailoring rules
mysql-test/t/ctype_uca.test:
  Slovak collation didn't work: typo fix in the tailoring rules
2004-08-11 18:06:20 +05:00
unknown
732ccc5ccc Fix for bug#4730 2004-08-11 15:06:17 +02:00
unknown
4b390e98c7 InnoDB: Make UNIV_LOG_DEBUG work
innobase/buf/buf0flu.c:
  buf_flush_write_block_low(): Warn about UNIV_LOG_DEBUG only once
innobase/log/log0recv.c:
  log_block_checksum_is_ok_or_old_format(): Disable the check
  if UNIV_LOG_DEBUG is defined
2004-08-11 16:04:37 +03:00
unknown
2ff7f9345d Clear in chucks of 128k with watch_dog refresh in between 2004-08-11 14:49:28 +02:00
unknown
9ae2a1bd01 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-11 12:38:11 +02:00
unknown
89507ae22f Default = memset(0)
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Don't memset pages
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Don't memset pages
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Don't memset pages
2004-08-11 12:35:57 +02:00
unknown
596ee62d82 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-11 12:00:59 +02:00
unknown
7aa7f6e5a3 Can't use diskless when memset has been removed 2004-08-11 12:00:35 +02:00
unknown
4254ab9d1f Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
2004-08-11 15:17:20 +06:00
unknown
02b810d238 BUG#4315
BUG#4535
BUG#4686


sql/item_sum.cc:
  Changed code of fix_fields
  Fixed wrong order of parameters in create_tmp_table
  Changed value set_sum_field in create_tmp_table
2004-08-11 15:15:37 +06:00
unknown
cffa34d9fb ctype_recoding.result, ctype_recoding.test, sql_show.cc:
Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.


sql/sql_show.cc:
  Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
mysql-test/t/ctype_recoding.test:
  Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
mysql-test/r/ctype_recoding.result:
  Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
2004-08-11 14:03:24 +05:00
unknown
5b37002243 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-08-11 11:27:20 +03:00
unknown
8746d743a5 allow get_format(TIMESTAMP, ...) syntax 2004-08-11 10:27:19 +02:00
unknown
ef0d6d35ea Add indexes to test toolkit
ndb/test/include/NDBT_Table.hpp:
  Remove unused parameter
ndb/test/include/NDBT_Tables.hpp:
  Add existsOk
ndb/test/src/NDBT_Tables.cpp:
  Rename C2_* tables to I{123}
  Add indexes to I{123}
ndb/test/src/NDBT_Test.cpp:
  Rename C2_* tables to I{123}
  Add indexes to I{123}
2004-08-11 10:03:43 +02:00
unknown
f0e1384460 Mismatched parantases #ifdef 2004-08-11 08:23:12 +02:00
unknown
f4f8b0d873 print test tables
ndb/test/run-test/daily-basic-tests.txt:
  Use T13 (bigger) for testBasic -n Fill
2004-08-11 08:21:31 +02:00
unknown
a550a61f8c Fix uninit variable bug "surfaced" by removing mem init in SimulatedBlock
ndb/include/kernel/signaldata/StartInfo.hpp:
  Fix signal len
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Put init in constructor
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Send corrent start_inforef
  Init NodeRecord::allowNodeStart
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Remove all mem-inits so that debug/release don't differ
2004-08-11 07:15:37 +02:00
unknown
ce4e83e31d BUG#4983 2004-08-11 06:24:36 +02:00
unknown
e9a4ea902a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/common/transporter/Transporter.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-08-10 17:42:51 +02:00
unknown
c90e962021 Merge mysql.com:/home/jonas/src/bug-4586
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-10 17:29:19 +02:00
unknown
394e0ad470 merge bug 4586 2004-08-10 17:27:07 +02:00
unknown
ec5c569103 Removing const declaration of allocRecord to fix compile problem 2004-08-10 17:09:08 +02:00
unknown
00ac20eb6c Cset exclude: joreland@mysql.com|ChangeSet|20040805155331|12859
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Exclude
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Exclude
2004-08-10 16:05:27 +02:00
unknown
a8ac22a932 bug#4586
Removed printouts


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Removed printouts
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Removed printouts
2004-08-10 16:04:07 +02:00
unknown
186d5db0ea bug-4586
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Disallow expand during redo log execution and reeanble it after
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Disallow expand during redo log execution and reeanble it after
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Maintain list of fragment which should be reenabled after redo log execution
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Maintain list of fragment which should be reenabled after redo log execution
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Reenable when send START_RECCONF
2004-08-10 15:51:31 +02:00
unknown
c029d1b973 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-10 15:19:07 +02:00
unknown
183e7b6f86 ndb test fixes
ndb/test/ndbapi/testIndex.cpp:
  test fixes
ndb/test/ndbapi/testNodeRestart.cpp:
  test fixes
ndb/test/run-test/daily-devel-tests.txt:
  disable non function test
2004-08-10 15:16:48 +02:00
unknown
9e93c0acff Missing result handling in bug fix for bug#3912 2004-08-10 15:04:40 +02:00
unknown
af0f14ded4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-10 14:48:22 +02:00
unknown
89017ca5b0 Bug fix for bug#3912 2004-08-10 14:38:24 +02:00
unknown
0c7f040470 ndb_mgmd occasional core-dumps
clear connect flag before doing disconnect


ndb/src/common/transporter/Transporter.cpp:
  clear connect flag before doing disconnect
2004-08-10 13:40:19 +02:00