mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/spatial.cc:
Auto merged
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
mtr_report.pl:
Parse error logs to create "warnings" file
mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test-run.pl, mtr_process.pl:
Back port of changes from 5.0
mysql-test/lib/mtr_process.pl:
Back port of changes from 5.0
mysql-test/mysql-test-run.pl:
Back port of changes from 5.0
mysql-test/lib/mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test/lib/mtr_report.pl:
Parse error logs to create "warnings" file
sql/spatial.cc:
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
into zim.tangent.org:/home/brian/raid/mysql-5.1-new
sql/ha_myisam.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
Give space for second and third slave port
mysql-test/mysql-test-run.pl:
Give space for second and third slave port
Define shell variables for all ports, and
list these at startup
mysql-test/mysql-test-run.sh:
Give space for second and third slave port
mysql-test/mysql-test-run.sh:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
mysql-test/lib/mtr_process.pl:
Fix race (on some platforms) when killing processes.
into mysql.com:/home/mydev/mysql-5.1-wl1563-msg
mysql-test/r/create_select_tmp.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/ndb_index_unique.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/sp_trans.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/type_varchar.result:
Auto merged
sql/handler.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/heap.result:
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
Manual merge
mysql-test/r/rpl_err_ignoredtable.result:
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
Manual merge
mysql-test/r/rpl_insert_id.result:
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
Manual merge
Display instance manager port
mysql-test-run.sh:
Give port space for more than one slave
mysql-test/mysql-test-run.sh:
Give port space for more than one slave
mysql-test/mysql-test-run.pl:
Display instance manager port
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Rearranged the port numbers to fit into the range
into mysql.com:/home/cps/mysql/devel/5.1-merge
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
server-tools/instance-manager/commands.cc:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
sql/ha_ndbcluster.h:
SCCS merged
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key
change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
mysql-test/r/ndb_basic.result:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key
mysql-test/t/ndb_basic.test:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key
sql/ha_ndbcluster.cc:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key
change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
sql/ha_ndbcluster.h:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key
change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
support-files/mysql.spec.sh:
Use "-i" on "make test-force";
this will prevent "make" from writing "***" which in turn was treated as a _build_ error
by the log evaluation tool, causing it not to list the failing tests.
Events were executed with all privileges possible on planet Earth :(
WL#1034
mysql-test/r/events.result:
update test results
mysql-test/t/events.test:
test for bug#17289 Events: missing privilege check for drop database
sql/event.h:
-add two new methods to event_timed to change and restore
the security context
sql/event_executor.cc:
- move code regarding privilieges checking to event_timed::execute()
- add a new function evex_print_warnings() which prints the notes/warnings/errors
to the console (easily capturable with logs-into-tables) so one can see what
has happened if there was an error of some sort!
sql/event_timed.cc:
- fix documentation
- add a new error code -99, EVENT was revoked from the user on the DB
- set_sec_ctx, execute, restore_sex_ctx
sql/sql_error.cc:
- make warning_level_names public to be used in event_executor.cc
- change from 2 arrays to a LEX_STRING array
This changeset is assumed to stay in 4.1.
client/mysql.cc:
BUG#16217 forced to introduce a separate mysql client command.
Feature is backported from 5.0, precisely
ChangeSet 1.2034 06/02/09 16:23:09 aelkin@mysql.com
(under second review at the moment)
mysql-test/r/mysqlbinlog.result:
changed in 5.0
mysql-test/t/mysqlbinlog.test:
backported from 5.0. The last part of the test to mimic bug#16217
sql/log_event.cc:
Inserting exclaiming comment command for mysql client made differently than in 5.0.
Parsing still is cheap enough not to think to modify server code instead.
Originally, done by Jani and pushed to the general 5.1 tree
as ChangeSet 2006/02/02 16:22:31+02:00 jani@ua141d10.elisa.omakaista.fi
now just copied to the 5.1.6 build clone.
configure.in:
To configure InnoDB for cross compilation.
include/config-netware.h:
NetWare specific change to fix the compilation errors caused by event.h
NetWare specific change required for WINE PATH and for new versions LibC(Jun 05)
and zlib(1.2.3)
netware/BUILD/compile-AUTOTOOLS:
Netware specific change reflecting the change in source code
directory structure.
netware/BUILD/compile-linux-tools:
Netware specific change to fix the location where gen_lex_hash
gets created. Fixed also directory structure reflecting changes.
netware/BUILD/compile-netware-END:
Netware specific change for creating mysqld_error.h
netware/BUILD/mwenv:
Netware specific change required for WINE PATH and for
new versions LibC(Jun 05) and zlib(1.2.3).
netware/BUILD/nwbootstrap:
NetWare Specific change to produce absoulte path for XDC file.
netware/Makefile.am:
Netware specific changes to fix to match new
directory structure.
netware/my_manage.h:
Netware specific change required for WINE PATH and for new versions
LibC(Jun 05) and zlib(1.2.3).
((I fail to understand the above comment for this change -
seems just to be a number alignment and a "#define NULL". Joerg))
netware/mysql_test_run.c:
Netware specific change, added --autoclose option for mysql_test_run.nlm.
sql/mysqld.cc:
Stacksize change for Netware.
Netware specific change to fix the compilation errors caused by event.h
sql/set_var.cc:
Minor indending related fix.
sql/sql_class.cc:
Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro.
storage/innobase/os/os0thread.c:
Netware specific change to increase the thread stack size.
storage/myisam/mi_locking.c:
Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
storage/innobase/include/univ.i:
Part of innodb-5.0-149/162 snapshots:
Avoid breaking --with-debug builds on QNX and other systems
whose compiler pretends to be GCC 2.
Outside __WIN__ define UNIV_INLINE as static inline.
