into zim.(none):/home/brian/mysql/fix-5.0
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
May changes were to simplify storage engine setup and support for legacy call to show storage engines.
mysql-test/r/ps_1general.result:
Fixed test results for new listing order
sql/examples/ha_tina.cc:
Removed dead code
sql/examples/ha_tina.h:
Removed dead code
sql/ha_archive.cc:
Capitalized sotrage engine name and moved disabled code.
sql/ha_berkeley.cc:
Moved deisabled code
sql/ha_federated.cc:
Removed disabled code
sql/ha_innodb.cc:
Removed disabled message
sql/ha_ndbcluster.cc:
Removed disabled message
sql/handler.cc:
Added in legacy support for sotrage engine listing (ala Serg's request). Removed handlertons variables and we now have simplified ha_init code.
sql/handler.h:
No longer need handlertons array.
After SHOW TABLE STATUS last_insert_id wasn't cleaned, and next select
erroneously rewrites WHERE condition and returs a row;
5.0 isn't affected because of different SHOW TABLE STATUS handling.
last_insert_id cleanup added to mysqld_extend_show_tables().
sql/sql_show.cc:
Fix bug #13535 Incorrect result from SELECT statement after SHOW TABLE STATUS
Added last_insert_id cleanup after SHOW TABLE STATUS command.
mysql-test/t/select.test:
Test case for bug #13535 Incorrect result from SELECT statement after SHOW TABLE STATUS
mysql-test/r/select.result:
Test case for bug #13535 Incorrect result from SELECT statement after SHOW TABLE STATUS
that compares key images.
mysql-test/r/index_merge_innodb.result:
Testcase for BUG#13484
mysql-test/r/rowid_order_innodb.result:
Updated results for BUG#13484
mysql-test/t/index_merge_innodb.test:
Testcase for BUG#13484
The problem was then when a column reference was resolved to a view column, the new Item
created for this column contained the name of the view, and not the view alias.
mysql-test/r/view.result:
Additional test for BUG#13410.
mysql-test/t/view.test:
Additional test for BUG#13410.
sql/item.cc:
Correctly cast 'cur_field' to Item_ident because if the original item is
an Item_field, the cur_field is either an Item_field or an Item_ref.
Thus we have to cast cur_field to a common super-class of both.
sql/item.h:
- real_item() may be called before Item_ref::ref is set
(i.e. the Item_ref object was resolved).
- To avoid a crash and to return some meaningful value
in such cases we return 'this'.
sql/sql_base.cc:
- 'item' may be an Item_ref, so we test for the type of the actual
referenced item.
- Correctly cast 'cur_field' to Item_ident because if the original
item is an Item_field, the cur_field is either an Item_field or an
Item_ref. Thus we have to cast cur_field to a common super-class
of both.
sql/table.cc:
- When creating a new Item for a reference to a view column, use the view alias,
and not the real view name.
- Removed old code
BUG#13108
mysql-test/r/federated.result:
added test results for federated alter table
mysql-test/t/federated.test:
added test for federated alter table
sql/examples/ha_example.cc:
supports table re-creation
sql/examples/ha_tina.cc:
supports table re-creation
sql/ha_blackhole.cc:
supports table re-creation
sql/ha_federated.cc:
added flag for not supporting alter
sql/ha_heap.cc:
supports table recreation
sql/ha_myisam.cc:
supports table recreation
sql/ha_myisammrg.cc:
supports table re-creation
sql/handler.cc:
implemented flag check function
sql/handler.h:
added additional handlerton flags
created a function to test flags
replace ha_supports_generate macro with call to flag check
sql/sql_delete.cc:
replaced ha_supports_generate with handlerton flag check
sql/sql_table.cc:
added check for handlerton check for alter support
Add Instance Manager tests.
mysql-test/include/im_check_os.inc:
Currently Instance Manager tests are known to work only on UNIX platform.
This header file is included in each IM-test in order to skip the test
on Windows.
mysql-test/r/im_daemon_life_cycle.result:
Results file for Instance Manager daemon test.
mysql-test/r/im_life_cycle.result:
Results file for Instance Manager life cycle test.
mysql-test/r/im_options_set.result:
Results file for Instance Manager SET statement test.
mysql-test/r/im_options_unset.result:
Results file for Instance Manager UNSET statement test.
mysql-test/r/im_utils.result:
Results file for Instance Manager utils test.
mysql-test/t/im_daemon_life_cycle-im.opt:
Options file for Instance Manager daemon test.
mysql-test/t/im_daemon_life_cycle.imtest:
Instance Manager daemon test (mysqltestrun-part).
mysql-test/t/im_life_cycle.imtest:
Instance Manager life cycle test.
mysql-test/t/im_options_set.imtest:
Instance Manager SET statement test.
mysql-test/t/im_options_unset.imtest:
Instance Manager UNSET statement test.
mysql-test/t/im_utils.imtest:
Instance Manager utils test.
mysql-test/t/kill_n_check.sh:
The helper script. Its main idea is to kill some process and
check that the process will (or will not) be restarted.
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_base.cc:
Auto merged
"SELECT ... FOR UPDATE executed as consistent read inside LOCK TABLES"
Do not discard lock_type information as handler::start_stmt() may require knowledge.
(fixed by Antony)
into neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_db.cc:
Auto merged
Add support/test for using my.cnf [cluster_config]
mysql-test/r/ndb_config.result:
Add support for ndb_config to read my.cnf
mysql-test/t/ndb_config.test:
Add support for ndb_config to read my.cnf
ndb/src/mgmsrv/InitConfigFileParser.cpp:
merge
ndb/tools/ndb_config.cpp:
Add support for ndb_config to read my.cnf
mysql-test/std_data/ndb_config_mycnf1.cnf:
New BitKeeper file ``mysql-test/std_data/ndb_config_mycnf1.cnf''
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
mysql-test/r/ndb_config.result:
Auto merged
mysql-test/t/ndb_config.test:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.hpp:
Auto merged
ndb/tools/ndb_config.cpp:
Auto merged
add support for reading config.ini from ndb_config
(as alternative to contacting ndb_mgmd)
mysql-test/r/ndb_config.result:
Add support for reading config.ini from ndb_config
mysql-test/t/ndb_config.test:
Add support for reading config.ini from ndb_config
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Handle prinouts better
ndb/src/mgmsrv/InitConfigFileParser.hpp:
Handle prinouts better
ndb/tools/ndb_config.cpp:
Add support for reading config.ini from ndb_config
client/mysqlbinlog.cc:
tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog)
mysql-test/r/ctype_ucs_binlog.result:
update
mysql-test/r/mysqlbinlog.result:
update
mysql-test/r/mysqlbinlog2.result:
update
mysql-test/r/rpl_charset.result:
update
mysql-test/r/rpl_timezone.result:
update
mysql-test/r/user_var-binlog.result:
update
The problem was in that when finding the last table reference in a nested join tree,
the procedure doing the iteration over the right-most branches of a join tree
was testing for RIGHT JOINs the table reference that represents the join, and not
the second operand of the JOIN. Currently the information whether a join is LEFT/RIGHT
is stored not on the join object itself, but on one of its operands.
mysql-test/r/select.result:
Added test for BUG#13597
mysql-test/t/select.test:
Added test for BUG#13597
sql/table.cc:
- test whether a table reference is a right join by testing the
rigth join operand (first in the list of operands), and not
the table reference that represents the join itself.
- clearer comments
"t.key BETWEEN c1 AND c2" and c1 = c2 -> can access table t using "t.key = c1".
mysql-test/r/heap.result:
BUG#13455: updated test results
mysql-test/r/innodb.result:
BUG#13455: updated test results
mysql-test/r/myisam.result:
BUG#13455: updated test results
mysql-test/r/range.result:
Testcase for BUG#13455
mysql-test/t/range.test:
Testcase for BUG#13455
sql/sql_base.cc:
fix for bug #13545: Server crash caused by select query.
- compare table qualifier only with tables which are not nested joins.
- perform recursion accordingly.
- DBUG_ASSERT(table_list->table); added before the find_field_in_table() call.
into mysql.com:/home/mydev/mysql-5.0-5000
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/sql_mode.test:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/sql_mode.result:
SCCS merged
"CHARACTER SET", "COLLATE", and "DEFAULT" are always
printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
"AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only
if NO_FIELD_OPTIONS is not set.
mysql-test/r/sql_mode.result:
Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
test case
mysql-test/t/sql_mode.test:
Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
test case
