Commit graph

28415 commits

Author SHA1 Message Date
unknown
49bba181e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/my/mysql-5.1


sql/field.cc:
  Auto merged
2005-11-23 20:51:01 +02:00
unknown
1c313f0368 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-root


sql/sql_class.cc:
  Auto merged
2005-11-23 21:20:31 +03:00
unknown
0633a41c15 Always initialize THD::thread_stack: it's used in
check_stack_overrun().


sql/slave.cc:
  Move initialization of THD::thread_stack before THD::store_globals()
sql/sql_acl.cc:
  Initialize THD::thread_stack in artificial THDs used
  to load gratns subsystem.
sql/sql_class.cc:
  Add an assert that THD::thread_stack is assigned.
sql/sql_insert.cc:
  Add initialization of THD::thread_stack (delayed insert
  thread).
sql/sql_parse.cc:
  Move initialization of THD::thread_stack before
  THD::store_globals().
sql/sql_udf.cc:
  Add initialization for THD::thread_stack (an artificial
  THD used to initialize UDF subsystem).
sql/tztime.cc:
  Add initialization for THD::thread_stack (an artificial
  THD used to initialize timezones).
2005-11-23 21:18:10 +03:00
unknown
0b206536d5 Moved long running query to type_newdecimal-big.test
Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups


mysql-test/r/type_newdecimal.result:
  Moved long running query to type_newdecimal-big.test
  Removed warnings that depends on floating point comparisions
mysql-test/t/type_newdecimal.test:
  Moved long running query to type_newdecimal-big.test
  Removed warnings that depends on floating point comparisions
sql/field.cc:
  Indentation fixes
sql/my_decimal.cc:
  Fixed that valgrind doesn't give warnings when running with debug
strings/decimal.c:
  More DBUG printing
mysql-test/r/type_newdecimal-big.result:
  New BitKeeper file ``mysql-test/r/type_newdecimal-big.result''
mysql-test/t/type_newdecimal-big.test:
  New BitKeeper file ``mysql-test/t/type_newdecimal-big.test''
2005-11-23 20:16:06 +02:00
unknown
dee85cba32 Disabled a test temporarily. Informed NDB team. 2005-11-23 19:08:41 +02:00
unknown
9d08413735 Merge from 5.0 has fixed the disabled compress.test
mysql-test/t/disabled.def:
  undisable compress test case
2005-11-23 16:37:29 +01:00
unknown
33a2716a85 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
extra/Makefile.am:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/docs/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
libmysqld/Makefile.am:
  Merged from 5.0 to 5.1.
sql/ha_berkeley.cc:
  Merged from 5.0 to 5.1.
sql/lex.h:
  Merged from 5.0 to 5.1.
sql/set_var.cc:
  Merged from 5.0 to 5.1.
sql/share/errmsg.txt:
  Merged from 5.0 to 5.1.
sql/sql_lex.h:
  Merged from 5.0 to 5.1.
sql/sql_show.cc:
  Merged from 5.0 to 5.1.
sql/sql_yacc.yy:
  Merged from 5.0 to 5.1.
2005-11-23 14:57:00 +02:00
unknown
aa4da5f742 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-23 13:02:50 +01:00
unknown
817ee181c3 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2005-11-23 12:34:29 +01:00
unknown
f06cf61cf3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2005-11-23 12:34:28 +01:00
unknown
bd0584df26 corrected compile error
updated listen_event to handle _all_ events


storage/ndb/src/common/portlib/NdbThread.c:
  corrected compile error
storage/ndb/test/tools/listen.cpp:
  updated listen_event to handle _all_ events
2005-11-23 12:32:38 +01:00
unknown
f85a819256 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2005-11-23 11:53:21 +01:00
unknown
909877becf Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/pem/mysql-5.1-new
2005-11-23 11:53:20 +01:00
unknown
da82e8ff19 updated ndb listen_event to print more info, and to give immediate respose 2005-11-23 11:53:19 +01:00
unknown
056d7266c7 A name of macro is fixed. 2005-11-23 12:26:07 +02:00
unknown
494daf7981 Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1
sql/mysqld.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
2005-11-23 11:24:52 +01:00
unknown
e918851c84 Added myself to authors.h.
mysql-test/r/show_check.result:
  Updated authors result.
sql/authors.h:
  Added myself.
2005-11-23 11:07:08 +01:00
unknown
38961d022f added ndb testcase WritePartialIgnoreError
(currently causes nodefailure)


storage/ndb/test/ndbapi/testNdbApi.cpp:
  added ndb testcase WritePartialIgnoreError
storage/ndb/test/run-test/daily-basic-tests.txt:
  added ndb testcase WritePartialIgnoreError
2005-11-23 10:45:15 +01:00
unknown
f39f3b1bc0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2005-11-23 09:56:36 +01:00
unknown
12826df81b merged 2005-11-23 09:52:18 +01:00
unknown
4aea839bde postmerge fix 2005-11-23 02:49:44 +02:00
unknown
8acbdf7016 configure.in:
Changed version to 5.1.3


configure.in:
  Changed version to 5.1.3
