Commit graph

18700 commits

Author SHA1 Message Date
unknown
6cacf67b90 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-13 10:49:01 +01:00
unknown
12040a9dea ndb - make sure to drop table at end ndb_update
mysql-test/r/ndb_update.result:
  make sure to drop table at end of test
mysql-test/t/ndb_update.test:
  make sure to drop table at end of test
2005-01-13 09:22:00 +01:00
unknown
112325c402 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-13 08:41:42 +01:00
unknown
e0c95d1b97 ndb - take booked scan frags into account when getting scan_fragconf
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  take booked fragments into account before starting a new frag scan
2005-01-13 08:40:32 +01:00
unknown
e4b6c25cef Merge bk-internal:/home/bk/mysql-5.0-ndb
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-12 22:16:30 +01:00
unknown
d6cb2dbe5b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/test/src/HugoTransactions.cpp:
  Auto merged
2005-01-12 22:16:29 +01:00
unknown
54ccf5d16c added som signal printout functions
search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
    not necessarily the same starts and stops...
    +error corrected in ref signal
    added print of error codes + more correct error handling of event errors
    + added goto instead of erroneous break to fix bug#7627


ndb/include/kernel/signaldata/SignalData.hpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  added som signal printout functions
ndb/src/kernel/blocks/suma/Suma.cpp:
  search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
  not necessarily the same starts and stops...
  +error corrected in ref signal
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  indentation
  event error handling
  debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  debug printouts
  + added goto instead of erroneous break to fix bug#7627
ndb/test/src/HugoTransactions.cpp:
  added print of error codes + more correct error handling of event errors
2005-01-12 22:09:43 +01:00
unknown
f34fee6dd5 Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-12 21:25:16 +01:00
unknown
4c9d5f80c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0
2005-01-12 21:22:11 +01:00
unknown
c846af9ba2 Merge
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  resolve conflicts
2005-01-12 21:03:06 +01:00
unknown
75b140b975 Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0-ndb


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2005-01-12 21:01:15 +01:00
unknown
ca1ac0c53b Merge build.mysql.com:/users/tulin/mysql-4.1
into build.mysql.com:/users/tulin/mysql-5.0
2005-01-12 20:58:07 +01:00
unknown
8f61caea0a logging_ok:
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets


sql/mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
sql/set_var.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
mysql-test/t/innodb.test:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
mysql-test/r/innodb.result:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-12 20:55:06 +01:00
unknown
fd7e0d847b manual merge
sql/mysqld.cc:
  Auto merged
2005-01-12 21:51:04 +03:00
unknown
a1392a321b Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-12 19:19:55 +01:00
unknown
3719265be7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1
2005-01-12 19:00:33 +01:00
unknown
a3d3aef157 A test case for Bug#6761 "mysql_list_fields doesn't work" 2005-01-12 20:28:31 +03:00
unknown
9c68ad228f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1
2005-01-12 18:20:16 +01:00
unknown
55ad8626c4 fix shm key 2005-01-12 18:19:30 +01:00
unknown
c05cfa96b6 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-12 18:09:44 +01:00
unknown
c992cc4962 ndb - more test of partitioning wrt scans & lock modes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle "fragment scan" (scan with distribution key) wrt committed read
ndb/test/ndbapi/testPartitioning.cpp:
  Extend test prg to try differnt lock modes / parallelism parameters
2005-01-12 17:29:46 +01:00
unknown
18a7ca4795 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-01-12 18:26:56 +02:00
unknown
871fdda191 ha_innodb.cc:
Add comments about why the InnoDB latching order is obeyed also for the MySQL query cache mutex; add an error printf if that is not the case
sync0sync.h:
  Assign sync0sync.h ranks also for the MySQL query cache mutex and the MySQL binlog mutex; the latching order must be obeyed also for these
row0ins.c:
  Add a comment why the query cache invalidate operation cannot deadlock in a cascaded FOREIGN KEY operation


innobase/row/row0ins.c:
  Add a comment why the query cache invalidate operation cannot deadlock in a cascaded FOREIGN KEY operation
