Commit graph

14877 commits

Author SHA1 Message Date
unknown
d0477d870a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


mysql-test/mysql-test-run.sh:
  Auto merged
2004-09-30 08:44:11 +00:00
unknown
f1521dec91 cosmetic 2004-09-28 23:42:34 +00:00
unknown
edc0bbc56e multiple servers for cluster 2004-09-28 23:40:20 +00:00
unknown
1dd9333fb1 Merge
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  SCCS merged
2004-09-28 19:22:04 +00:00
unknown
bc6207eef1 mysql-test-run.sh:
test


mysql-test/mysql-test-run.sh:
  test
2004-09-28 19:12:44 +00:00
unknown
0a98e3903d ha_ndbcluster.cc:
testing foce send


sql/ha_ndbcluster.cc:
  testing foce send
2004-09-28 19:11:50 +00:00
unknown
22cca35841 Some of the recently pushed prepared statements
tests were disabled due to failures caused by floating point conversion
issues on optimized builds).


mysql-test/include/ps_conv.inc:
  Disable some of the tests for the test suite to pass on an optimized 
  build (floating point issues...).
mysql-test/include/ps_query.inc:
  Disable some of the tests for the test suite to pass on an optimized 
  build (floating point issues...).
mysql-test/r/ps_2myisam.result:
  Fix test results.
mysql-test/r/ps_3innodb.result:
  Fix test results.
mysql-test/r/ps_4heap.result:
  Fix test results.
mysql-test/r/ps_5merge.result:
  Fix test results.
mysql-test/r/ps_6bdb.result:
  Fix test results.
mysql-test/r/ps_7ndb.result:
  Fix test results.
2004-09-28 21:44:42 +04:00
unknown
18fe537cf1 Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
2004-09-28 19:44:41 +02:00
unknown
1ddc28a471 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-09-28 17:44:40 +00:00
unknown
e44be2922e ha_ndbcluster.cc:
typo


sql/ha_ndbcluster.cc:
  typo
2004-09-28 17:41:58 +00:00
unknown
e8c4af1293 set correct lockmode in all reads...
move lockmode from scan operation to operation
    added read tuple with lock mode


ndb/include/ndbapi/NdbIndexOperation.hpp:
  added read tuple with lock mode
ndb/include/ndbapi/NdbOperation.hpp:
  move lockmode from scan operation to operation
ndb/include/ndbapi/NdbScanOperation.hpp:
  move lockmode from scan operation to operation
ndb/src/ndbapi/NdbIndexOperation.cpp:
  added read tuple with lock mode
ndb/src/ndbapi/NdbOperationDefine.cpp:
  added read tuple with lock mode
sql/ha_ndbcluster.cc:
  set correct lockmode in all reads...
  moved lockmode from scan operatoin to operation
2004-09-28 17:35:07 +00:00
unknown
a393792452 added 2 masters for ndb tests 2004-09-28 17:04:30 +00:00
unknown
131c3f705a mysql-test-run.sh:
Make timer an option


mysql-test/mysql-test-run.sh:
  Make timer an option
2004-09-28 18:25:57 +02:00
unknown
fa450407b1 Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2004-09-28 16:43:05 +02:00
unknown
4888de1de9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-09-28 14:39:27 +00:00
unknown
656bcff63e client_test.test:
Run client_test as a testcase
  new file
mysql-test-run.sh:
  More clearly report failure if --force, also exit 1
client_test.c:
  Use MAXPATHLEN in test_frm_bug()
  Renable test cases disabled for running from mysql-test-run
mysqltest.c:
  Don't check errno from popen, may not be set


client/mysqltest.c:
  Don't check errno from popen, may not be set
tests/client_test.c:
  Use MAXPATHLEN in test_frm_bug()
  Renable test cases disabled for running from mysql-test-run
mysql-test/mysql-test-run.sh:
  More clearly report failure if --force, also exit 1
mysql-test/t/client_test.test:
  Run client_test as a testcase
2004-09-28 16:27:50 +02:00
unknown
9131bd2404 Give store_for_compare a more meaningful name, cleanup and comment the
call.


sql/item_cmpfunc.cc:
  Rename: Field::store_for_compare -> Field::can_be_compared_as_longlong
2004-09-28 15:29:38 +04:00
unknown
24f6437c5f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-09-28 11:06:42 +00:00
unknown
34ac282efd Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-es


