Commit graph

42419 commits

Author SHA1 Message Date
unknown
df3494ca51 Bug - ndb: valgrind warning handle_trailing_share/ndbcluster_free_share invalid read
sql/ha_ndbcluster.cc:
  Bug : make sure ndbcluster_create_event_ops even if no binlogging as flags NSF_NO_BINLOG is set there
  set NSS_DROPPED state in handle_trailing_share if appropriate
  added dbug printout and comments for NDB_SHARE references
sql/ha_ndbcluster_binlog.cc:
  Bug : set NSF_NO_BINLOG if !ndb_binlog_running
  Bug : only reuse share if share_may_exist
  setup apply_status table to be logged always, even if no binlogging
  added dbug printout and comments for NDB_SHARE references
2007-02-06 12:40:26 +07:00
unknown
c0cc946885 ndb: remove WAITFOR_RESPONSE_TIMEOUT printout
- to get cleaner error log in debug mode


storage/ndb/src/ndbapi/TransporterFacade.cpp:
  remove WAITFOR_RESPONSE_TIMEOUT printout
2007-02-06 11:57:56 +07:00
unknown
fa839ece57 Bug valgrind warning handle_trailing_share/ndbcluster_free_share invalid read
- revert bugfix, needs more work
2007-02-06 00:09:45 +07:00
unknown
dd01c46f36 Bug - valgrind reports error regarding handle_trailing_share and client thread share usage
- add ndb_share connect_count to decide if share can be reused to setup replication


sql/ha_ndbcluster.cc:
  add additional logging info
  remove inline real_free_share (not needed) and confuses valgrind printout
sql/ha_ndbcluster.h:
  add connect_count to ndb_share to enable checking for version of share
sql/ha_ndbcluster_binlog.cc:
  use ndb_share connect_count to decide if share can be reused to setup replication
  - share will be created early if table is accessed prior to handler setting up binlog stuff, see bug 26021
sql/ha_ndbcluster_binlog.h:
  remove inline real_free_share (not needed) and confuses valgrind printout
2007-02-05 13:21:18 +07:00
unknown
c101bc1f4c Bug - valgrind warning ndbcluster_log_schema_op/safe_mutex_lock invalid read
protect the setting of ndb_schema_share = NULL with a mutex


sql/ha_ndbcluster_binlog.cc:
  protect the setting of ndb_schema_share = NULL with a mutec
2007-02-05 12:04:36 +07:00
unknown
5af0cbc7ce apply holyfoot's patch for BUG#25895 2007-01-29 14:47:38 +01:00
unknown
d5ada3e15d Build fix for sunfire100b. This can go when BUG#14420 is fixed.
dbug/dbug.c:
  Build fix for sunfire100b. The ld does not want to link with an empty library, so we put something in it.
dbug/factorial.c:
  Build fix for sunfire100b. When DBUG_OFF is defined, dbug is not there, and we can't use it even if we try, period.
2007-01-27 22:07:52 +01:00
unknown
20e5e1d2fb BUG#25890 put previous fix in better place 2007-01-27 21:26:28 +01:00
unknown
915c9f4dfc BUG#25895 compiling the server with embedded fails on several 64-bit platforms
temporary fix


libmysqld/lib_sql.cc:
  BUG#25895 compiling the server with embedded fails on several 64-bit platforms
  
  do not try to cast THD* to pthread_t, this operation is not possible
2007-01-27 20:16:15 +01:00
unknown
452e07679b BUG#25890 mysqltest_embedded crashes on start
very temporary fix


libmysqld/lib_sql.cc:
  BUG#25890 mysqltest_embedded crashes on start
  
  temporary fix - initialize needed global variables
2007-01-27 13:12:59 +01:00
unknown
823498926c fix order in spec file changelog
support-files/mysql.spec.sh:
  fix order in changelog
2007-01-27 12:46:20 +01:00
unknown
9cbdb2edab SETUP.sh:
Don't use -Wshadow by default yet


BUILD/SETUP.sh:
  Don't use -Wshadow by default yet
2007-01-25 13:12:02 +01:00
unknown
25f3230037 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new-ndb
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-01-25 12:38:35 +01:00
unknown
a0a847fd45 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel


mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
2007-01-25 12:28:00 +01:00
unknown
d134dd4501 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-25 18:14:51 +07:00
unknown
c20ef43f57 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-25 11:21:04 +07:00
unknown
216b9face2 ndb:
- added extra cluster connect inicator bit for better handeling of delacation of event operations on cluster disconnect
- added extra assert to try to track down valgrind issue
2007-01-25 11:17:51 +07:00
unknown
247bd923c2 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/myisam.result:
  Use local.
