Commit graph

14139 commits

Author SHA1 Message Date
unknown
d2c8f1a762 Implemented general purpose psuedo columns: row_count & fragment
Implemented new interpreter instruction: exit_ok_last

This two new features combined can be used to make fast select count
 


ndb/include/kernel/AttributeHeader.hpp:
  Psuedo columns fragment & row_count
ndb/include/kernel/GlobalSignalNumbers.h:
  Impl. READ_ROWCOUNT
ndb/include/kernel/signaldata/TupKey.hpp:
  Remove unused pageId pageIndex and replace with lastRow flag
ndb/include/ndbapi/NdbOperation.hpp:
  New instruction for last_row
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  REQ_ROWCOUNT + last row
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  REQ_ROWCOUNT + last row
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add readers for new psuedo columns
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Add readers for new psuedo columns
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Add readers for new psuedo columns
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Use exit ok (not ok_last)
ndb/src/ndbapi/NdbOperationExec.cpp:
  Use exit ok (not ok_last)
ndb/src/ndbapi/NdbOperationInt.cpp:
  New instruction
2004-08-24 23:27:32 +02:00
unknown
1e91f015ca Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/mgmsrv/Services.cpp:
  Auto merged
configure.in:
  Auto merged
acinclude.m4:
  Auto merged
2004-08-24 21:07:08 +02:00
unknown
6b20f46abc fixed AC_DEFINE(HAVE_HIST_ENTRY) in acinclude.m4
acinclude.m4:
  fixed AC_DEFINE(HAVE_HIST_ENTRY)
2004-08-25 00:07:07 +05:00
unknown
f8f627d050 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear_v2


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
2004-08-24 23:38:31 +05:00
unknown
68a1e80df4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/rburnett/mysql41
2004-08-24 17:24:06 +02:00
unknown
3e45c82e5b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_class.cc:
  Auto merged
2004-08-24 18:24:05 +03:00
unknown
a66d1ba708 my_handler.c:
Added (my_bool) cast to !(nextflag & SEARCH_PREFIX) code to correct MSVC warning about mismatched integral types


mysys/my_handler.c:
  Added (my_bool) cast to !(nextflag & SEARCH_PREFIX) code to correct MSVC warning about mismatched integral types
2004-08-24 17:24:05 +02:00
unknown
63d253171d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-24 17:24:04 +02:00
unknown
7b2966f973 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
2004-08-24 20:24:03 +05:00
unknown
4c55e2ac4b Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1


sql-common/client.c:
  Auto merged