innobase/include/sync0sync.h:
  Assign sync0sync.h ranks also for the MySQL query cache mutex and the MySQL binlog mutex; the latching order must be obeyed also for these
sql/ha_innodb.cc:
  Add comments about why the InnoDB latching order is obeyed also for the MySQL query cache mutex; add an error printf if that is not the case
2005-01-12 18:25:39 +02:00
unknown
a21bb57546 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-01-12 18:08:41 +02:00
unknown
78f59f6093 Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0-clean


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2005-01-12 17:05:33 +01:00
unknown
c153522d35 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-01-12 20:05:32 +04:00
unknown
c1bc964a8e Merge mysql.com:/home/kostja/work/mysql-4.0-6761
into mysql.com:/home/kostja/work/mysql-4.1-root


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-01-12 19:00:04 +03:00
unknown
5b0678232f --defaults-extra-file bug fixed
mysys/default.c:
  silly mistake happened during the merge
2005-01-12 19:57:26 +04:00
unknown
6f041af11b ndb - Add test-case file for 16-nodes 2005-01-12 16:20:21 +01:00
unknown
b9dc94a079 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 15:46:37 +01:00
unknown
8296883ff4 ndb - Fix problem with parallelism < fragcount & committedread
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Pre book fragments to keep count how many ops need to be continued by 
    api
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Pre book fragments to keep count how many ops need to be continued by 
    api
  
  Fixes problem with parallelism < fragcount && committed read
ndb/test/ndbapi/testScan.cpp:
  new testcase for scan parallelism
ndb/test/run-test/daily-basic-tests.txt:
  Run new testcase
ndb/test/src/HugoTransactions.cpp:
  Use parallelism parameter
2005-01-12 15:36:52 +01:00
unknown
b692ca4fd5 A fix for Bug#6761 "mysql_list_fields() does not work": test
case will be added to client_test in 4.1


sql/sql_parse.cc:
  A fix for bug #6761: "mysql_list_fields() does not work": init
  thd->query_length, which is used next line. Remove a stale comment.
2005-01-12 17:04:45 +03:00
unknown
3a13246cb0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-01-12 16:02:46 +02:00
unknown
1454564f1c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-12 14:34:34 +01:00
unknown
d8a2ed781a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-12 14:30:04 +01:00
unknown
ec03f8acb2 added management server port as "unique" id for use in shmkey 2005-01-12 14:03:10 +01:00
unknown
124bc850d5 ndb - Fix init of replica/frag count in ndb api
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix init of replica/frag count
2005-01-12 13:33:04 +01:00
unknown
bbaa4ea8e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-12 13:27:15 +01:00
unknown
e8e4861401 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-merge
2005-01-12 13:08:24 +01:00
unknown
332b0609d9 Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-5.0


Build-tools/Do-compile:
  Auto merged
2005-01-12 13:07:48 +01:00
unknown
d862f84643 - Modified Do-compile to run the test suite with ps-protocol and against
the embedded server by default (if included). These additional steps can
  be skipped by providing "--skip-embedded-test" and "--skip-ps-test"


Build-tools/Do-compile:
  - enabled running the test suite with ps-protocol and against the embedded
    server by default (if included). These additional steps can be skipped
    by providing "--skip-embedded-test" and "--skip-ps-test"
2005-01-12 13:06:06 +01:00
unknown
7310387078 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2005-01-12 12:35:34 +01:00
unknown
452eda8d3e merged. ul. 2005-01-12 12:24:23 +01:00
unknown
0bcfc49b4b added missing Com_update_multi status variable 2005-01-12 12:18:17 +01:00
unknown
e234bbeab0 renamed charset name 'eucjp_ms' to 'eucjpms' 2005-01-12 02:58:15 -08:00
unknown
ce2f345a7d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 11:27:30 +01:00
unknown
2123dc6ba3 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 11:25:54 +01:00
unknown
40649e92f7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2005-01-12 11:24:46 +01:00
unknown
ed6c9afd6d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-12 11:20:05 +01:00
unknown
7e36a0b7cb ndb - fix 64-bit problem in autotest
ndb/test/src/CpcClient.cpp:
  Fix 64-bit problem
2005-01-12 11:17:03 +01:00