Commit graph

18700 commits

Author SHA1 Message Date
unknown
7bdd452ddb If VARCHAR strips only trailing spaces, then produce
a note, not a warning or error.
2005-01-11 16:49:45 +04:00
unknown
89866c5430 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-11 13:36:27 +01:00
unknown
e7b38aa7bd Fixes for two compile-time failures.
ndb/src/common/transporter/TransporterRegistry.cpp:
  make it compile with -ansi -pedantic
sql/sql_lex.cc:
  a fix for compile-time failure
2005-01-11 15:32:23 +03:00
unknown
d73a4de9b7 bug#7798 - ndb - range scan with invalid table version could cause node failure
mysql-test/r/ndb_index_ordered.result:
  Test scan with invalid table version
mysql-test/t/ndb_index_ordered.test:
  Test scan with invalid table version
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Set apiConnectstate= CS_ABORTING when receving a scan req with invalid
    table version
2005-01-11 13:30:11 +01:00
unknown
87080e7874 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7330
2005-01-11 16:10:06 +04:00
unknown
9c498652d7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-11 13:06:04 +01:00
unknown
fc8ac2c1e4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-11 12:54:53 +01:00
unknown
ae7169786e can't use my_pread,my_pwrite since it uses mutexes on the files 2005-01-11 12:50:54 +01:00
unknown
7bf677dd64 Merge mysql.com:/home/kostja/work/mysql-4.1-7428
into mysql.com:/home/kostja/work/mysql-5.0-root


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-01-11 14:47:12 +03:00
unknown
194937169f Followup: rename the declaration (hash_reset -> my_hash_reset) 2005-01-11 13:57:07 +03:00
unknown
4801c2e62f A fix for linking failure of MySQL client when linking with imap libraries
(Bug#7428) (renamed: hash_reset -> my_hash_reset)


mysys/hash.c:
  renamed: hash_reset -> my_hash_reset
sql/sql_class.h:
  hash_reset -> my_hash_reset
2005-01-11 13:53:10 +03:00
unknown
a28ebe6b6f Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-11 11:16:02 +01:00
unknown
28f86d8ff1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-11 11:14:14 +01:00
unknown
fe8c6a4a03 make it compile with -ansi -pedantic 2005-01-11 13:12:52 +03:00
unknown
9cc4ada8d4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-11 11:12:46 +01:00
unknown
3cde206040 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 10:34:38 +01:00
unknown
eae30642cd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-11 10:34:37 +01:00
unknown
1ef48556bd Bug#7477 2005-01-11 10:34:36 +01:00
unknown
9acc2bbd2d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 10:31:31 +01:00
unknown
7535b07425 bug#7765 - ndb startup on 64-bit, increase stack on 64-bit
ndb/src/common/portlib/NdbThread.c:
  Use double stack for 64-bit
2005-01-11 10:02:31 +01:00
unknown
c92554e81f Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-01-11 05:11:42 +01:00
unknown
7b66387475 Merge
BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-11 05:10:08 +01:00
unknown
3c41c5fb1c Merge mysql.com:/home/jwinstead2/mysql-4.1-7556
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 02:57:47 +01:00
unknown
fbff8b8e65 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 02:36:50 +01:00
unknown
7451f0b38c Merge mysql.com:/home/jwinstead2/mysql-4.1-7762
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 01:25:46 +01:00
unknown
4bd2b5adc4 Fix style nit
sql/examples/ha_archive.cc:
  Fix style
2005-01-11 01:01:35 +01:00
unknown
57ff6dd01a field.h, field.cc:
Did some more split TABLE to TABLE and TABLE_SHARE


sql/field.cc:
  Field 'db_low_byte_first' of 'struct st_table' is now in TABLE_SHARE sub struct 's'
sql/field.h:
  Field 'db_low_byte_first' of 'struct st_table' is now in TABLE_SHARE sub struct 's'
2005-01-11 00:17:21 +01:00
unknown
4bb238a054 Fix double-initalization of mutex in archive storage engine. (Bug #7762)
sql/examples/ha_archive.cc:
  Fix redundant initialization of share->mutex
  Fix error handling to always clean up correctly
  Fix a couple of warnings
2005-01-10 23:59:28 +01:00
unknown
b63d9439c9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-10 23:27:37 +01:00
unknown
26c1d47a0d Recorded new result file 2005-01-10 21:45:35 +01:00
unknown
f360ee773c Fix for failing INSERT IGNORE 2005-01-10 20:55:05 +01:00
unknown
d3f5dfbd17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-10 18:46:31 +01:00
unknown
a4eb7490b0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-10 18:42:07 +01:00
unknown
7d8451266a Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/mysql-5.0
2005-01-10 16:27:16 +00:00
unknown
c0d168e65d Initialize lex->mqh structure. Fixes valgrind warnings. 2005-01-10 16:24:05 +00:00
unknown
4399f8931a Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-5.0-build


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
2005-01-10 16:32:03 +01:00
unknown
cc1c4a99ef - removed the mysql-test/suites/jp test suite and marked all files as gone 2005-01-10 16:19:01 +01:00
unknown
345e51802d bad merge fixed 2005-01-10 16:03:06 +01:00
unknown
891117e489 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
2005-01-10 16:02:38 +01:00
unknown
044172b0fa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
2005-01-10 16:02:37 +01:00
unknown
7767a687f9 added new methods for NdbTransaction::getNdbIndexOperation() and NdbTransaction::getNdbIndexScanOperation() as recommended
made others depricated
updated examples to use recommended
2005-01-10 16:02:36 +01:00
unknown
24b048f5f4 Merge mysql.com:/home/mysql_src/mysql-4.1-clean
into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/net_serv.cc:
  Auto merged
2005-01-10 15:15:49 +01:00
unknown
87e1a296ab A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE). 2005-01-10 15:13:33 +01:00
unknown
f755e4aece wl2240 - ndb partitioning
1) Fix startTransaction with hint
2) Ship fragment data to API to make better guess
3) Expose both primary & backup replicas 
   To (in the future) be even more clever on choosing nodes for
   transactions/operations


ndb/include/kernel/ndb_limits.h:
  Set maxsize of array with fragment data
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Send fragment data to API
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Use Uint16 for fragment info
  Fix uninit variable
ndb/src/ndbapi/Ndb.cpp:
  Impl. startTransaction with hint
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add interface for retreiving replica nodes given a hash-value
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add interface for retreiving replica nodes given a hash-value
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  remove Fragment2NodeMap and put it on table instead
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  remove Fragment2NodeMap and put it on table instead
ndb/test/ndbapi/testNdbApi.cpp:
  Test some more
2005-01-10 14:40:54 +01:00
unknown
2d3c55cd7b os0file.c:
Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined


innobase/os/os0file.c:
  Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined
2005-01-10 15:26:33 +02:00
unknown
7a35921bff Merge mysql.com:/home/mysql_src/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.1-clean


Build-tools/Bootstrap:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-10 14:13:41 +01:00
unknown
d8d9f79e09 Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]":
mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.


sql/net_serv.cc:
  If no VIO, no write.
2005-01-10 13:52:32 +01:00
unknown
96ae27c7c2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-10 12:30:28 +01:00
unknown
4630282b51 updated docs on hints 2005-01-10 12:04:08 +01:00
unknown
7421239787 fixed testNdbApi to use new startTransaction interface 2005-01-10 11:54:03 +01:00