Commit graph

24000 commits

Author SHA1 Message Date
unknown
f56dd2a0fa Add my_str_malloc and _free function pointers to strings library
which will by default exit(1) if malloc() fails, but can be set
to do something else by the calling program does, which mysqld
does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks
allocation in conf_to_src utility program. (Bug #7003)


strings/conf_to_src.c:
  if malloc() fails, just abort
VC++Files/client/mysqlclient.dsp:
  Add str_alloc.c
VC++Files/client/mysqlclient_ia64.dsp:
  Add str_alloc.c
VC++Files/libmysql/libmysql.dsp:
  Add str_alloc.c
VC++Files/libmysql/libmysql_ia64.dsp:
  Add str_alloc.c
VC++Files/libmysqld/libmysqld.dsp:
  Add str_alloc.c
VC++Files/libmysqld/libmysqld_ia64.dsp:
  Add str_alloc.c
VC++Files/strings/backup/strings.dsp:
  Add str_alloc.c
VC++Files/strings/noMASM/strings.dsp:
  Add str_alloc.c
VC++Files/strings/strings.dsp:
  Add str_alloc.c
VC++Files/strings/strings_ia64.dsp:
  Add str_alloc.c
include/m_string.h:
  Add my_str_malloc/free function pointers.
libmysql/Makefile.shared:
  Add str_alloc.lo
sql/mysqld.cc:
  Reassign my_str_malloc/free pointers so they use my_malloc/free
strings/Makefile.am:
  Add str_alloc.c
strings/ctype-tis620.c:
  Use my_str_malloc/free
2005-06-24 13:41:33 -07:00
unknown
d34e2ccb3e Merge mysql.com:/home/svoj/devel/mysql/mysql-5.0.8-build
into mysql.com:/home/svoj/devel/mysql/mysql-5.0.9
2005-06-23 23:22:31 +05:00
unknown
e5bd4ee8a8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-sp_instr
2005-06-23 22:22:30 +04:00
unknown
85a7014de6 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-23 20:22:29 +02:00
unknown
287af948f1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-23 19:41:42 +02:00
unknown
0021ec52c6 Merge
mysql-test/r/case.result:
  SCCS merged
mysql-test/t/case.test:
  SCCS merged
sql/item_cmpfunc.cc:
  SCCS merged
2005-06-23 19:05:36 +02:00
unknown
74307f39eb WL#2286 - Compile MySQL w/YASSL support
Fix for compilation failure with Forte Developer C++.


configure.in:
  Export ARFLAGS, so innobase could pick it up.
innobase/configure.in:
  Use ARFLAGS exported by parent configure script.
2005-06-23 21:29:44 +05:00
unknown
706d3ef8a5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-sp_instr
2005-06-23 20:23:23 +04:00
unknown
91180cb8ab - implement inheritance of sp_instr: public Query_arena.
We need every instruction to have its own arena, because we want to
  track instruction's state (INITIALIZED_FOR_SP -> EXECUTED). Because of 
  `if' statements and other conditional instructions used in stored 
  procedures, not every instruction of a stored procedure gets executed 
  during the first (or even subsequent) execution of the procedure. 
  So it's better if we track the execution state of every instruction 
  independently.
  All instructions of a given procedure now also share sp_head's 
  mem_root, but keep their own free_list.
  This simplifies juggling with free Item lists in sp_head::execute.
- free_items() moved to be a member of Query_arena. 
- logic of 'backup_arena' debug member of Query_arena has been
  changed to support
  multi-backups. Until now, TRUE 'backup_arena' meant that there is
  exactly one active backup of the THD arena. Now it means simply that
  the arena is used for backup, so that we can't accidentally overwrite an 
  existing backup. This allows doing multiple backups, e.g. in
  sp_head::execute and Cursor::fetch, when THD arena is already backed up
  but we want to set yet another arena (usually the 'permanent' arena,
  to save permanent transformations/optimizations of a parsed tree).


sql/sp_head.cc:
  - use Query_arena support in sp_head::execute() as now sp_instr inherites
    from it.
sql/sp_head.h:
  - inherite sp_instr from Query_arena
sql/sql_class.cc:
  - changed the principle of Query_arena::backup_arena; free_items is now
    a member of Query_arena.
sql/sql_class.h:
  - changed the principle of Query_arena::backup_arena; free_items is now
    a member of Query_arena.
sql/sql_prepare.cc:
  free_items() is now a member of Query_arena.
sql/sql_select.cc:
  free_items() now automatically sets free_list to zero.
2005-06-23 20:22:08 +04:00
unknown
ea89196e78 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-23 17:46:00 +02:00
unknown
759715eb92 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/mysql-test-run.pl:
  Auto merged
2005-06-23 17:41:42 +02:00
unknown
744f6a1a99 mysql-test-run.pl:
Might need a restart after test with special TZ
  Removed unused argument to run_mysqltest()


mysql-test/mysql-test-run.pl:
  Might need a restart after test with special TZ
  Removed unused argument to run_mysqltest()
2005-06-23 17:38:40 +02:00
unknown
5ae3967c87 Merge mysql.com:/home/svoj/devel/mysql/mysql-5.0.8-build
into mysql.com:/home/svoj/devel/mysql/mysql-5.0.9
2005-06-23 17:52:28 +05:00
unknown
1975702d0a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-23 04:12:53 -07:00
unknown
dfaf7a0184 opt_range.cc:
Identation correction.


sql/opt_range.cc:
  Identation correction.
2005-06-23 04:10:43 -07:00
unknown
94990cca59 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-5.0-build
2005-06-23 13:10:42 +02:00
unknown
dadda87f54 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


sql/opt_range.cc:
  Auto merged
2005-06-23 04:10:42 -07:00
unknown
a91620aeff Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-back-vac-look


sql/opt_range.cc:
  Auto merged
2005-06-23 11:10:41 +00:00
unknown
089d20959e WL#2286 - Compile MySQL w/YASSL support
Fix for "multiple definition of __cxa_pure_virtual" link failure
when compiling with icc.


extra/yassl/taocrypt/include/runtime.hpp:
  Do not define __cxa_pure_virtual for ICC.
  Fixes "multiple definition of __cxa_pure_virtual" link failure on production.
2005-06-23 16:04:10 +05:00
unknown
ca01b8918e Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0.8-clone
2005-06-23 11:41:01 +02:00
unknown
a0fedf78e6 - manual merge of the new node names 2005-06-23 11:34:58 +02:00
unknown
0beb0abf5a - fixed text file generation - the node names in the info page had changed
BitKeeper/deleted/.del-generate-flag-images~f77476753fff8186:
  Delete: Docs/Support/generate-flag-images
Docs/Makefile.am:
  - fixed node names for the new info file
Docs/Support/generate-text-files.pl:
  - stop printing if the index was reached
2005-06-23 11:30:40 +02:00
unknown
c4a8325da2 opt_range.cc:
Fixed buf #11487.
  Added a call of  QUICK_RANGE_SELECT::init to the
  QUICK_RANGE_SELECT::reset method. Without it the second
  evaluation of a subquery employing the range access failed.
subselect.result, subselect.test:
  Added a test case for bug #11487.


mysql-test/t/subselect.test:
  Added a test case for bug #11487.
mysql-test/r/subselect.result:
  Added a test case for bug #11487.
sql/opt_range.cc:
  Fixed buf #11487.
  Added a call of  QUICK_RANGE_SELECT::init to the
  QUICK_RANGE_SELECT::reset method. Without it the second
  evaluation of a subquery employing the range access failed.
2005-06-23 02:08:30 -07:00
unknown
9dfb7aab15 Merge mdk10.(none):/home/reggie/bk/bug9148
into mdk10.(none):/home/reggie/bk/mysql-5.0-base


mysys/my_access.c:
  Auto merged
2005-06-22 18:51:48 -05:00
unknown
371eeef011 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-merge
2005-06-23 03:51:47 +04:00
unknown
557184734f insert_update.result, insert_update.test, sql_base.cc:
Fix for bugfix #9728 merge


sql/sql_base.cc:
  Fix for bugfix #9728 merge
mysql-test/t/insert_update.test:
  Fix for bugfix #9728 merge
mysql-test/r/insert_update.result:
  Fix for bugfix #9728 merge
2005-06-23 03:51:10 +04:00
unknown
f3a3e05249 Bug #9728 fix merge
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_base.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
sql/sql_yacc.yy:
  Manual merge
2005-06-23 01:02:43 +04:00
unknown
2c14bd9a64 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into radha.local:/Volumes/disk2s1/mysql-5.0
2005-06-22 21:23:33 +02:00
unknown
60d6b87775 Remove THD::stmt_backup
sql/sql_class.cc:
  Statement constructor for the case when it's used for backup only
  was removed.
sql/sql_class.h:
  Remove THD::stmt_backup and simplify Statement constructors.
sql/sql_prepare.cc:
  Use an object on stack instead of THD::stmt_backup
sql/sql_select.cc:
  Use an object on stack instead of THD::stmt_backup
2005-06-22 23:12:25 +04:00
unknown
ff972e3e5d Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/bug9148
2005-06-22 13:59:32 -05:00
unknown
285e348c1f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/mysql-4.1-bug-8147
2005-06-22 22:59:31 +04:00
unknown
256c99fdb2 item.h:
Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
  Have to return false to set flag for whole expression.


sql/item.h:
  Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
  Have to return false to set flag for whole expression.
2005-06-22 22:58:44 +04:00
unknown
c09ca7d856 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into radha.local:/Volumes/disk2s1/mysql-5.0
2005-06-22 19:40:46 +02:00
unknown
f837c0add5 Bug# 9926, This is the same as changeset 1.1934, which was approved by Monty
sql/ha_federated.cc:
  Added auto-reconnect to allow foreign server restarts.
2005-06-22 19:29:34 +02:00
unknown
7eaa6dc1bb mtr_cases.pl:
Add a slave when running the federated test case


mysql-test/lib/mtr_cases.pl:
  Add a slave when running the federated test case
2005-06-22 19:07:34 +02:00
unknown
bbc0211304 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2005-06-22 13:07:33 -04:00
unknown
fbff02d128 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2005-06-22 13:07:32 -04:00
unknown
2520c2c6ea mysql-test-run.pl:
Bug#11481, set charset directory to mysqlbinlog


mysql-test/mysql-test-run.pl:
  Bug#11481, set charset directory to mysqlbinlog
2005-06-22 19:07:31 +02:00
unknown
e89d8219d0 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge2
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  SCCS merged
2005-06-22 13:07:31 -04:00
unknown
d9c2a339c4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2005-06-22 19:07:30 +02:00
unknown
7ab35a1b53 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-06-22 13:07:30 -04:00
unknown
309a7e679f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-22 19:07:29 +02:00
unknown
43498b16de Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0


sql/sql_parse.cc:
  Manual merge
2005-06-22 13:07:29 -04:00
unknown
d12119689f Fix for bug #10886 merge
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
2005-06-22 21:07:28 +04:00
unknown
a311ecde8e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-22 17:34:15 +02:00
unknown
bf851ae2a0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/mnt/archive/svoj/mysql/mysql-5.0
2005-06-22 17:17:40 +05:00
unknown
d608a83a4e Better AR guessing.
configure.in:
  Move AR guessing to misc.m4.
2005-06-22 16:29:21 +05:00
unknown
73ea278f6a Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-06-22 13:40:31 +03:00
unknown
e5245b34d1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-10736-new


sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-06-22 14:40:30 +04:00
unknown
311e6e06f8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-06-22 12:38:38 +02:00