sql/Makefile.am:
  Added authors.h
2005-11-23 01:09:13 +01:00
unknown
ffc506e910 merge 2005-11-23 01:29:25 +02:00
unknown
aa06123f83 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0


mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/sp.result:
  merge
sql/share/errmsg.txt:
  merge
2005-11-23 01:28:32 +02:00
unknown
164ce4c5cd Recursion support made for SP (BUG#10100).
client/mysqltest.c:
  An expected error messages hiding from the log if disable_result_log is in force.
mysql-test/r/sp-dynamic.result:
  The test expanded for case of allowed/disalowed recursion.
mysql-test/r/sp-error.result:
  Error messages changed.
  Test of bug11394() made with allowed recursion.
mysql-test/r/sp.result:
  Tests for recursion.
mysql-test/r/trigger.result:
  Check that triggers are not affected by this patch.
mysql-test/r/variables.result:
  Test of max_sp_recursion_depth variable.
mysql-test/t/sp-dynamic.test:
  The test expanded for case of allowed/disalowed recursion.
mysql-test/t/sp-error.test:
  Error messages changed.
  Test of bug11394() made with allowed recursion.
mysql-test/t/sp.test:
  Tests for recursion.
mysql-test/t/trigger.test:
  Check that triggers are not affected by this patch.
mysql-test/t/variables.test:
  Test of max_sp_recursion_depth variable.
sql/item_func.cc:
  sp_find_function() and sp_find_procedure() joined to sp_find_routine()
    function as it was mentioned in TODO.
sql/mysqld.cc:
  max_sp_recursion_depth variable added.
sql/set_var.cc:
  max_sp_recursion_depth variable added.
sql/share/errmsg.txt:
  An error message changed.
  An error message added.
sql/sp.cc:
  sp_find_function() and sp_find_procedure() joined to sp_find_routine()
    function as it was mentioned in TODO.
  Temory LEX is allocated on a stack, not on a heap.
  Recursion support added for stored procedures.
sql/sp.h:
  sp_find_function() and sp_find_procedure() joined to sp_find_routine()
    function as it was mentioned in TODO.
sql/sp_head.cc:
  Initialization of new sp_head fields to get correct list of instances
    contained one instance only.
  Stack requirement for SP instruction is increased.
  Stack free space is checked before mem root initialisation to avoid
    memory leak.
  Pointer to the free instance management added before and after
    SP execution.
sql/sp_head.h:
  New sp_head variables added to support inst of instances of SP
    for recursion and pointer on ths first free to use instance.
sql/sql_base.cc:
  open_table() consume a lot of stack space so we check free stack space before it.
sql/sql_class.h:
  max_sp_recursion_depth variable added.
sql/sql_parse.cc:
  sp_find_function() and sp_find_procedure() joined to sp_find_routine()
    function as it was mentioned in TODO.
2005-11-23 01:11:19 +02:00
unknown
a2c26aa710 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0


sql/item.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp.result:
  merge
mysql-test/r/trigger.result:
  merge
mysql-test/t/sp.test:
  merge
mysql-test/t/trigger.test:
  merge
sql/item.cc:
  merge
sql/sp_rcontext.h:
  merge
2005-11-23 00:58:13 +02:00
unknown
6574612df8 Fix for BUG#13549 "Server crash with nested stored procedures
if inner routine has more local variables than outer one, and
one of its last variables was used as argument to NOT operator".

THD::spcont was non-0 when we were parsing stored routine/trigger
definition during execution of another stored routine. This confused
methods of Item_splocal and forced them use wrong runtime context.
Fix ensures that we always have THD::spcont equal to zero during
routine/trigger body parsing. This also allows to avoid problems
with errors which occur during parsing and SQL exception handlers.


mysql-test/r/sp.result:
  Test suite for bug#13549.
mysql-test/r/trigger.result:
  Test suite for bug#13549.
mysql-test/t/sp.test:
  Test suite for bug#13549.
mysql-test/t/trigger.test:
  Test suite for bug#13549.
sql/item.cc:
  Protection against using wrong context by SP local variable.
sql/item.h:
  Protection against using wrong context by SP local variable.
sql/protocol.cc:
  An incorrect macro name fixed.
sql/protocol.h:
  An incorrect macro name fixed.
sql/sp.cc:
  Do not allow SP which we are parsing to use other SP
  context (BUG#13549).
sql/sp_head.cc:
  Protection against using wrong context by SP local variable.
sql/sp_rcontext.h:
  Protection against using wrong context by SP local variable.
sql/sql_cache.h:
  An incorrect macro name fixed.
sql/sql_class.cc:
  Protection against using wrong context by SP local variable.
sql/sql_class.h:
  Protection against using wrong context by SP local variable.
sql/sql_trigger.cc:
  Do not allow Trigger which we are parsing to use
  other SP context (BUG#13549).
sql/sql_yacc.yy:
  Protection against using wrong context by SP local variable.
2005-11-23 00:50:37 +02:00
unknown
3fc47df694 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/eric/fed-txn-mysql-5.1-new
2005-11-22 13:51:33 -08:00
unknown
3fc626a005 Added support of stress mode to mysql-test-run.pl
Corrected function declaration 


mysql-test/lib/mtr_misc.pl:
  Corrected function declaration
mysql-test/mysql-test-run.pl:
  Added support of stress mode
mysql-test/lib/mtr_stress.pl:
  Added support of stress mode
2005-11-22 23:46:54 +02:00
unknown
16213b21e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/share/errmsg.txt:
  Auto merged
2005-11-22 21:16:11 +01:00
unknown
3a84f6e258 German error messages 2005-11-22 21:10:38 +01:00
unknown
ae4494ba88 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/eric/fed-txn-mysql-5.1-new
2005-11-22 11:42:09 -08:00
unknown
3380fd1d77 Manual merge from 4.1 (bug#15145). 2005-11-22 20:30:45 +01:00
unknown
63cae6769a Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/merge-5.1 2005-11-22 20:25:31 +01:00
unknown
57e1c5aa9a Manual merge from 4.1, bug#15145. 2005-11-22 20:15:54 +01:00
unknown
6a6caf565d support-files/mysql.spec.sh
Fix a possible problem on RPM un-install. bug#15145


support-files/mysql.spec.sh:
  Extend the file existence check for "init.d/mysql" on un-install
  to also guard the call to "insserv"/"chkconfig".
  bug#15145, br#5369 / 5586, csc#7129
2005-11-22 19:58:58 +01:00
unknown
c9f8b7b41f fix error handling if thread creation fails in ndbd
make sure ndb threads are not started with too small stacksize (which results in default, much too big, stack size to be used)
  moved initialization of ndbd fs block first to ensure that it gets enough space for allocation of file system thread stacks
  changed event buffer reporting in ndb to occur not as often
  corrected the bank application
  corrected output from run-test make-config.sh


storage/ndb/src/common/portlib/NdbThread.c:
    fix error handling if thread creation fails in ndbd
    make sure ndb threads are not started with too small stacksize (which results in default, much too big, stack size to be used)
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  moved initialization of ndbd fs block first to ensure that it gets enough space for allocation of file system thread stacks
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
    fix error handling if thread creation fails in ndbd
storage/ndb/src/ndbapi/Ndb.cpp:
  changed event buffer reporting in ndb to occur not as often
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  changed event buffer reporting in ndb to occur not as often
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  changed event buffer reporting in ndb to occur not as often
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
  corrected the bank application
storage/ndb/test/run-test/make-config.sh:
  corrected output from run-test make-config.sh
2005-11-22 18:05:10 +01:00
unknown
0026b6f46e Set type and default correctly for local SP variables during parsing.
sql/sql_yacc.yy:
  Set type and default correctly for local SP variables.
2005-11-22 16:01:04 +01:00
unknown
899ca897c1 Post-merge fixes in sp_head.cc (print methods).
sql/sp_head.cc:
  Post-merge fixes.
  Use STRING_WITH_LEN in all print methods.
2005-11-22 14:25:44 +01:00
unknown
d213bf0487 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/show-sp-code/mysql-5.0


sql/sp_head.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sp_head.cc:
  Merge fixes (STRING_WITH_LEN in string append calls).
2005-11-22 13:24:53 +01:00
unknown
6553362b96 Some final cleanup of the sp_instr print methods.
sql/sp_head.cc:
  Use a #define constant for reserving string space for numbers in print methods.
  Added some comments.
2005-11-22 13:06:52 +01:00
unknown
929e6e05be Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump


sql/log_event.cc:
  Auto merged
2005-11-22 11:34:55 +01:00
unknown
0191f2b95d Added explicit casts, since on i686, the fprintf function does not cast my_off_t correctly.
Changed wrong printf to fprintf.


sql/log_event.cc:
  Added explicit casts, changed wrong printf to fprintf
2005-11-22 02:40:08 +01:00
unknown
a6e90ad942 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
2005-11-22 02:26:21 +01:00
unknown
553fb4447a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck


configure.in:
  Auto merged
2005-11-22 01:17:06 +01:00
unknown
36dd2cf625 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new


sql/lock.cc:
  Auto merged
2005-11-21 15:31:12 -08:00
unknown
533194971a BUG #14524
Post-review fixes to original changeset http://lists.mysql.com/internals/32422


BUILD/SETUP.sh:
  BUG #14524
  
  Added flags to no-ndb build script to include archive.
mysql-test/r/partition.result:
  BUG #14524 
  
  Post review mods to test results
mysql-test/t/partition.test:
  BUG #14524
  
  Post review mods to test
sql/ha_partition.cc:
  BUG# 14524
  
  Post review modifications to code - removed if, just pass m_no_locks
2005-11-21 15:21:04 -08:00
unknown
eff505778f Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0


sql/field.cc:
  Auto merged
2005-11-21 23:30:14 +01:00
unknown
faa0c00eba Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0


sql/ha_federated.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2005-11-21 21:15:48 +02:00
unknown
789340bc5f Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0


sql/sql_base.cc:
  Auto merged
2005-11-21 21:14:36 +02:00