2004-08-24 20:18:39 +05:00
unknown
84648dfbdd more accurate processing of find_type result
(Bug #4998 --protocol doesn't reject bad values)


client/mysql.cc:
  more accurate processing of find_type result
client/mysqladmin.c:
  more accurate processing of find_type result
client/mysqlbinlog.cc:
  more accurate processing of find_type result
client/mysqlcheck.c:
  more accurate processing of find_type result
client/mysqldump.c:
  more accurate processing of find_type result
client/mysqlimport.c:
  more accurate processing of find_type result
client/mysqlshow.c:
  more accurate processing of find_type result
sql-common/client.c:
  more accurate processing of find_type result
2004-08-24 20:13:31 +05:00
unknown
20f24a422b Portablity fixes & simple optimizations
sql/ha_ndbcluster.cc:
  Added missing cast
sql/item.cc:
  Portability fix (for windows)
sql/lock.cc:
  Cleanup + more comments
sql/sql_class.cc:
  Portability fix + more comments
sql/sql_select.cc:
  Portability fix
sql/sql_table.cc:
  Simpler handling of auto_increment in ALTER TABLE
2004-08-24 18:00:45 +03:00
unknown
de225e637a fixed :
Bug #3937  	fails to compile with both gcc 3.3.3/icc8
Bug #4728  	mysql couldn't be compiled using system readline (readline-4.3)


acinclude.m4:
  1. added defun MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY for last versions of readline and libedit
  2. added #undef __P in defuns MYSQL_CHECK_LIBEDIT_INTERFACE, MYSQL_CHECK_NEW_RL_INTERFACE
client/mysql.cc:
  1. added #undef __P before #include "readline/readline.h" because readline-4.2 declares own __P
  2. changed !defined(USE_LIBEDIT_INTERFACE) to !defined(HAVE_HIST_ENTRY) before declaring of own hist_entry
     because latest versions of libedit declare hist_entry too
cmd-line-utils/Makefile.am:
  added copyright header
configure.in:
  1. added comment for --with-readline/--with-libedit options
  2. added define for HAVE_HIST_ENTRY and macro to check it
  3. added AC_LANG_CPLUSPLUS before readline/libedit checks
2004-08-24 19:23:23 +05:00
unknown
940a6b4e3e Use "configured" socklen_t
Fix master printout


ndb/src/mgmclient/CommandInterpreter.cpp:
  Fix master printout
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Use "configured" socklen_t
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Use "configured" socklen_t
ndb/src/mgmsrv/Services.cpp:
  Use "configured" socklen_t
2004-08-24 15:08:52 +02:00
unknown
dbd2625fd7 Compile fix sol9x86
ndb/src/kernel/blocks/grep/Grep.hpp:
  Remove own addRecSignal-methods
ndb/src/kernel/blocks/grep/GrepInit.cpp:
  Remove own addRecSignal-methods
ndb/src/mgmsrv/MgmtSrvr.cpp:
  #ifdef SUNPRO_CC 5.6
ndb/src/ndbapi/NdbEventOperation.cpp:
  Compile fix
ndb/src/ndbapi/NdbScanFilter.cpp:
  #ifdef SUNPRO_CC 5.6
ndb/src/ndbapi/TransporterFacade.hpp:
  Compile fix
ndb/test/ndbapi/testIndex.cpp:
  Compile fix
2004-08-24 14:48:07 +02:00
unknown
ae87e658a2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-08-24 07:22:16 -05:00
unknown
f7e31ee94c merge
configure.in:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-24 13:29:11 +02:00
unknown
d7dd19aa07 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-root-root
2004-08-24 15:29:10 +04:00
unknown
2ba96c63b3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-24 13:29:09 +02:00
unknown
352965b3d2 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 16:29:08 +05:00
unknown
b1a91d21ea SCO unix compile fix
ndb/src/common/portlib/Makefile.am:
  Rename from .c to .cpp as c++ features needed
ndb/src/common/portlib/NdbTCP.cpp:
  NDB_MUTEX_INITIALIZER isn't preset on SCO unix
ndb/src/ndbapi/Ndbinit.cpp:
  NDB_MUTEX_INITIALIZER isn't preset on SCO unix
2004-08-24 13:29:08 +02:00
unknown
28ae9fcbff Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-24 13:29:07 +02:00
unknown
d96933b455 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 16:29:06 +05:00
unknown
0fa99ec20b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-fix
2004-08-24 15:29:06 +04:00
unknown
c6e77b16a0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb
2004-08-24 16:29:05 +05:00
unknown
f6c7d7e438 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 11:29:04 +00:00
unknown
3dae7e9320 some more printouts to SHOW command
mysql-test/ndb/ndbcluster.sh:
  stop instead of kill
2004-08-24 11:28:19 +00:00
unknown
c62a26f777 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-24 13:19:45 +02:00
unknown
30f6acf44b enabling stopping of ndb_mgmd 2004-08-24 10:44:42 +00:00
unknown
d261072f7c Fix to compile with msvc: converted static const int Item_arena::* to enum members, undefine ERROR
include/config-win.h:
  Undefine ERROR #defined by WINGDI
sql/sql_class.cc:
  Fix to compile with msvc: converted static const int Item_arena::* to enum members
sql/sql_class.h:
  Fix to compile with msvc: converted static const int Item_arena::* to enum members
sql/sql_prepare.cc:
  Fix to compile with msvc: converted static const int Item_arena::* to enum members
2004-08-24 14:44:15 +04:00
unknown
c83ef2fdc3 Merging fix 2004-08-24 15:03:44 +05:00
unknown
805dcdadfd Fixed windows-specific warning about undeclared localtime_r() in my_time.c.
We have to include my_pthread.h since it is the place where localtime_r() is declared 
on platforms where this function is missing.


sql-common/my_time.c:
  We have to include my_pthread.h since it is the place where localtime_r() is declared 
  on platforms where this function is missing.
2004-08-24 13:53:02 +04:00
unknown
bc133cbfd9 bug#5014
detect change of #replicas + #nodes
2004-08-24 11:31:30 +02:00
unknown
e8b2c2c3de added mysql libs to ndb for debug features primarily
ndb/src/mgmclient/CpcClient.cpp:
  small fix
2004-08-24 09:25:23 +00:00
unknown
4456f6c040 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 14:24:14 +05:00
unknown
4370db52b2 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 14:22:47 +05:00
unknown
8854eeda26 Merging 2004-08-24 12:58:21 +05:00
unknown
01946089eb only in vm_trace 2004-08-24 07:38:04 +00:00
unknown
8d9dca16e2 subselect test split on two tests because gis extention can be absent 2004-08-24 10:15:39 +03:00
unknown
b2b215d9ce Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-24 00:45:03 +02:00
unknown
4e7cb1ce48 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
2004-08-24 01:09:24 +03:00
unknown
7d4ad390e0 Fixed uninitialized variable
Fixed error messages


sql/share/czech/errmsg.txt:
  Fixed error message to us long
sql/share/danish/errmsg.txt:
  Fixed error message to us long
sql/share/dutch/errmsg.txt:
  Fixed error message to us long
sql/share/english/errmsg.txt:
  Fixed error message to us long
sql/share/estonian/errmsg.txt:
  Fixed error message to us long
sql/share/french/errmsg.txt:
  Fixed error message to us long
sql/share/german/errmsg.txt:
  Fixed error message to us long
sql/share/greek/errmsg.txt:
  Fixed error message to us long
sql/share/hungarian/errmsg.txt:
  Fixed error message to us long
sql/share/italian/errmsg.txt:
  Fixed error message to us long
sql/share/japanese/errmsg.txt:
  Fixed error message to us long
sql/share/korean/errmsg.txt:
  Fixed error message to us long
sql/share/norwegian-ny/errmsg.txt:
  Fixed error message to us long
sql/share/norwegian/errmsg.txt:
  Fixed error message to us long
sql/share/polish/errmsg.txt:
  Fixed error message to us long
sql/share/portuguese/errmsg.txt:
  Fixed error message to us long
sql/share/romanian/errmsg.txt:
  Fixed error message to us long
sql/share/russian/errmsg.txt:
  Fixed error message to us long
sql/share/serbian/errmsg.txt:
  Fixed error message to us long
sql/share/slovak/errmsg.txt:
  Fixed error message to us long
sql/share/spanish/errmsg.txt:
  Fixed error message to us long
sql/share/swedish/errmsg.txt:
  Fixed error message to us long
sql/share/ukrainian/errmsg.txt:
  Fixed error message to us long
sql/sql_table.cc:
  Fixed uninitialized variable
2004-08-24 01:08:48 +03:00
unknown
86c5125afa added explicit instantiation of template 2004-08-23 22:06:23 +00:00
unknown
916a028c36 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-23 22:01:16 +02:00
unknown
946c48baa6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:57:07 +03:00
unknown
55c7840b9e Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-08-23 14:47:12 -05:00
unknown
43821a8336 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:32:38 +03:00
unknown
8f405690f1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/mysql/4.1


configure.in:
  Auto merged
2004-08-23 12:31:03 -07:00
unknown
13f7338a3f after review fixes:
allowed parsing of table fields inside aggregate functions
 added new tests of fields resolving in grouping


mysql-test/r/func_gconcat.result:
  allowed parsing of table fields inside aggregate functions
mysql-test/r/subselect.result:
  added new tests of fields resolving in grouping
mysql-test/t/func_gconcat.test:
  allowed parsing of table fields inside aggregate functions
mysql-test/t/subselect.test:
  added new tests of fields resolving in grouping
sql/item_subselect.cc:
  allowed parsing of table fields inside aggregate functions
2004-08-23 22:31:01 +03:00
unknown
3bb0223e7e mysqld.cc:
System variable names use underscores, not dashes.
  Alphabetize variables in option struct for help message.

(will wait for okay to push)


sql/mysqld.cc:
  System variable names use underscores, not dashes.
  Alphabetize variables in option struct for help message.
2004-08-23 14:30:55 -05:00