BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/Makefile.am:
Auto merged
client/mysqlbinlog.cc:
Auto merged
configure.in:
Auto merged
include/my_time.h:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/fil0fil.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
tests/client_test.c:
Auto merged
fixed bug: "create view v7 as select * from information_schema.tables;" failed
mysql-test/r/information_schema.result:
changed field names, fields order according to WL description
mysql-test/t/information_schema.test:
changed field names, fields order according to WL description
sql/sql_show.cc:
changed field names, fields order according to WL description
sql/sql_view.cc:
fixed bug: "create view v7 as select * from information_schema.tables;" failed
tests/client_test.c:
changed field names, fields order according to WL description
fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
and simplified code a bit
ndb/src/kernel/vm/Configuration.cpp:
corrected some erroneous size calculations
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
and simplified code a bit
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.
mysql-test/r/func_time.result:
Manual merge
mysql-test/t/func_time.test:
Manual merge
sql/item_timefunc.cc:
Manual merge
properly" with main tree.
libmysql/libmysql.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
tests/client_test.c:
Manual merge.
strings/ctype-mb.c:
Incorrect response with partial utf8 index:
Fill the max string with max_sort_char up to res_length bytes.
strings/ctype-uca.c:
Incorrect response with partial utf8 index.
Typo fixes for UTF8 collations.
corrected mistake in previous patch
ndb/tools/Makefile.am:
change file name to avoid conflict
ndb/tools/restore/restore_main.cpp:
corrected mistake in previous patch
Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
innobase/fil/fil0fil.c:
Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
innobase/include/fil0fil.h:
Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
.c -> .cc
fix source dist problem for ndb
fix type check problem for mysqladmin
client/Makefile.am:
fix for mysqladmin link problem
.c -> .cc
client/mysqladmin.cc:
fix for mysqladmin link problem
.c -> .cc
configure.in:
fix for mysqladmin link problem
.c -> .cc
ndb/include/Makefile.am:
fix source dist problem for ndb
ndb/src/mgmclient/CommandInterpreter.cpp:
fix type check problem
ndb/src/mgmclient/ndb_mgmclient.hpp:
fix type check problem
ndb/src/mgmclient/ndb_mgmclient.h:
fix type check problem
