Commit graph

16873 commits

Author SHA1 Message Date
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
unknown
817ee181c3 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2005-11-23 12:34:29 +01:00
joerg@mysql.com
35735cfefa Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2005-11-23 12:34:29 +01:00
unknown
bd0584df26 corrected compile error
updated listen_event to handle _all_ events


storage/ndb/src/common/portlib/NdbThread.c:
  corrected compile error
storage/ndb/test/tools/listen.cpp:
  updated listen_event to handle _all_ events
2005-11-23 12:32:38 +01:00
tomas@poseidon.ndb.mysql.com
550f675ac6 corrected compile error
updated listen_event to handle _all_ events
2005-11-23 12:32:38 +01:00
unknown
f85a819256 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2005-11-23 11:53:21 +01:00
joerg@mysql.com
415053f2d8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2005-11-23 11:53:21 +01:00
unknown
da82e8ff19 updated ndb listen_event to print more info, and to give immediate respose 2005-11-23 11:53:19 +01:00
tomas@poseidon.ndb.mysql.com
4f9567944c updated ndb listen_event to print more info, and to give immediate respose 2005-11-23 11:53:19 +01:00
unknown
494daf7981 Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1
sql/mysqld.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
2005-11-23 11:24:52 +01:00
joerg@mysql.com
3a7d81258c Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1 2005-11-23 11:24:52 +01:00
unknown
38961d022f added ndb testcase WritePartialIgnoreError
(currently causes nodefailure)


storage/ndb/test/ndbapi/testNdbApi.cpp:
  added ndb testcase WritePartialIgnoreError
storage/ndb/test/run-test/daily-basic-tests.txt:
  added ndb testcase WritePartialIgnoreError
2005-11-23 10:45:15 +01:00
tomas@poseidon.ndb.mysql.com
6fc48d92bb added ndb testcase WritePartialIgnoreError
(currently causes nodefailure)
2005-11-23 10:45:15 +01:00
unknown
c9f8b7b41f fix error handling if thread creation fails in ndbd
make sure ndb threads are not started with too small stacksize (which results in default, much too big, stack size to be used)
  moved initialization of ndbd fs block first to ensure that it gets enough space for allocation of file system thread stacks
  changed event buffer reporting in ndb to occur not as often
  corrected the bank application
  corrected output from run-test make-config.sh


storage/ndb/src/common/portlib/NdbThread.c:
    fix error handling if thread creation fails in ndbd
    make sure ndb threads are not started with too small stacksize (which results in default, much too big, stack size to be used)
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  moved initialization of ndbd fs block first to ensure that it gets enough space for allocation of file system thread stacks
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
    fix error handling if thread creation fails in ndbd
storage/ndb/src/ndbapi/Ndb.cpp:
  changed event buffer reporting in ndb to occur not as often
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  changed event buffer reporting in ndb to occur not as often
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  changed event buffer reporting in ndb to occur not as often
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
  corrected the bank application
storage/ndb/test/run-test/make-config.sh:
  corrected output from run-test make-config.sh
2005-11-22 18:05:10 +01:00
tomas@poseidon.ndb.mysql.com
a5d6d2bb88 fix error handling if thread creation fails in ndbd
make sure ndb threads are not started with too small stacksize (which results in default, much too big, stack size to be used)
  moved initialization of ndbd fs block first to ensure that it gets enough space for allocation of file system thread stacks
  changed event buffer reporting in ndb to occur not as often
  corrected the bank application
  corrected output from run-test make-config.sh
2005-11-22 18:05:10 +01:00
unknown
defa8e8402 ndb - bug#14007 5.1 (merge 5.0->5.1)
mysql-test/r/ndb_charset.result:
  bug#14007 5.1 (merge 5.0->5.1)
