value into a char field": the patch submitted for the bug a while
ago has never been reviewed or approved to push into 4.0. Decimal
support in 5.0 resolves the issue.
Adding the test case and closing the bug report.
mysql-test/r/type_decimal.result:
Bug#5673: test results fixed.
mysql-test/t/type_decimal.test:
A test case for Bug#5673 "Rounding problem in 4.0.21 inserting decimal
value into a char field"
- Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.
mysql-test/r/archive.result:
Warning is not produced anymore
sql/examples/ha_archive.cc:
Change ha_archive::rename_table to avoid warning when trying to rename non existent file.
mysql-test/r/archive.result:
Changed order of tests so that the are before the unpredictable INSERT DELAYED
Warning is produced during the rename
mysql-test/t/archive.test:
Changed order of tests so that the are before the unpredictable INSERT DELAYED
Warning is produced during the rename
(Review on irc by monty)
mysql-test/r/sp-error.result:
Renamed a procedure and function to avoid confusion
mysql-test/t/sp-error.test:
Renamed a procedure and function to avoid confusion
sql/item_func.cc:
Corrected (and better) way to set/reset the client cap. flag in Item_func_sp::execute()
sql/share/errmsg.txt:
Changed the ER_SP_BADSELECT error; more accurate, and includes the procedure name.
sql/sql_parse.cc:
Include the procedure name in the new error message.
mysql-test/r/func_math.result:
after merge fix:
the test should be added after we have new hf's pm code pushed.
mysql-test/t/func_math.test:
after merge fix:
the test should be added after we have new hf's pm code pushed.
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
BUILD/SETUP.sh:
Manual merge of conflicts
-DBIG_TABLES removed set by configure using --with-big-tables
configure.in:
manual merge
mysql-test/r/archive.result:
Manual merge
mysql-test/t/archive.test:
Manual merge
We simply have to disallow any kind of result set being sent back
from a function. Can't see any way to make that to work.
mysql-test/r/sp-error.result:
New test case for BUG#8408.
mysql-test/t/sp-error.test:
New test case for BUG#8408.
sql/item_func.cc:
Disable result sets from functions but temporarily turning CLIENT_MULTI_RESULTS off.
sql/share/errmsg.txt:
Added error message for statements not allowed in functions (detected during parsing).
sql/sql_yacc.yy:
Don't allow result sets in functions.
no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).
mysql-test/r/blackhole.result:
result update
mysql-test/t/blackhole.test:
checking that statements get into binlog even when they were affecting
no rows of the blackhold engine. So that this engine can serve as
a binlog propagator (A->B->C replication where B has only blackhole tables,
B receives binlog from A, applies it to blackhole tables, writes statements
to its binlog which it sends to C; both A and C have non-blackhole tables). B is just a proxy.
- Implemented ha_archive::rename_table
- Added testcases for rename
mysql-test/r/archive.result:
Addd testcase for rename of archive table
mysql-test/t/archive.test:
Addd testcase for rename of archive table
sql/examples/ha_archive.cc:
Implement special version of rename table that does not care it the .arn file is missing
sql/examples/ha_archive.h:
Implement special version of rename table that does not care it the .arn file is missing
BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"
mysql-test/r/create.result:
MEMORY, not HEAP
mysql-test/r/ps_1general.result:
order changed in SHOW STORAGE ENGINES
mysql-test/r/variables.result:
MEMORY, not HEAP
sql/handler.cc:
the array of storage engine names is searched in index order, so we must put the preferred name
before the alias so that the preferred name is printed by MySQL instead of the alias.
sql/log.cc:
TC_LOG::open(): don't try to open if the index (relevant only for binlog TC log)
could not be opened.
sql/set_var.cc:
--log-update is deprecated and replaced by --log-bin so don't show log_update in SHOW VARIABLES.
to insert view's subqueries into select_lex->slave(->next)* chain.
In case a join has several such views, don't add the same subqueries several times
(this forms a loop on the above chain which breaks many parts of the code)
mysql-test/r/view.result:
Testcase for BUG#8490
mysql-test/t/view.test:
Testcase for BUG#8490
mysql-test/r/sp.result:
New test case for BUG#9004.
Also updated some other results, since formerly "invisible" (but correct)
warnings now are visible.
mysql-test/t/sp.test:
New test case for BUG#9004.
sql/sql_error.cc:
Don't reset warnings while executing a stored routine.
sql/sql_parse.cc:
Don't reset warnings while executing a stored routine.
Bug partially fixed by 9775/9102 work on SP function return.
mysql-test/r/sp.result:
Bug#8861
Test for bug
mysql-test/t/sp.test:
Bug#8861
Test for bug
sql/protocol.cc:
Bug#8861
Requires change in assertion
mysql-test/t/ndb_alter_table.test:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_cache.test:
Auto merged
mysql-test/t/ndb_charset.test:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
mysql-test/t/ndb_types.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_select.cc:
Auto merged
* Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with
'index' scan.
mysql-test/r/range.result:
Update the test result after the changed cost
sql/opt_range.cc:
Fix for BUG#10037
* Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with
'index' scan.
* make QUICK_GROUP_MIN_MAX_SELECT handle the case where the source table is empty.
Fix bug and implement return type casting.
mysql-test/r/sp.result:
Bug#9775
Test for bug + feature
Fix previous tests
mysql-test/t/sp.test:
Bug#9775
Test for bug + feature
Fix previous tests
sql/item_func.cc:
Bug#9775
new method Item_func_sp::execute(Field **)
some optimizations.
sql/item_func.h:
Bug#9775
results for Item_func_sp pass through a Field of the return type.
new method Item_func_sp::execute(Field **)
sql/sp_head.cc:
Bug#9775
missing initialiation for type_lengths in sp_head::create_typelib()
by simply disallowing alter procedure/function in an SP (as for drop).
mysql-test/r/sp-error.result:
Added test case for BUG#7047.
mysql-test/t/sp-error.test:
Added test case for BUG#7047.
sql/share/errmsg.txt:
Modified error message for "update procedure/function" too.
sql/sql_yacc.yy:
Don't allow alter procedure/function in an SP.