into mysql.com:/home/pem/work/mysql-5.0
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
Fixed valgrind complaints. This fixes the memory leak problems for
procedured, and partially for functions. There's still a leak involving
results from functions that turned out to be too involved, so it will be
fixed separately.
mysql-test/r/sp.result:
Fixed some minor mistake (spotted while debugging).
mysql-test/t/sp.test:
Fixed some minor mistake (spotted while debugging).
sql/item_func.cc:
Moved Item_func_sp::cleanup() from item_func.h to ease debugging,
and made a debug output come out right.
sql/item_func.h:
Moved Item_func_sp::cleanup() to item_func.cc to ease debugging.
sql/sp_head.cc:
Fixed valgrind problems with the previous memory leak fix (unit cleanup and
putting result field in a differen mem_root), and removed prealloc flag from
init_alloc_root() calls.
sql/sp_rcontext.cc:
New mem_root pointer used for return fields from functions.
sql/sp_rcontext.h:
New mem_root pointer used for return fields from functions.
innobase/fil/fil0fil.c:
Move the declaration of fil_node_t to os0file.h.
Remove type casting from address-of operation
(which would break strict aliasing rules)
innobase/include/os0file.h:
Declare fil_node_t as an opaque structure.
Replace void* message1 with fil_node_t* message1.
innobase/os/os0file.c:
Replace void* message1 with fil_node_t* message1.
Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
innobase/os/os0file.c:
Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
innobase/os/os0sync.c:
Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
innobase/include/os0file.h:
Remove unused function os_aio_all_slots_free() from non-debug builds.
innobase/os/os0file.c:
Remove unused function os_aio_all_slots_free() from non-debug builds.
Add static qualifiers to module-global variables.
innobase/include/ut0dbg.h:
Write help macros to use in ut_a() and ut_error.
Moved some ut_a() and ut_error code to non-inlined functions.
Fixed ut_error on NetWare.
Reintroduced ut_dbg_zero on non-GCC platforms.
innobase/ut/ut0dbg.c:
Reintroduced ut_dbg_zero on non-GCC platforms.
Removed ut_dbg_null_ptr on NetWare.
Add helpers ut_dbg_assertion_failed() and ut_dbg_stop_thread().
script fixes for solaris
ndb/src/cw/cpcd/main.cpp:
fix usage of load_defaults, as it does have a short option
ndb/test/run-test/make-config.sh:
fix script wrt solaris
ndb/test/run-test/ndb-autotest.sh:
fix script wrt solaris
key now gets changed along with the size of the field as long
as the original key had the same length as the length of the field
(or is unspecified originally, as in the test).
mysql-test/r/heap.result:
Update results
mysql-test/r/type_varchar.result:
Update results
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysys/hash.c:
Auto merged
sql/ha_heap.h:
Auto merged
configure.in:
Resolve conflicts from 4.1
mysql-test/r/heap.result:
Update results
mysql-test/t/heap.test:
Merge from 4.1
- Removed unneccessary variables.
- Made a function of that part of code, which actually changes
the line under modifications.
- Fixed memory overrun problem with my_malloc. Too little space
was reserved.
- Fixed problem in case, when new option was added at the end
of the section. Before, it was added as the last line of the
section, even if it left empty lines between.
- Fixed so that the configuration file is not saved unneccessarily,
if no modifications are done. (file timestamp remains)
- This should fix (at least partially) problems described in
Bug#10806
- show_msg.inc - displays a message followed by a line of '-' at the length of the messgae
- show_msg80.inc - displays a message followed by a line of '-' with a fixed length of 80
mysql-test/r/mysqltest.result:
Updated result file
mysql-test/t/mysqltest.test:
Added test cases to test the show_msg.inc and show_msg80.inc auxiliary files
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Added a test case for bug #10084.
sql_yacc.yy:
Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
added.
sql/sql_yacc.yy:
Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
added.
mysql-test/r/select.result:
Added a test case for bug #10084.
mysql-test/t/select.test:
Added a test case for bug #10084.
