ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/ha_ndbcluster.cc:
Go with the new solution
include/my_base.h:
Added new bit to table create options
Removed old error code HA_ERR_OLD_METADAT and reused it for HA_ERR_NO_SUCH_TABLE.
mysql-test/r/ndb_autodiscover.result:
Updated test cases
mysql-test/t/ndb_autodiscover.test:
Updated test cases
mysql-test/t/ndb_autodiscover2.test:
Updated test cases
sql/discover.cc:
Moved function create_table_from_handler to handler.cc
sql/ha_ndbcluster.cc:
Improved discover functionality
Added .ndb file
Changed error code mappings for a table that does not exist in engine
Check for ndb object in THD
Updated ndbcluster_discover, ndbcluster_list_tables and ndbcluster_can_discover
sql/ha_ndbcluster.h:
Improved discover
sql/handler.cc:
Added new error message mapping.
Moved function ha_create_table_from_engine to handler level
Added new functions ha_can_discover, ha_list_tables and ha_table_exists
sql/handler.h:
Added new error message mapping.
Moved function ha_create_table_from_engine to handler level
Added new functions ha_can_discover, ha_list_tables and ha_table_exists
sql/mysql_priv.h:
Removed create_table_from_handler, moved to handler.h
sql/sql_base.cc:
Renamed function create_table_from_handler
sql/sql_show.cc:
Added new function mysql_discover_files and mysql_list_files.
Modified mysql_find_files to discover new and delete "old" files/tables.
sql/sql_table.cc:
Renamed create_table_from_handler
Call ha_create_table_from_engine, in order to discover the the frm file before it can be dropped.
sql/table.cc:
Added mapping of the error code HA_ERR_NO_SUCH_TABLE
Added code to adjust the field_length of user variables
in dependence on the field type.
Aded new constants for numeric field widths.
include/mysql_com.h:
BUG#4788 - show create table provides incorrect statement.
Introduced definitions for default field width of numeric types.
So common values can be used at different places in the code.
mysql-test/r/variables.result:
BUG#4788 - show create table provides incorrect statement.
New test results.
mysql-test/t/variables.test:
BUG#4788 - show create table provides incorrect statement.
Added a test for the bug.
sql/item_func.cc:
BUG#4788 - show create table provides incorrect statement.
Added code to adjust the field_length of user variables
in dependence on the field type.
sql/sql_parse.cc:
BUG#4788 - show create table provides incorrect statement.
Changed numeric literals to the new constants.
mysql-test/r/query_cache.result:
test of QC with different variables
mysql-test/t/query_cache.test:
test of QC with different variables
sql/mysql_priv.h:
new information for query key calculation
sql/sql_cache.cc:
new information for query key calculation
sql/sql_cache.h:
removed unused definitions
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_table.cc:
Auto merged
Note, there is no need to propagate this change into 4.1.
mysql-test/r/ctype_latin1_de.result:
Bug #5447 Select does not find records
mysql-test/t/ctype_latin1_de.test:
Bug #5447 Select does not find records
strings/ctype-latin1_de.c:
Bug #5447 Select does not find records
Don't evaluate the value of GROUP_CONCAT several times for the same 'group', reuse the value instead.
mysql-test/r/group_by.result:
Testcase for bug#5400
mysql-test/t/group_by.test:
Testcase for bug#5400
mysql-test/r/multi_update.result:
multi* unique updating table check
mysql-test/t/multi_update.test:
multi* unique updating table check
sql/sql_lex.cc:
new method to check table only in subqueries
sql/sql_lex.h:
new method to check table only in subqueries
sql/sql_parse.cc:
used new method to check table only in subqueries
sql/sql_update.cc:
check that table is unique added
Added test case for bug #5406.
opt_sum.cc:
Fixed bug #5406.
sql/opt_sum.cc:
Fixed bug #5406.
mysql-test/r/func_group.result:
Added test case for bug #5406.
mysql-test/t/func_group.test:
Added test case for bug #5406.
mysql-test/r/rpl_set_charset.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/rpl_set_charset.test:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/slave.cc:
Auto merged
BitKeeper/etc/ignore:
auto-union
client/mysqlcheck.c:
Auto merged
myisammrg/myrg_open.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/sql_analyse.cc:
Auto merged
+ fix for support of multiple mgmt servers
mysql-test/r/ndb_alter_table.result:
added test case for bug #5431
mysql-test/t/ndb_alter_table.test:
added test case for bug #5431
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
fix to make multiple mgmt srvrs work
sql/ha_ndbcluster.cc:
fixed and added test case for bug#5431
mysql-test/r/ndb_insert.result:
Add tests for duplicate keys in combination with start/end_bulk_insert
mysql-test/t/ndb_insert.test:
Add tests for duplicate keys in combination with start/end_bulk_insert
sql/ha_ndbcluster.cc:
Set my_errno if error occurs in end_bulk_insert
As I cannot be 100% sure that there won't be issues with some of our exotic platforms
(who knows if the charset of <obscure old OS> will play fair?), I'll send an email to the build guys.
Well, this holds if bk does not crash on binary chars of this cset.
-i depricated on ndbd
fixed bug in shutdown command in ndb_mgm
ndb/src/mgmsrv/main.cpp:
added config.ini as default configuration file
-d default on ndb_mgmd and ndbd
-i depricated on ndbd
fixed bug in shutdown command in ndb_mgm
