Commit graph

20927 commits

Author SHA1 Message Date
unknown
661390b1b4 fixed mem leak in subscriction handling in Suma
debug printouts
    ndb documentation update


ndb/include/ndbapi/Ndb.hpp:
  ndb documentation update
ndb/src/kernel/blocks/suma/Suma.cpp:
  fixed mem leak in subscriction handling in Suma
  debug printouts
ndb/src/kernel/blocks/suma/Suma.hpp:
  fixed mem leak in subscriction handling in Suma
2005-03-09 11:49:48 +01:00
unknown
7ec1e170c7 added testcase for multiple tables and events 2005-03-09 01:22:12 +01:00
unknown
664ad9005f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/sql_parse.cc:
  Auto merged
2005-03-09 01:02:13 +01:00
unknown
732a0ec400 fixed bug in event handling of several tables
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF


ndb/include/kernel/signaldata/SumaImpl.hpp:
  fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  fixed bug in event handling of several tables
2005-03-09 01:00:08 +01:00
unknown
1250899c0d Fixing post-merge errors 2005-03-09 00:09:18 +02:00
unknown
12c6eb3b08 post merge fixes
sql/sql_parse.cc:
  Auto merged
2005-03-08 22:59:21 +02:00
unknown
39c32324d6 making a better test case for bug #8850
mysql-test/r/sp.result:
  fixing results for new test