mysql-test/t/ndb_charset.test:
  bug#14007 5.1 (merge 5.0->5.1)
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  bug#14007 5.1 (merge 5.0->5.1)
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  bug#14007 5.1 (merge 5.0->5.1)
2005-11-20 11:15:13 +01:00
pekka@mysql.com
ce21b10258 ndb - bug#14007 5.1 (merge 5.0->5.1) 2005-11-20 11:15:13 +01:00
unknown
51972f1aea Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
2005-11-19 13:06:16 +01:00
guilhem@mysql.com
a7c3aed5f4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
2005-11-19 13:06:16 +01:00
unknown
380690316f Merge mysql.com:/home/mysql_src/mysql-5.0-van
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).


configure.in:
  Auto merged
mysql-test/r/ndb_charset.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/base64.c:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
storage/ndb/tools/ndb_size.tmpl:
  Auto merged
mysql-test/t/disabled.def:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  used "ul", Pekka said he'll fix
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  used "ul", Pekka said he'll fix
2005-11-19 10:43:28 +01:00
guilhem@mysql.com
24006266d0 Merge mysql.com:/home/mysql_src/mysql-5.0-van
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
2005-11-19 10:43:28 +01:00
unknown
41de6f9a7c Merge mysql.com:/home/mysql_src/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
mysql-test/r/ps_1general.result:
  merge ("ul", will fix)
sql/examples/ha_tina.cc:
  merge
sql/ha_innodb.cc:
  merge
sql/handler.h:
  merge
sql/log.cc:
  merge
sql/set_var.cc:
  merge
sql/share/errmsg.txt:
  merge (bad, will fix)
sql/sql_show.cc:
  merge (bad, will fix)
sql/sql_yacc.yy:
  merge
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  merge
2005-11-18 16:38:01 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
unknown
5db598890e ndb - wl#1497 LinearPool seize_index
storage/ndb/src/kernel/vm/LinearPool.hpp:
  wl#1497 LinearPool seize_index
storage/ndb/src/kernel/vm/testSuperPool.cpp:
  wl#1497 LinearPool seize_index
2005-11-18 00:09:24 +01:00
pekka@mysql.com
7e4641bcea ndb - wl#1497 LinearPool seize_index 2005-11-18 00:09:24 +01:00
unknown
fef0912115 ndb - wl#1497 add LinearPool
storage/ndb/src/kernel/vm/testSuperPool.cpp:
  test LinearPool
2005-11-14 12:03:23 +01:00
pekka@mysql.com
5a6a844fb7 ndb - wl#1497 add LinearPool 2005-11-14 12:03:23 +01:00
unknown
daa84c7fa5 ndb - 5.1.2 build fix: Signal syms in test pgms on hp3750
storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp:
  add some Signal syms to test programs for hp3750, hope it dont break other platforms..
storage/ndb/src/kernel/blocks/print_file.cpp:
  add some Signal syms to test programs for hp3750, hope it dont break other platforms..
2005-11-11 12:47:10 +01:00
pekka@mysql.com
e98fad6bcb ndb - 5.1.2 build fix: Signal syms in test pgms on hp3750 2005-11-11 12:47:10 +01:00
unknown
f24078f7bb ndb - 5.1.2 build fix: array initializer crashes gcc-2.95.3
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  array initializer crashes gcc-2.95.3
2005-11-11 11:36:00 +01:00
pekka@mysql.com
bffe8fb29d ndb - 5.1.2 build fix: array initializer crashes gcc-2.95.3 2005-11-11 11:36:00 +01:00
unknown
3709b2b391 Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/clone-5.1 2005-11-10 10:05:59 +01:00
joerg@mysql.com
65bea6b36b Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/clone-5.1 2005-11-10 10:05:59 +01:00
unknown
6a8eb801ce corrected compile error 2005-11-10 09:24:27 +01:00
tomas@poseidon.ndb.mysql.com
400aa16353 corrected compile error 2005-11-10 09:24:27 +01:00
unknown
d7f076de17 stilled memleak in ndb Gci_container 2005-11-09 23:08:53 +01:00
tomas@poseidon.ndb.mysql.com
d20c1230d8 stilled memleak in ndb Gci_container 2005-11-09 23:08:53 +01:00
unknown
f91475a7aa Compile fix for NDB 5.1.2 on Solaris, provided by Pekka. 2005-11-09 18:36:10 +01:00
joerg@mysql.com
e0a47156ac Compile fix for NDB 5.1.2 on Solaris, provided by Pekka. 2005-11-09 18:36:10 +01:00
unknown
c4239fee21 Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1 2005-11-09 09:24:16 +01:00
joerg@mysql.com
ee3cd794f8 Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1 2005-11-09 09:24:16 +01:00
unknown
99b3bc7ae0 ndb - super pool update (future use)
storage/ndb/src/kernel/vm/SuperPool.cpp:
  super pool update
