Commit graph

17139 commits

Author SHA1 Message Date
unknown
f7662a452b wl2126 - ndb - Enable read_multi_range batching also for range scan(s)
+fix mysql code style
 +adopt to interface changes by ingo


sql/ha_ndbcluster.cc:
  Enable read_multi_range batching also for range scan(s)
   +fix mysql code style
   +adopt to interface changes by ingo
sql/ha_ndbcluster.h:
  Enable read_multi_range batching also for range scan(s)
   +fix mysql code style
   +adopt to interface changes by ingo
2004-11-26 15:15:22 +01:00
unknown
0a2632907a Merge joreland@bk-internal.mysql.com:wl2126
into mysql.com:/home/jonas/src/wl2126


ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-11-26 13:51:55 +01:00
unknown
254dc5274a Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/wl2126


ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-11-26 13:09:11 +01:00
unknown
a6b14b8d72 wl2126 - ndb - batching of range scans
between 80% and 360% performance improvement measured


ndb/docs/wl2077.txt:
  Update figures after batching of range scans and pekka's blob fixes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Don't close scan if other ranges exists
2004-11-26 11:34:59 +01:00
unknown
a72a5f1264 merge 2004-11-26 10:13:32 +01:00
unknown
8d1171742c ndb - bugfix testScanPerf
ndb/test/ndbapi/testScanPerf.cpp:
  1) Fix so that values are read even when using -q
  2) Divide by correct number
2004-11-26 10:00:33 +01:00
unknown
f7afb67424 sql/ha_ndbcluster.cc
added missing DBUG_RETURN's
mysql-test/r/ndb_read_multi_range.result@1.0
    BitKeeper file /home/tomas/wl2126/mysql-test/r/ndb_read_multi_range.result
mysql-test/r/ndb_read_multi_range.result@1.1
    (NO COMMENTS AVAILABLE)
mysql-test/t/ndb_read_multi_range.test@1.0
    BitKeeper file /home/tomas/wl2126/mysql-test/t/ndb_read_multi_range.test
mysql-test/t/ndb_read_multi_range.test@1.1
    (NO COMMENTS AVAILABLE)


sql/ha_ndbcluster.cc:
  added missing DBUG_RETURN's
2004-11-25 18:12:05 +00:00
unknown
353076ad09 wl2126 - ndb - bug fix in set_new_bound & testScanPerf
ndb/src/ndbapi/NdbScanOperation.cpp:
  Bugfix in set_new_bound
ndb/test/ndbapi/testScanPerf.cpp:
  Add batch size (and -r 3), which is multi_read_range
2004-11-25 15:36:39 +01:00
unknown
e6493ba911 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/wl2126


ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-11-25 14:30:15 +00:00
unknown
d45ee63e25 merge
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
2004-11-25 14:33:33 +01:00
unknown
84363987af Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2004-11-25 14:33:32 +01:00
unknown
3346feb8df Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


mysql-test/r/fulltext.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/table.cc:
  Auto merged
2004-11-25 13:33:31 +00:00
unknown
207676814b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
2004-11-25 16:18:48 +04:00
unknown
26339663b8 table.cc:
Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1


sql/table.cc:
  Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
2004-11-25 16:18:47 +04:00
unknown
026259249e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441


sql/item_func.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
2004-11-25 16:18:46 +04:00
unknown
9fc190e603 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-25 13:18:46 +01:00
unknown
897b7cbd44 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-25 12:18:45 +00:00
unknown
45f941cb5c ndb/src/common/logger/LogHandler.cpp
changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp
    some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp
    rewrote parsing on parseNameValuePair, was buggy


ndb/src/common/logger/LogHandler.cpp:
  changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp:
  some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  rewrote parsing on parseNameValuePair, was buggy
2004-11-25 12:14:15 +00:00
unknown
dcdbad0791 Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/wl2126


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-11-25 10:51:57 +01:00
unknown
7421af248d Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2004-11-25 10:48:20 +01:00
unknown
45d8803bf6 ndb - Fix loop over multiple bounds in LQH
Last part of NDB batching of range scans 
      (now only handler remains)


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix loop over multiple bounds in LQH
2004-11-25 10:47:44 +01:00
unknown
32c3009d3a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-25 10:40:56 +01:00
unknown
0e6d4fd043 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2004-11-25 10:39:34 +01:00
unknown
5aaffe9b3c bug#6775 - ndb - fix bug introduced by bug fix
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Scan number allocation must be on table even in case of range scan
  Otherwise scan takeover won't work as LQHKEYREQ contains table
2004-11-25 10:38:46 +01:00
unknown
a0f2ecf7fb do not leave sql command uninitialized, because it used for detection need of preparation correct idends printing during finding identifiers i
sql/sql_lex.h:
  do not leave sql command uninitialized, because it used for detection need of preparation correct idends printing  during finding identifiers in table list (alias resolving tracking)
2004-11-25 10:23:47 +02:00
unknown
7108deee6e spelling fixed/comments added (postreview fixes)
sql/mysqld.cc:
  spelling fixed
sql/sql_base.cc:
  spelling fixed
sql/sql_delete.cc:
  spelling fixed
sql/sql_parse.cc:
  comments added
sql/sql_prepare.cc:
  comments added
