Commit graph

12443 commits

Author SHA1 Message Date
unknown
65755a9cb7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-14 01:25:08 +02:00
unknown
a3aacd7983 compatibility fix for hp-ux 64bit (hpux compiler) and sun 64-bit (sun forte) 2004-05-14 01:24:17 +02:00
unknown
fd51cf47a9 fixed flags of printed query 2004-05-13 23:47:20 +03:00
unknown
ae17c3c712 ha_innodb.cc, trx0trx.h, lock0lock.c, trx0trx.c:
Reserve the MySQL LOCK_thread_count mutex when printing thd->query of
an arbitrary transaction; if we are printing thd->query of a transaction that
we know is currently executing inside InnoDB, then we know that MySQL cannot
meanwhile change thd->query, and no need to reserve the MySQL mutex; note
that this patch still leaves open the possibility of races in MySQL's
thd->query_len


innobase/trx/trx0trx.c:
  Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len
innobase/lock/lock0lock.c:
  Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len
innobase/include/trx0trx.h:
  Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len
sql/ha_innodb.cc:
  Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len
2004-05-13 22:07:51 +03:00
unknown
5ab40f3a7d Snippet from the Internet:
Common Symbols

If you get errors in linking complaining about common symbols
ld: common symbols not allowed with MH_DYLIB format

Then it means that you've got a global variable in the library which has
not been assigned a value.

Got this problem with three globals in NdbDaemon.c


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-13 19:49:10 +02:00
unknown
e5a2fc8ed7 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-05-13 19:17:38 +02:00
unknown
6be0dc1273 ha_innodb.cc:
A flawed fix of the thd->query race in SHOW INNODB STATUS; see the comments in code about how to fix this properly; we cannot use LOCK_thread_count to protect thd->query, because that will cause a deadlock of threads


sql/ha_innodb.cc:
  A flawed fix of the thd->query race in SHOW INNODB STATUS; see the comments in code about how to fix this properly; we cannot use LOCK_thread_count to protect thd->query, because that will cause a deadlock of threads