mysql-test/mysql-test-run.sh:
  Auto merged
2004-09-28 10:34:26 +02:00
unknown
f3daec831c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2004-09-28 10:34:26 +02:00
unknown
72ae79c308 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
2004-09-28 08:34:25 +00:00
unknown
65d4dc9866 Adjusted so auto_increment value after bulk insert will be exactly +1 after last (if no parallel inserts) 2004-09-28 09:53:14 +02:00
unknown
886cb240f3 mysql-test-run.sh:
Embarrassing typo


mysql-test/mysql-test-run.sh:
  Embarrassing typo
2004-09-28 09:14:18 +02:00
unknown
1a265d34a2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-09-27 16:11:58 +00:00
unknown
56a53af183 mysql-test-run.sh:
Added timing output for each test case.
  Added --embedded-server option.
mysqltest.c:
  Added 'start_timer', 'end_timer' commands
Makefile.am:
  Include mysys/my_getsystime.c to get time function in mysqltest
Many files:
  new file


client/Makefile.am:
  Include mysys/my_getsystime.c to get time function in mysqltest
client/mysqltest.c:
  Added 'start_timer', 'end_timer' commands
mysql-test/mysql-test-run.sh:
  Added timing output for each test case.
  Added --embedded-server option.
2004-09-27 17:01:26 +02:00
unknown
a6b64d2898 removed init on ConfigRetriever
added some debug printouts
    some changes in ndbcluster_init to make start of mysqld first work


ndb/include/mgmcommon/ConfigRetriever.hpp:
  removed init on ConfigRetriever
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  removed init on ConfigRetriever
  added some debug printouts
ndb/src/kernel/vm/Configuration.cpp:
  removed init on ConfigRetriever
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  removed init on ConfigRetriever
  added sleep in retry
sql/ha_ndbcluster.cc:
  some changes in ndbcluster_init to make start of mysqld first work
2004-09-27 00:24:23 +00:00
unknown
29c44aa910 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1/
into noter.intranet.mysql.r18.ru:/root/mysql-4.1


sql/field.cc:
  Auto merged
2004-09-26 21:55:17 +05:00
unknown
aebe728dd1 bug length(varchar utf8 field) returns verying results 2004-09-26 21:52:20 +05:00
unknown
12fbe2415a Setting MODE_NO_AUTO_VALUE_ON_ZERO at copying in copy_data_between_tables 2004-09-26 17:11:28 +02:00
unknown
5ba00ff0bc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-09-26 17:31:06 +03:00
unknown
28ab42bb11 postreview fix
sql/field.cc:
  comments added
sql/item.cc:
  comments added
  code made more clean
2004-09-26 17:26:32 +03:00
unknown
532911afbc Two cleanups for IRIX build.
sql/examples/ha_archive.cc:
  Octane host was complaining about unused variable and second declaration of the Field_blob in write row.
2004-09-26 15:58:10 +02:00
unknown
2380466516 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-psfix
2004-09-26 16:07:39 +04:00
unknown
6fcb8b695d Disabled part of ps_1general.test behaving differently on different builds.
(Until mysqltest will support replace_result and replace_column on metadata).


mysql-test/r/ps_1general.result:
  Disabled part of test behaving differently on different builds.
  (Until mysqltest will support replace_result and replace_column on metadata).
mysql-test/t/ps_1general.test:
  Disabled part of test behaving differently on different builds.
  (Until mysqltest will support replace_result and replace_column on metadata).
2004-09-26 15:57:07 +04:00
unknown
a64953ed3f testBasic -n MassiveRollback
Make sure to not receive more that buffer can fit currently


ndb/src/common/transporter/TCP_Transporter.cpp:
  Make sure to not receive more that buffer can fit currently
2004-09-26 10:51:14 +02:00
unknown
2de9ef1726 testDict -n InvalidTables
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Add more require's in VM_TRACE
  Fix release of invalid tables
  testDict -n InvalidTables
2004-09-26 10:03:57 +02:00
unknown
6337cd1c87 Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
2004-09-26 09:18:43 +02:00
unknown
0ef58d5488 testBackup
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Fix so that start backup can be blocking
ndb/test/run-test/daily-devel-tests.txt:
  Use atrt-testBackup (which setups env)