mysql-test/t/sp.test:
  making a new test with autocommit set to 0 and 1.
  Second CALL is in autocommit mode to prove that the relevant bug 
  (bug #8550) is fixed.
2005-03-08 22:44:35 +02:00
unknown
7adae6b37a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-08 20:38:06 +01:00
unknown
50985b6783 changelog-5.0.xml:
Add dummy changelog file. It should merge upward without conflict.
2005-03-08 13:15:36 -06:00
unknown
fe3a425a94 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 18:19:21 +01:00
unknown
50914ba7ae Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0


include/my_sys.h:
  Auto merged
2005-03-08 17:35:53 +01:00
unknown
d8222c03c0 Merge changes.
Build-tools/Do-compile:
  Change already present in 5.0
configure.in:
  Do not propagate a 4.0 version number to the 5.0 tree.
include/my_sys.h:
  Change already present in 5.0.
mysys/hash.c:
  For Sun compilers, 'static inline' is ok.
mysys/my_bitmap.c:
  Change already present in 5.0
sql/item_strfunc.cc:
  Change already present in 5.0
sql/net_serv.cc:
  Change already present in 5.0
2005-03-08 17:24:07 +01:00
unknown
9d01d51209 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 17:12:51 +01:00
unknown
8ab73b4cc7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-03-08 18:12:50 +02:00
unknown
0fdd650fec Fixed Bug#8922.
Reverted Jim's patch.


client/mysql.cc:
  Fixed Bug#8922, The deilimeter cannot be reset after it is set as word 'delimiter'
include/my_sys.h:
  Reverted Jim's patch.
mysys/mf_iocache.c:
  Reverted Jim's patch.
sql/sql_class.h:
  Reverted Jim's patch.
2005-03-08 18:12:12 +02:00
unknown
88c893cbbf InnoDB: Win64 portability fixes
innobase/include/srv0srv.h:
  Declare those variables as ulong that are declared in ha_innodb.h
innobase/srv/srv0srv.c:
  Define those variables as ulong that are declared in ha_innodb.h
2005-03-08 16:25:31 +02:00
unknown
395618a651 - bumped up version number in configure.in from 4.0.24 -> 4.0.25 (ChangeSet 1.2073 was already tagged
as 4.0.24)


configure.in:
  - bumped up version number from 4.0.24 -> 4.0.25
2005-03-08 11:42:21 +01:00
unknown
a66165ce05 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-08 09:56:32 +01:00
unknown
45b5e513c6 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 09:51:00 +01:00
unknown
30f0b31687 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-03-08 10:03:56 +02:00
unknown
05dfca24c4 Re-enable IO cache mode that allows slow and query logs to go to a FIFO
(lost in merge because the code to open these logs was moved to a different
file).


sql/sql_class.h:
  Use APPEND_CACHE for query log and slow log (so they can be FIFO)
2005-03-07 13:56:58 -08:00
unknown
7a35a18a82 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-07 22:38:41 +01:00
unknown
14f4eebdd3 Clean up merge
include/my_sys.h:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
2005-03-07 13:26:27 -08:00
unknown
857bc49d28 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-07 21:33:02 +01:00
unknown
c324036c5f Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-03-07 21:30:43 +02:00
unknown
dcd8383b86 added test compare function for testing event
fixed one bug in event, pk comes first in events...
2005-03-07 18:47:47 +01:00
unknown
25f8623fff Fixed BUG#8937: Stored Procedure: AVG() works as SUM() in SELECT ... INTO statement
mysql-test/r/sp.result:
  New test case for BUG#8937.
mysql-test/t/sp.test:
  New test case for BUG#8937.
sql/item_sum.h:
  Added val_int() method for Item_sum_avg for forced int types (in SPs for instance),
  otherwise Item_sum_sum::val_int() is used.
2005-03-07 18:09:53 +01:00
unknown
00a163d46f Fix for bug #8935 CAST(time AS DECIMAL) crashes
mysql-test/r/cast.result:
  test result
mysql-test/r/func_group.result:
  test result
mysql-test/t/cast.test:
  test case
sql/field.cc:
  this assert isn't correct actually
2005-03-07 20:53:51 +04:00
unknown
a93b0b59bd Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0.7498
2005-03-07 19:32:54 +03:00
unknown
804a2a8cdf Reorganized sp.test (all bugs at the end now).
mysql-test/r/sp.result:
  Reorganized tests (all bugs at the end now) and made some tests adopt to the file's style.
mysql-test/t/sp.test:
  Reorganized tests (all bugs at the end now) and made some tests adopt to the file's style.
2005-03-07 17:16:37 +01:00
unknown
fd35e7870a Fix for bug#8978 : Crash on 'select format ...' 2005-03-07 18:56:18 +03:00
unknown
bda53f8c1e Avoid empty build (failure) mails on Solaris (backport from 4.1).
Build-tools/Do-compile:
  Backport of a change Lenz did in 4.1 (without it, Solaris sends empty mails):
  
  Improved the abort subroutine to not rely on an external "tail" command (the
  default /usr/bin/tail on Solaris does not understand the "-n" notation).
  Get rid of a "useless use of cat" case in the process.
2005-03-07 16:23:55 +01:00
unknown
df93a38d08 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-03-07 16:35:27 +02:00
unknown
45c72a5680 row0sel.c:
row_search_for_mysql(): Add a clarifying comment.


innobase/row/row0sel.c:
  row_search_for_mysql(): Add a clarifying comment.
2005-03-07 16:32:24 +02:00
unknown
01c3fb8ed1 Merging 2005-03-07 17:45:39 +04:00
unknown
2a66f66dfb InnoDB: optimize SELECT performance
innobase/include/row0vers.h:
  row_vers_build_for_consistent_read():
  Add parameters offsets and offset_heap
  in order to avoid recomputing the offsets in the caller.
innobase/row/row0sel.c:
  Eliminate some rec_get_offsets() calls.
innobase/row/row0vers.c:
  row_vers_build_for_consistent_read():
  Add parameters offsets and offset_heap
  in order to avoid recomputing the offsets in the caller.
2005-03-07 15:23:06 +02:00
unknown
34ff8fbdb1 Fix for bug #8465 (MIN, MAX return incorrect result)
mysql-test/r/func_group.result:
  test result fixed
mysql-test/t/func_group.test:
  testcase added
2005-03-07 16:38:05 +04:00
unknown
07d5ddb755 Fix for bug #8464 (AVG returns incorrect result)
Actually problem was not in AVG function, but in SUM before the AVG in the
query.


mysql-test/r/func_group.result:
  appropriate test result
mysql-test/t/func_group.test:
  test case added
strings/decimal.c:
  in this case we also need to make fsizes equal
2005-03-07 16:08:06 +04:00
unknown
77174b3a89 Default value of slave_transaction_retries is now 10
(whereas it's 0 in 4.1, for safety as this is new code).


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-07 12:49:38 +01:00
unknown
5835809a6c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/ft-mysql-5.0
2005-03-07 14:00:22 +04:00
unknown
724d706cf8 ut0mem.c:
ut_malloc_low(): fix the fprintf() format string
  (an extraneous comma split the format into two arguments)


innobase/ut/ut0mem.c:
  ut_malloc_low(): fix the fprintf() format string
  (an extraneous comma split the format into two arguments)
2005-03-07 09:43:19 +02:00
unknown
19925810c3 BUG#8351 post-review improvements.
myisam/ft_boolean_search.c:
  quot, qend not needed anymore, removed.
  phrase initialization moved to ft_init_boolean_search.
  comments added.
  _ftb_strstr renamed to _ftb_check_phrase.
myisam/ft_parser.c:
  style improvements.
2005-03-07 00:17:57 +04:00
unknown
6976089762 ndb - remove obsolete attribute storage type ACC vs TUP
ndb/include/kernel/signaldata/CreateEvnt.hpp:
  remove obsolete attribute storage type ACC vs TUP
ndb/include/kernel/signaldata/CreateIndx.hpp:
  remove obsolete attribute storage type ACC vs TUP
ndb/src/ndbapi/ndberror.c:
  remove obsolete attribute storage type ACC vs TUP
ndb/test/include/NdbSchemaOp.hpp:
  remove obsolete attribute storage type ACC vs TUP
ndb/test/ndbapi/bench/userInterface.cpp:
  remove obsolete attribute storage type ACC vs TUP
ndb/test/src/NdbSchemaOp.cpp:
  remove obsolete attribute storage type ACC vs TUP
2005-03-06 14:09:28 +01:00
unknown
e904d0e750 Porting of "buffered read" patch to 5.0 and post-review fixes.
The patch implements the idea suggested by Olaf van der Spek in 
thread "Client: many small reads?" (internals@lists.mysql.com).
Now small reads performed by the client library are buffered.
The buffering gives up to 2 times speedup when retrieving 
one-column tables.


BUILD/SETUP.sh:
  Remove --with-vio option which no longer exist.
BUILD/compile-pentium64-valgrind-max:
  Remove --with-vio option which no longer exist.
config/ac-macros/misc.m4:
  Removed --with-vio configure switch: we always use VIO. The switch,
   in fact, only saved us one pointer dereferencing per call in case we had
  only one transport type in VIO enabled.
config/ac-macros/openssl.m4:
  Removed HAVE_VIO.
include/config-win.h:
  Removed HAVE_VIO (not needed anymore)
  Added HAVE_VIO_READ_BUFF (define buffered client reads for Windows clients).
include/violite.h:
  Removed HAVE_VIO, as currently VIO is always in use.
  Added declaration for vio_read_buff and related members in struct VIO.
sql-common/client.c:
  Use flags to set up vio read buffering in mysql_real_connect.
sql/mysqld.cc:
  Use flags to disable vio read buffering when creating a server 
  connection.
vio/vio.c:
  Optionally set up vio read buffer when creating a new VIO structure.
vio/viosocket.c:
  Implementation of client-side buffered reads in VIO: the idea 
  is to buffer small reads in a client buffer to save amount of
  syscalls per retrieved result set. The implementation relies
  on the fact that read/recv will return as soon as there is
  some data in the kernel buffer, no matter how big the given
  user's buffer is. To be able to disable it in case recv/read don't
  have such semantics, the new calls are guarded
  with #define HAVE_VIO_READ_BUFF. Currently buffered reading is 
  switched on only for BSD sockets and named pipes, both on Windows
  and UNIXes.
2005-03-06 00:10:08 +03:00
unknown
2fc5d274e8 Fixing bug #8850 in such a way that when TRUNCATE is called within
stored  procedure,  it  is converted  to DELETE.


mysql-test/r/sp.result:
  A result for  the  test  case  for bug #8850
mysql-test/t/sp.test:
  A test  case  for the bug #8850
sql/sql_delete.cc:
  A fix for bug  #8850, plus adding a missing call  to mysql_init_select(),
  which  caused mem_root corruption.
sql/sql_parse.cc:
  A fix for the bug #8850
BitKeeper/etc/ignore:
  Added acinclude.m4 to the ignore list
2005-03-05 21:44:15 +02:00
unknown
18f16edff7 sql_udf.cc:
Comment changes: use standard style; fix grammar.


sql/sql_udf.cc:
  Comment changes: use standard style; fix grammar.
2005-03-05 12:42:05 -06:00
unknown
e75e10ddab func_group.test, func_str.result, func_group.result:
after merge fixes


mysql-test/r/func_group.result:
  after merge fixes
mysql-test/r/func_str.result:
  after merge fixes
mysql-test/t/func_group.test:
  after merge fixes
2005-03-05 20:44:22 +04:00
unknown
a12b0b280b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/bar/mysql-5.0
2005-03-05 19:58:49 +04:00
unknown
e7eac0274b Merge
BitKeeper/etc/logging_ok:
  auto-union
innobase/trx/trx0trx.c:
  Auto merged
mysql-test/r/ctype_collate.result:
  Auto merged
mysql-test/r/func_system.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
innobase/ut/ut0mem.c:
  e
  merge from 4.1
mysql-test/r/func_group.result:
  merge from 4.1
mysql-test/r/func_str.result:
  merge from 4.1
mysql-test/t/func_group.test:
  merge from 4.1
2005-03-05 18:20:35 +04:00
unknown
527403541d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-sp


sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-05 16:33:36 +03:00