Added a test case with VIEW for bug #12885.
mysql-test/t/olap.test:
Added a test case with VIEW for bug #12885.
mysql-test/r/olap.result:
Added a test case with VIEW for bug #12885.
client/mysqldump.c:
BUG #12597
- Dump triggers after data dump of each table
- created dump_triggers_for_table function
- added space between "MODE" and "*/"
mysql-test/r/mysqldump.result:
Tests to test BUG #12597
mysql-test/t/mysqldump.test:
BUG #12597
- New tests to test bug #12597
mysql-test/r/connect.result:
Auto merged
mysql-test/t/connect.test:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
sql/sql_select.cc:
Auto merged
gzdopen() because the file itself was only opened for writing (and truncated),
and some libc implementations (like SCO) don't like to do a fdopen(..., "a") on
a fd that was not opened using O_APPEND.
sql/examples/ha_archive.cc:
Use "wb" instead of "ab" since we just opened this file for writing
Fixed bug #12885.
Forced inheritence of the maybe_null flag for the expressions
containing GROUP BY attributes in selects with ROLLUP.
olap.test, olap.result:
Added test case for bug #12885.
mysql-test/r/olap.result:
Added test case for bug #12885.
mysql-test/t/olap.test:
Added test case for bug #12885.
sql/sql_select.cc:
Fixed bug #12885.
Forced inheritence of the maybe_null flag for the expressions
containing GROUP BY attributes in selects with ROLLUP.
are thus dangling later)
mysql-test/r/ps.result:
test for bug #12651
(data allocated on thd's arena but not on permanent arena)
mysql-test/t/ps.test:
test for bug #12651
(data allocated on thd's arena but not on permanent arena)
sql/sql_base.cc:
if there is tree transformation then backup the current arena
and use permanent one (for PS) otherwise the data will be deallocated
after the prepare process is finished.
this bug was introduced with the recent natural join patch
client/mysqldump.c:
BUG #9056 Fixes per serg
* if opt_lock for locking mysql.proc
* calling mysql_query_with_error_report where needed
* print functions same way as procs, file bug about commented functions
mysql-test/r/mysqldump.result:
BUG #9056 New results
mysql-test/t/mysqldump.test:
BUG #9056 Removed redirect, simplified, dump in results, per Serg
(recommit with the right Bug#)
mysql-test/r/sp.result:
result file modified to reflect new test
mysql-test/t/sp.test:
added test for the bug
sql/item.cc:
protect Item_splocal value from modification by CONCAT() et al
sql/item.h:
added a buffer to save Item_splocal string pointer
sql/sp_head.cc:
don't employ reuse mechanism to save var into itself
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Fixed a bug and an issue with the added debug code for finding
redo log write mistakes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fixed a bug and an issue with the added debug code for finding
redo log write mistakes
Removed a number of unnecessary break's
ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
Added printouts of new debug info in log page header
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
include/my_global.h:
Auto merged
configure.in:
Manual merge from 4.0.26 (bypassing intermediate trees, due to unmerged changes):
Use "local" (= existing 5.1) version.
extra/yassl/taocrypt/include/runtime.hpp:
Check for both __ICC and __INTEL_COMPILER
extra/yassl/taocrypt/include/types.hpp:
Check for both __ICC and __INTEL_COMPILER
into 127.(none):/home/osku/mysql/5.1/clean
sql/ha_innodb.cc:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/include/dict0dict.h:
Auto merged
storage/innobase/include/row0mysql.h:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
mysql-test/r/select.result:
Test for BUG#12977.
mysql-test/t/select.test:
Test for BUG#12977.
sql/sql_base.cc:
- Compare table qualifier of qualified fields only with tables that
are not natural joins or their operands.
- For qualified fields perform recursive search in all operands of
natural joins that are nested joins.
- Symmetrically detect ambiguous columns for both operands of
NATURAL/USING joins.