2004-09-25 19:31:36 +02:00
unknown
efb4d837e7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-09-25 17:31:35 +00:00
unknown
01eca8f830 local config now outside config retriever 2004-09-25 17:30:51 +00:00
unknown
e9a3612a8a Fix asked by Ranger.
If embedded library gets empty string as a hostname it should use embedded connection


libmysqld/libmysqld.c:
  Check for empty string added
2004-09-25 21:56:52 +05:00
unknown
ea29015d6f Ops forgott to put table in hash 2004-09-25 18:36:56 +02:00
unknown
69edf1ddd4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-25 18:36:55 +02:00
unknown
45a7efa3e8 corrected small :) mistake 2004-09-25 16:36:54 +00:00
unknown
7a2cb204ed added printout for where configuration is fetched
debug printouts


mysql-test/ndb/ndbcluster.sh:
  .
ndb/include/mgmcommon/ConfigRetriever.hpp:
  added printout for where configuration is fetched
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added printout for where configuration is fetched
ndb/src/kernel/main.cpp:
  added printout for where configuration is fetched
ndb/src/kernel/vm/Configuration.cpp:
  added printout for where configuration is fetched
ndb/src/kernel/vm/Configuration.hpp:
  added printout for where configuration is fetched
ndb/src/ndbapi/Ndb.cpp:
  debug printouts
2004-09-25 16:06:30 +00:00
unknown
408b5ca574 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
2004-09-25 18:37:28 +03:00
unknown
9ff04fe526 Results of WL#1856 "Conversion of client_test.c tests cases to mysqltest
if possible"
        - many new test cases
        - more and improved comments
      New files: t/ps_7ndb.test       test suite for NDB tables
                 r/ps_7ndb.result     expected results
                 include/ps_conv.inc  conversion test cases
+ review comments and fixes.


mysql-test/include/ps_create.inc:
  Rename of t_many_col_types -> t9
mysql-test/include/ps_modify.inc:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Rename: t_many_col_types -> t9
  Cleanups and comments.
  New test cases (derived from client_test.c)
mysql-test/include/ps_modify1.inc:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Rename: t_many_col_types -> t9
  Cleanups and comments.
  New test cases (derived from client_test.c)
mysql-test/include/ps_query.inc:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Rename: t_many_col_types -> t9
  Cleanups and comments.
  New test cases (derived from client_test.c)
mysql-test/include/ps_renew.inc:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Rename: t_many_col_types -> t9
mysql-test/r/ps_1general.result:
  Results updated.
mysql-test/r/ps_2myisam.result:
  Resutls updated.
mysql-test/r/ps_3innodb.result:
  Results updated.
mysql-test/r/ps_4heap.result:
  Results updated.
mysql-test/r/ps_5merge.result:
  Results updated.
mysql-test/r/ps_6bdb.result:
  Results updated.
mysql-test/t/ps_1general.test:
  WL#1856 "Conversion of client_test.c tests cases to mysqltest if
   possible": new test cases added.
mysql-test/t/ps_2myisam.test:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Call of file include/ps_conv.inc (with new test cases) and 
  fulltext test case added.
mysql-test/t/ps_3innodb.test:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Call of file include/ps_conv.inc (with new test cases) added.
mysql-test/t/ps_4heap.test:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Call of file include/ps_conv.inc (with new test cases) added.
mysql-test/t/ps_5merge.test:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Call of file include/ps_conv.inc (with new test cases) added.
mysql-test/t/ps_6bdb.test:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible.
  Call of file include/ps_conv.inc (with new test cases) added.
2004-09-25 19:08:02 +04:00
unknown
339d362dd7 bug#5702
more bug fixes.


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  DropIndex -
  1) return Invalid version 
  2) Mark as IS_DROPPING so that 2 simulatainious threads can't drop it
ndb/src/ndbapi/NdbDictionary.cpp:
  Changed listIndex from taking table name to taking table id
  (should be index version aswell)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  List indexes using id
  Fix log towards m_globalHash
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  List indexes using tableid (indexid)
2004-09-25 16:47:51 +02:00
unknown
1bf19b822d moved LocalConfig out of config retriver 2004-09-25 14:10:06 +00:00
unknown
40c12fa8c6 some comments added 2004-09-25 16:05:50 +03:00