into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/view.result:
Manual merge.
mysql-test/t/view.test:
Manual merge.
Copy udf examples and raid.h
Create target "include" directory before copying files to it
CMakeLists.txt:
Only compile in bdb if configured
configure.in:
Raised version number to 5.0.27
scripts/make_win_bin_dist:
Copy udf examples and raid.h
Create target "include" directory before copying files to it
CMakeLists.txt:
Only compile in bdb if configured
configure.in:
Raised version number to 5.0.27
Revert 1 June change enough to restore ABI compatibility with previous
versions.
include/mysql.h:
Revert patch that breaks ABI compatibility
libmysqld/lib_sql.cc:
Remove useless assignment.
Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION
sql/ha_innodb.cc:
Apply InnoDB snapshot ss923
Revision r922:
ha_innobase::store_lock(): When downgrading table locks, do not
check thd->in_lock_tables but test if
thd->lex->sql_command == SQLCOM_LOCK_TABLES
instead. Otherwise, stored functions will use table locks. (Bug #18077)
server-tools/instance-manager/guardian.cc:
1. Removed unused stop_instances_arg from request_shutdown() and
stop_instances() methods.
2. Changed log-output statements so that instance name is passed
correctly (char *, not LEX_STRING)
server-tools/instance-manager/guardian.h:
Removed unused stop_instances_arg from request_shutdown() and
stop_instances() methods.
server-tools/instance-manager/instance.cc:
Removed unused stop_instances_arg from request_shutdown() and
stop_instances() methods.
server-tools/instance-manager/listener.cc:
Be more verbose in log.
server-tools/instance-manager/manager.cc:
Removed unused stop_instances argument.
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/include/kernel/ndb_limits.h:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
SCCS merged
Fix some too small buffers in backup
ndb/include/kernel/ndb_limits.h:
backport for 5.1
add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE
ndb/src/kernel/blocks/backup/Backup.cpp:
Make sure to set maxInsert so that we actually can handle NO_OF_META_PAGES
ndb/src/kernel/blocks/backup/Backup.hpp:
backport for 5.1
add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE
warnings in sql_trigger.cc and sql_view.cc".
According to the current version of C++ standard offsetof() macro
can't be used for non-POD types. So warnings were emitted when we
tried to use this macro for TABLE_LIST and Table_triggers_list
classes. Note that despite of these warnings it was probably safe
thing to do.
This fix tries to circumvent this limitation by implementing
custom version of offsetof() macro to be used with these
classes. This hack should go away once we will refactor
File_parser class.
Alternative approaches such as disabling this warning for
sql_trigger.cc/sql_view.cc or for the whole server were
considered less explicit. Also I was unable to find a way
to disable particular warning for particular _part_ of
file in GCC.
sql/parse_file.h:
Introduced auxillary macro which can be used instead of offsetof()
to get offsets of members in class for non-POD types without getting
warnings (assuming that all instances of the class has same offsets
for same members).
sql/sql_trigger.cc:
Use my_offsetof() macro instead of standard offsetof() macro with
Table_triggers_list class in order to avoid warnings (offsetof()
cannot be used for non-POD types according to the standard).
sql/sql_view.cc:
Use my_offsetof() macro instead of standard offsetof() macro with
TABLE_LIST class in order to avoid warnings (offsetof() cannot
be used for non-POD types according to the standard).
Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
- compilation on the Alpha platform was broken because the Alpha-specific code was not updated after replacing the SIGRETURN_FRAME_COUNT constant with a variable
Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
We set 'host_or_ip' to "" in the Security_context::skip_grants().
sql/sql_show.cc:
Fix for bug #22723: Host field blank when server started with skip-grant
- as we set 'host_or_ip' to "" if skip-grant, use 'host' instead.
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
mysql-test/r/myisam.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
This patch reverts a change introduced by Bug 6951, which incorrectly
set thd->abort_on_warning for stored procedures.
As per internal discussions about the SQL_MODE=TRADITIONAL,
the correct behavior is to *not* abort on warnings even inside an INSERT/UPDATE
trigger.
Tests for Stored Procedures, Stored Functions, Triggers involving SQL_MODE
have been included or revised, to reflect the intended behavior.
(reposting approved patch, to work around source control issues, no review needed)
mysql-test/include/sp-vars.inc:
Tests for SQL_MODE='TRADITIONAL'
mysql-test/r/sp-vars.result:
Tests for SQL_MODE='TRADITIONAL'
mysql-test/r/sp.result:
Tests for SQL_MODE='TRADITIONAL'
mysql-test/r/trigger.result:
Tests for SQL_MODE='TRADITIONAL'
mysql-test/t/sp-vars.test:
Tests for SQL_MODE='TRADITIONAL'
mysql-test/t/sp.test:
Tests for SQL_MODE='TRADITIONAL'
mysql-test/t/trigger.test:
Tests for SQL_MODE='TRADITIONAL'
sql/sp_head.cc:
For SQL_MODE='TRADITIONAL',
thd->abort_on_warning should be set only when assigning a *column*
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_misc.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
mysql-test/lib/mtr_misc.pl:
Add function mtr_exe_maybe_exists
mysql-test/mysql-test-run.pl:
Adapt to running from binary dist
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
myisam/sort.c:
Auto merged
mysql-test/r/repair.result:
Auto merged
mysql-test/t/repair.test:
Auto merged
sql/sql_base.cc:
Use local.