storage/ndb/src/kernel/vm/SuperPool.hpp:
  super pool update
storage/ndb/src/kernel/vm/testSuperPool.cpp:
  super pool update
2005-11-08 23:48:26 +01:00
pekka@mysql.com
1926b4e167 ndb - super pool update (future use) 2005-11-08 23:48:26 +01:00
unknown
c51e75e67f Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree. 2005-11-08 17:30:41 +01:00
joerg@mysql.com
2153871abf Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree. 2005-11-08 17:30:41 +01:00
unknown
867a5b545e configure.in:
Temporary work around to pass --build=... to configure
  in storage engine sub directory
print_file.cpp:
  HP-UX compiler don't like variable shadowing
AsyncFile.cpp:
  Cast result from strstr() to char* for HP-UX compile
trigger_definitions.h:
  "MIN" and "MAX" are not used for trigger stuff, move to a more global include
ndb_global.h.in:
  Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
  Moved here from "include/kernel/trigger_definitions.h".
Makefile.am:
  Add missing ha_* files to EXTRA_mysqld_SOURCES


sql/Makefile.am:
  Add missing ha_* files to EXTRA_mysqld_SOURCES
storage/ndb/include/ndb_global.h.in:
  Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
  Moved here from "include/kernel/trigger_definitions.h".
storage/ndb/include/kernel/trigger_definitions.h:
  "MIN" and "MAX" are not used for trigger stuff, move to a more global include
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Cast result from strstr() to char* for HP-UX compile
storage/ndb/src/kernel/blocks/print_file.cpp:
  HP-UX compiler don't like variable shadowing
configure.in:
  Temporary work around to pass --build=... to configure
  in storage engine sub directory
2005-11-08 07:41:46 +01:00
kent@mysql.com
41b554daa9 configure.in:
Temporary work around to pass --build=... to configure
  in storage engine sub directory
print_file.cpp:
  HP-UX compiler don't like variable shadowing
AsyncFile.cpp:
  Cast result from strstr() to char* for HP-UX compile
trigger_definitions.h:
  "MIN" and "MAX" are not used for trigger stuff, move to a more global include
ndb_global.h.in:
  Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
  Moved here from "include/kernel/trigger_definitions.h".
Makefile.am:
  Add missing ha_* files to EXTRA_mysqld_SOURCES
2005-11-08 07:41:46 +01:00
unknown
911e52dbf1 Use DB_LOG_AUTOREMOVE flag instead of noticecall customization to BDB
so log files are deleted once they are no longer in use. (Bug #14655)


sql/ha_berkeley.cc:
  Remove usage of non-standard noticecall interface, and just use
  DB_LOG_AUTOREMOVE environment flag so that log files are deleted
  once no longer in use.
storage/bdb/dbinc/db.in:
  Remove noticecall interface
storage/bdb/env/env_method.c:
  Remove noticecall interface
storage/bdb/log/log_put.c:
  Remove noticecall interface
2005-11-07 16:33:53 -08:00
jimw@mysql.com
aecf0238f3 Use DB_LOG_AUTOREMOVE flag instead of noticecall customization to BDB
so log files are deleted once they are no longer in use. (Bug #14655)
2005-11-07 16:33:53 -08:00
unknown
bc0292087f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2005-11-07 20:29:58 +01:00