2004-05-13 20:02:05 +03:00
unknown
377f335613 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2004-05-13 18:51:02 +02:00
unknown
a6ff8d00e0 - make sure the binaries are executable before calling them during
make_binary_distribution (bug#2857)


scripts/make_binary_distribution.sh:
   - make sure the binaries are executable before calling them (bug#2857)
2004-05-13 18:50:09 +02:00
unknown
cbefc5f154 portability fix 2004-05-13 15:58:28 +02:00
unknown
2c6bee6ab8 portability fixes and some comments 2004-05-13 15:41:20 +02:00
unknown
9e20f63aec ha_innodb.cc:
innobase_mysql_print_thd(): protect thd with LOCK_thread_count (Bug #3596)


sql/ha_innodb.cc:
  innobase_mysql_print_thd(): protect thd with LOCK_thread_count
2004-05-13 16:18:39 +03:00
unknown
6a39732037 InnoDB: fixed bug in dict0dict.c: dict_index_name_print()
innobase/dict/dict0dict.c:
  dict_index_name_print(): output table name to file, not stderr
2004-05-13 15:51:02 +03:00
unknown
d8522613d5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc05.(none):/space/tomas/mysql-4.1-ndb
2004-05-13 14:38:35 +02:00
unknown
218a0220b5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space/tomas/mysql-4.1-ndb
2004-05-13 14:38:34 +02:00
unknown
ae95f38200 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ps
2004-05-13 17:38:33 +05:00
unknown
72595adab2 InnoDB: Remove os_file_lock() from the 4.0 tree (unfix Bug #3608)
innobase/os/os0file.c:
  Remove os_file_lock()
2004-05-13 15:28:56 +03:00
unknown
df41e3d55d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc05.(none):/space2/tomas/mysql-4.1
2004-05-13 13:45:15 +02:00
unknown
97ae6904df portability fix for MACOSX bugreport 3735
ndb/src/ndbapi/Ndberr.cpp:
  Rename: ndb/src/ndbapi/Ndberror.cpp -> ndb/src/ndbapi/Ndberr.cpp
2004-05-13 13:44:45 +02:00
unknown
b58eb134bb portability fixes 2004-05-13 13:42:36 +02:00
unknown
d8834661ec Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/sql_table.cc:
  Auto merged
BitKeeper/deleted/.del-regression.sh~c19f771726612629:
  Auto merged
2004-05-13 13:28:56 +02:00
unknown
b94ab162cf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space/tomas/mysql-4.1-ndb


ndb/src/common/transporter/Makefile:
  Auto merged
2004-05-13 12:00:11 +02:00
unknown
d4399619bd WL #1729 Handler: error text for NDB errors
- New solution after discussions with Sergei, no handler specific code or error messages should be in sql layer.
next_result, only check for error if check is -1
Improved index_read 


include/mysqld_error.h:
  New error codes ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG, update number to 298.
  Removed prevoius ER_NDB_ERROR, handler specific error should not be here.
sql/ha_ndbcluster.cc:
  Removed print_error from ha_ndbcluster, added code to handler::print_error to ask  handler::get_error_message for message for an error.
  Fix bug in next_result, only check for error if -1 is returned.
  Make index_read easier, special case where pk_read or unique_index_read is detected and as default do ordered_index_scan
sql/ha_ndbcluster.h:
  Remplace print_error with get_error_message
sql/handler.cc:
  Add new function get_error_message usedc to ask handler for a message for an error.
  Call get_error_message from print_error if error code is not known.
sql/handler.h:
  Add new function get_error_message
sql/share/czech/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/danish/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/dutch/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/english/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/estonian/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/french/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/german/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/greek/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/hungarian/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/italian/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/korean/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/norwegian-ny/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/norwegian/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/polish/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/portuguese/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/romanian/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/russian/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/serbian/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/slovak/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/spanish/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/swedish/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
sql/share/ukrainian/errmsg.txt:
  Error message for ER_GET_ERRMSG and ER_GET_TEMPORARY_ERRMSG
2004-05-13 11:56:45 +02:00
unknown
3cf87a5b57 Fix for sql-bench/test-create
sql-bench/server-cfg.sh:
  Set max number of tables to create in NDB to 32
2004-05-13 11:21:56 +02:00
unknown
5e992944b5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ps
2004-05-13 10:31:31 +05:00
unknown
018b103bfe client_test with embedded library will be built so one can check if he broke
something in embedded PS


BitKeeper/etc/ignore:
  Added libmysqld/examples/client_test.c to the ignore list
libmysqld/examples/Makefile.am:
  tests/client_test is now symlinked to libmysqld/examples catalog
  then it's built with libmysqld.a
2004-05-13 10:30:42 +05:00
unknown
ae94c9a1d8 Only compile SHM if configured to 2004-05-12 20:58:35 +02:00
unknown
844f762916 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space/tomas/mysql-4.1-ndb
2004-05-12 16:16:18 +02:00
unknown
b36bf32dc9 Merge build.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1
2004-05-12 16:16:17 +02:00
unknown
05fd891ccc regression.sh:
fixed typo


ndb/bin/regression.sh:
  fixed typo
2004-05-12 16:15:43 +02:00
unknown
fc5445ac03 InnoDB: avoid some data races in innobase_mysql_print_thd() (Bug #3596)
sql/ha_innodb.cc:
  innobase_mysql_print_thd(): initial fix to Bug #3596
2004-05-12 16:44:53 +03:00
unknown
eb261517a3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2004-05-12 16:24:11 +03:00
unknown
79f269cb4d Daemon code to run on all unixes 2004-05-12 14:16:04 +02:00
unknown
3f46ae17a2 NdbMutex.h:
oops forgot this one


ndb/include/portlib/NdbMutex.h:
  oops forgot this one
2004-05-12 12:52:08 +02:00
unknown
15db58a446 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space/tomas/mysql-4.1-ndb
2004-05-12 12:52:07 +02:00
unknown
de861db3e7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-05-12 12:52:06 +02:00
unknown
6f860637c1 Fix broken arg fot getrlimit
ndb/src/cw/cpcd/Process.cpp:
  Fix broken arg for getrlimit
2004-05-12 12:17:24 +02:00
unknown
2e9dee04e0 portability/autoconf fixes
ndb/config/Defs.LINUX.x86.GCC.mk:
  postability/autoconf fixes
ndb/include/portlib/NdbMutex.h:
  postability/autoconf fixes
ndb/src/common/editline/unix.h:
  postability/autoconf fixes
ndb/src/common/portlib/memtest/memtest.c:
  postability/autoconf fixes
ndb/src/common/portlib/unix/NdbTCP.c:
  postability/autoconf fixes
ndb/src/common/portlib/unix/NdbThread.c:
  postability/autoconf fixes
ndb/src/common/transporter/Makefile:
  postability/autoconf fixes
ndb/src/common/transporter/SHM_Transporter.cpp:
  postability/autoconf fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  postability/autoconf fixes
2004-05-12 12:14:54 +02:00
unknown
01925fa550 used item method (Bug #3686) 2004-05-12 12:27:43 +03:00
unknown
79229d6d42 eval0eval.c:
Backport suppression of MSVC++ warning from 4.1


innobase/eval/eval0eval.c:
  Backport suppression of MSVC++ warning from 4.1
2004-05-12 10:40:04 +03:00
unknown
69424ca9ab portability/autoconf fixes 2004-05-12 09:27:59 +02:00
unknown
bc2c0c5953 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1687
2004-05-12 08:13:05 +02:00
unknown
5a6ab9bd0d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc05.(none):/space2/tomas/mysql-4.1


ndb/include/newtonapi/defs/pcn_types.h:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp:
  Auto merged
ndb/src/common/portlib/unix/NdbCondition.c:
  Auto merged
ndb/src/common/portlib/unix/NdbDaemon.c:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged
ndb/src/common/util/getarg.c:
  Auto merged
ndb/src/common/util/strlcat.c:
  Auto merged
ndb/src/common/util/strlcpy.c:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/test/ndbapi/flexBench/flexBench.cpp:
  Auto merged
ndb/test/src/HugoCalculator.cpp:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
ndb/test/src/NdbConfig.cpp:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
ndb/tools/cpcc/cpcc.cpp:
  Auto merged
2004-05-12 06:26:53 +02:00
unknown
efe5a75d7d portability/autoconf fixes and removed warnings
ndb/include/newtonapi/defs/pcn_types.h:
  portability/autoconf fixes
ndb/include/portlib/NdbMutex.h:
  portability/autoconf fixes
ndb/src/common/editline/editline.c:
  portability/autoconf fixes
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  portability/autoconf fixes
ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp:
  portability/autoconf fixes
ndb/src/common/portlib/unix/NdbCondition.c:
  portability/autoconf fixes
ndb/src/common/portlib/unix/NdbDaemon.c:
  portability/autoconf fixes
ndb/src/common/portlib/unix/NdbHost.c:
  portability/autoconf fixes
ndb/src/common/util/File.cpp:
  portability/autoconf fixes
ndb/src/common/util/getarg.c:
  portability/autoconf fixes
ndb/src/common/util/strlcat.c:
  portability/autoconf fixes
ndb/src/common/util/strlcpy.c:
  portability/autoconf fixes
ndb/src/cw/cpcd/Process.cpp:
  portability/autoconf fixes
ndb/src/cw/cpcd/common.cpp:
  portability/autoconf fixes
ndb/src/cw/cpcd/main.cpp:
  portability/autoconf fixes
ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp:
  portability/autoconf fixes
ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp:
  portability/autoconf fixes
ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp:
  portability/autoconf fixes
ndb/src/kernel/error/TimeModule.cpp:
  portability/autoconf fixes
ndb/src/kernel/ndb-main/Main.cpp:
  portability/autoconf fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  portability/autoconf fixes
ndb/src/mgmsrv/main.cpp:
  portability/autoconf fixes
ndb/test/ndbapi/flexBench/flexBench.cpp:
  removed warnings
ndb/test/src/HugoCalculator.cpp:
  removed warnings
ndb/test/src/HugoOperations.cpp:
  removed warnings
ndb/test/src/HugoTransactions.cpp:
  removed warnings
ndb/test/src/NDBT_ResultRow.cpp:
  removed warnings
ndb/test/src/NdbBackup.cpp:
  removed warnings
ndb/test/src/NdbConfig.cpp:
  removed warnings
ndb/test/src/NdbRestarter.cpp:
  removed warnings
ndb/tools/cpcc/cpcc.cpp:
  removed warnings
2004-05-12 06:24:12 +02:00
unknown
c2ce702b3b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-12 02:39:32 +03:00
unknown
47890151b4 Portability fixes
scripts/mysql_install_db.sh:
  Portability fix (! is not portable)
sql/item_func.cc:
  Use my_strtoll10() instead of strtoull()
sql/repl_failsafe.cc:
  Use my_strtoll10() instead of strtoull()
sql/sql_analyse.cc:
  Use my_strtoll10() instead of strtoull()
sql/sql_yacc.yy:
  Use my_strtoll10() instead of strtoull()
strings/my_strtoll10.c:
  Fix compiler warnings
2004-05-12 02:38:57 +03:00
unknown
64d2ddbf4e - Bumped up version number from 4.0.19 -> 4.0.20
- Tagged ChangeSet@1.1800.1.1 as "mysql-4.0.19"


configure.in:
   - Bumped up version number from 4.0.19 -> 4.0.20
2004-05-12 01:23:27 +02:00
unknown
d8f0b0c50e Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-05-11 16:15:20 -07:00
unknown
1662e59626 Added comments to all methods. Added explanation for a sequential read through a storage engine.
sql/examples/ha_example.cc:
  Documentation updates (lots of comments in the code).
sql/examples/ha_example.h:
  Documenation update, lots of comments in the code.
2004-05-11 15:59:20 -07:00
unknown
cd8f9ed2a2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-12 00:30:16 +03:00