mysql-test/t/myisam.test:
  Use local.
2007-01-25 01:51:13 +04:00
unknown
1cf8117863 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/lock.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
mysql-test/r/myisam.result:
  Manually merged.
mysql-test/t/myisam.test:
  Manually merged.
2007-01-25 01:44:30 +04:00
unknown
2ed7eaf564 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines


mysql-test/t/myisam.test:
  Auto merged
2007-01-25 01:31:58 +04:00
unknown
c26ffedb86 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/myisam.result:
  Manually merged.
mysql-test/t/myisam.test:
  Manually merged.
2007-01-25 01:26:57 +04:00
unknown
6bb5fd6b28 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  chilla.local:/home/mydev/mysql-5.0-bug24607


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
2007-01-24 15:52:19 +01:00
unknown
e8ca911f5d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  chilla.local:/home/mydev/mysql-5.1-bug24607


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
2007-01-24 15:47:04 +01:00
unknown
89f02b13e3 After merge fix 2007-01-24 15:45:41 +01:00
unknown
389388f16b Merge chilla.local:/home/mydev/mysql-5.0-bug24607
into  chilla.local:/home/mydev/mysql-5.1-bug24607


mysql-test/t/myisam.test:
  Auto merged
mysql-test/r/myisam.result:
  Manual merged
2007-01-24 13:32:36 +01:00
unknown
ccb002dbc2 Bug#24607 - MyISAM pointer size determined incorrectly
After merge fix
2007-01-24 13:29:46 +01:00
unknown
4f73c75fba Merge chilla.local:/home/mydev/mysql-4.1-bug24607
into  chilla.local:/home/mydev/mysql-5.0-bug24607


mysql-test/r/myisam.result:
  Manual merged
mysql-test/t/myisam.test:
  Manual merged
2007-01-24 13:26:06 +01:00
unknown
112ef50f28 Bug#24607 - MyISAM pointer size determined incorrectly
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.


mysql-test/r/myisam.result:
  Bug#24607 - MyISAM pointer size determined incorrectly
  Fixed test results.
2007-01-24 13:17:01 +01:00
unknown
bb5dccf260 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


sql/ha_ndbcluster.cc:
  Auto merged
2007-01-24 09:24:52 +01:00
unknown
e57ef96a08 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2007-01-24 09:24:29 +01:00
unknown
8b405d4fad Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
2007-01-24 11:56:18 +04:00
unknown
6216e794c3 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
2007-01-24 11:54:38 +04:00
unknown
5e0fd916f1 After merge fix. 2007-01-24 11:53:09 +04:00
unknown
4c51028e46 Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
2007-01-24 11:41:13 +04:00
unknown
89e558c9c7 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
2007-01-24 11:40:45 +04:00
unknown
7513ef2651 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
2007-01-24 11:38:23 +04:00
unknown
3f064efb0e Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
2007-01-24 16:24:21 +11:00
unknown
1b71102f4b Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work


storage/ndb/src/common/util/SocketClient.cpp:
  Auto merged
2007-01-24 16:16:16 +11:00
unknown
71f606804c fix hpux build problem and some ndb connect errors being missed
ndb/src/common/util/SocketClient.cpp:
  fix two problems recently introduced:
  - HPUX build problem
  - some connect errors not being detected properly
2007-01-24 16:12:39 +11:00
unknown
02a9f2f719 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2007-01-24 09:13:47 +07:00
unknown
1f4d8ba085 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1-bug24607


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
2007-01-23 22:27:03 +01:00
unknown
ffb51e1592 Merge bk-internal:/home/bk/mysql-5.1
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-01-23 20:38:00 +01:00
unknown
4bec8b037f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  chilla.local:/home/mydev/mysql-5.0-bug24607


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
2007-01-23 20:19:19 +01:00
unknown
dd5523d997 Merge xiphis.org:/home/antony/work2/p1-bug25396.4
into  xiphis.org:/home/antony/work2/p1-bug25396.5


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-01-23 08:34:50 -08:00
unknown
180db5f22c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-23 15:59:49 +01:00
unknown
964f502cc2 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
2007-01-23 15:20:50 +01:00
unknown
f80084bff9 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
2007-01-23 14:59:05 +01:00
unknown
c64b504af0 Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-build


configure.in:
  Auto merged
cmd-line-utils/readline/undo.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
2007-01-23 14:53:59 +01:00
unknown
a717485064 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487
2007-01-24 00:44:11 +11:00
unknown
b90776932a Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567


mysql-test/r/ndb_basic.result:
  Auto merged
2007-01-24 00:37:11 +11:00