sql/sql_update.cc:
  spelling fixed
sql/sql_view.cc:
  spelling fixed
sql/table.cc:
  spelling fixed
2004-11-25 09:28:32 +02:00
unknown
a352372170 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
2004-11-25 02:27:02 +02:00
unknown
f88d01932f post-merge fix
mysql-test/r/view.result:
  changes in error number, and key in view processing
mysql-test/t/view.test:
  changes in error number, and key in view processing
sql/mysql_priv.h:
  changes functions
sql/sp.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_base.cc:
  fixed finding table, taking in account join view, which can have not TABLE pointer
  now we report to setup_tables(), are we setuping SELECT...INSERT and ennumerete insert table separately
sql/sql_delete.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_help.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_insert.cc:
  fixed returning value of functions
sql/sql_load.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
  removed second setup_tables call (merge)
sql/sql_olap.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_parse.cc:
  UPDATE->MULTIUPDATE switching fixed
sql/sql_prepare.cc:
  UPDATE->MULTIUPDATE switching fixed
sql/sql_select.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_update.cc:
  UPDATE->MULTIUPDATE switching fixed
sql/sql_view.cc:
  returning value fixed
sql/sql_view.h:
  returning value fixed
2004-11-25 02:23:13 +02:00
unknown
00899088a5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-11-25 01:09:04 +01:00
unknown
9c03e9cf00 sql_select.cc:
my_message_sql does not tolerate a NullS argument (segfault)


sql/sql_select.cc:
  my_message_sql does not tolerate a NullS argument (segfault)
2004-11-25 01:06:37 +01:00
unknown
2b4400e22d Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 23:47:14 +01:00
unknown
6429a0c598 bug#6784
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
2004-11-24 23:16:16 +01:00
unknown
b23fe2ac67 lowercase_table3.result:
Correct InnoDB's result output in test; the pseudo-file-extension for InnoDB tables '.InnoDB' was replaced by a more realistic '.ibd' extension


mysql-test/r/lowercase_table3.result:
  Correct InnoDB's result output in test; the pseudo-file-extension for InnoDB tables '.InnoDB' was replaced by a more realistic '.ibd' extension
2004-11-25 00:04:03 +02:00
unknown
d7cfa0fef8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into avenger.(none):/export/brian/mysql/merge/5.0
2004-11-24 13:34:35 -08:00
unknown
80282a9418 Merging 4.1 to 5.0
Build-tools/Do-compile:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
configure.in:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Resolved NDB conflict between 4.1 and 5.0
2004-11-24 12:34:44 -08:00
unknown
aea5560b49 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-11-24 21:25:36 +02:00
unknown
0f61fec47e A fix. Why didn't we use UINT_MAX32? 2004-11-24 22:18:28 +04:00
unknown
239cdc27dc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/table.h:
  Auto merged
2004-11-24 20:01:34 +02:00
unknown
c774eb0e6d fixed problem in MacOS
correct printing of aliases


mysql-test/r/lowercase_view.result:
  aliases in VIEWs
mysql-test/t/lowercase_view.test:
  aliases in VIEWs
sql/item.cc:
  tracking using aliases in indentifiers
sql/item.h:
  tracking using aliases in indentifiers
sql/sql_base.cc:
  tracking using aliases in indentifiers
sql/sql_lex.cc:
  tracking using aliases in indentifiers
sql/sql_lex.h:
  tracking using aliases in indentifiers
sql/table.h:
  tracking using aliases in indentifiers
2004-11-24 19:48:30 +02:00
unknown
c3272ae718 configure.in:
Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system


innobase/configure.in:
  Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
2004-11-24 19:41:38 +02:00
unknown
185965214d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-24 17:41:37 +00:00
unknown
2f36bf7418 added explanation of error code 4335 2004-11-24 17:40:40 +00:00
unknown
a806cba3e3 Merge from 4.0 for immediate use in the current 5.0 builds.
client/mysqladmin.cc:
  Auto merged
Build-tools/Do-compile:
  Merged the default "--force" for the call to 'mysql-test-run' from 4.0, for immediate use in the current 5.0 builds.
2004-11-24 17:32:11 +01:00
unknown
3392e3178a Fixed bug related to lower case table names on Power Mac
'information_schema' test is splitted because of innodb  


mysql-test/r/information_schema.result:
  Test is splitted because of innodb
mysql-test/t/information_schema.test:
  Test is splitted because of innodb
sql/sql_show.cc:
  Fixed bug related to lower case table names on Power Mac
sql/table.h:
  Fixed bug related to lower case table names on Power Mac
tests/client_test.c:
  Don't check field length for blob filed
2004-11-24 19:32:10 +03:00
unknown
03cba628f6 Bug#6787 LIKE not working properly with _ and utf8 data 2004-11-24 20:09:54 +04:00
unknown
232bbfda4d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 17:09:53 +01:00
unknown
d1441b68d0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 17:09:53 +01:00
unknown
b760bfd77d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-24 16:09:52 +00:00
unknown
f4db89ea85 also backup needs triggers 2004-11-24 16:04:11 +00:00
unknown
61dbdff2a6 calculation of noOfTriggers 2004-11-24 15:51:59 +00:00