into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
innobase/srv/srv0srv.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
tables that support multiple index types. (Bug #7235)
sql/sql_show.cc:
Always output 'TYPE <indextype>' for indexes on tables with multiple index types
mysql-test/r/ctype_utf8.result:
Fix results for test
with a number of decimals specified. (Bug #7361)
mysql-test/t/type_float.test:
Add test for maximum values of float and double columns with number of decimals
mysql-test/r/type_float.result:
Add results for new test
mysql-test/r/type_float.result.es:
Add results for new test
sql/field.cc:
Use ::store(double nr) from ::store(longlong nr) so we get the same range checking
configure.in:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
manually merged
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ps_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ps_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_union_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_sjis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_ucs2.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_ujis.result:
Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_utf8.result:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_sjis.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_ucs2.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_ujis.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_utf8.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis2.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis3.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_ucs2.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_ujis.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_utf8.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_ucs2.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_ujis.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_utf8.dat:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ps_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ps_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_union_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_utf8.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_sjis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_ucs2.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_ujis.test:
Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_utf8.test:
Change mode to -rw-rw----
mysql-test/r/ndb_alter_table.result:
wl-1442 new varchar
mysql-test/r/ndb_bitfield.result:
wl-1442 new varchar
mysql-test/r/ndb_charset.result:
wl-1442 new varchar
mysql-test/t/ndb_charset.test:
wl-1442 new varchar
ndb/include/kernel/signaldata/DictTabInfo.hpp:
wl-1442 new varchar
ndb/include/ndb_constants.h:
wl-1442 new varchar
ndb/include/ndbapi/NdbDictionary.hpp:
wl-1442 new varchar
ndb/include/util/NdbSqlUtil.hpp:
wl-1442 new varchar
ndb/src/common/util/NdbSqlUtil.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionary.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbOperationDefine.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbOperationSearch.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbRecAttr.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbTransaction.cpp:
wl-1442 new varchar
ndb/test/ndbapi/testOIBasic.cpp:
wl-1442 new varchar
sql/ha_ndbcluster.cc:
wl-1442 new varchar
I have put the tests into a separate "suite", the first one actually.
Currently this can only be run by the Perl version of mysql-test-run
that is not quite finished. It should, or at least will, be able to
be run with the line
./mysql-test-run.pl --suite=jp
BitKeeper/etc/ignore:
auto-union
include/my_pthread.h:
Auto merged
innobase/os/os0file.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
merged manually
After merge fixes
libmysql/libmysql.c:
Fixed a bug in prepared statements error handling introduced by me on a recent patch
mysql-test/r/delayed.result:
Updated results
mysql-test/t/delayed.test:
Bigger timeout needed when using --ps-protocol (don't understand why yet)
Added output of not_flushed_dealyed_rows for easier debugging
sql/sql_base.cc:
USE tables_share fix for prepared statements
sql/sql_prepare.cc:
After merge fix
into mysql.com:/home/my/mysql-5.0
sql/item_func.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
include/myisam.h:
Added const before names
mysql-test/r/group_min_max.result:
Make results repeatable
mysql-test/t/group_min_max.test:
Make results repeatable
sql/field.cc:
Created Field::make_field() and made Field_num::make_field() to call this
Use TABLE_SHARE
Use sql_strmake() instead of sql_memdup() to simplify code
sql/field.h:
Changed table_name to be pointer to table_name. This allows us to change alias for all fields by just changing one pointer.
Use TABLE_SHARE
sql/field_conv.cc:
Use TABLE_SHARE
sql/filesort.cc:
Use TABLE_SHARE
sql/ha_berkeley.cc:
Use TABLE_SHARE
sql/ha_heap.cc:
Use TABLE_SHARE
sql/ha_innodb.cc:
Use TABLE_SHARE
sql/ha_myisam.cc:
Use TABLE_SHARE
sql/ha_myisammrg.cc:
Use TABLE_SHARE
Change some pointer handling to use const char*
sql/ha_ndbcluster.cc:
Use TABLE_SHARE
sql/handler.cc:
Use TABLE_SHARE
sql/item.cc:
Use TABLE_SHARE
sql/item_func.cc:
Use TABLE_SHARE
sql/item_subselect.cc:
Use TABLE_SHARE
sql/item_sum.cc:
Use TABLE_SHARE
sql/key.cc:
Use TABLE_SHARE
sql/lock.cc:
Use TABLE_SHARE
sql/log_event.cc:
real_name -> table_name
sql/mysql_priv.h:
Use TABLE_SHARE
sql/opt_range.cc:
Use TABLE_SHARE
sql/opt_sum.cc:
Use TABLE_SHARE
sql/records.cc:
Use TABLE_SHARE
sql/repl_failsafe.cc:
real_name -> table_name
sql/slave.cc:
Use TABLE_SHARE
sql/sp.cc:
Use TABLE_SHARE
sql/sp_head.cc:
real_name -> table_name
sql/sql_acl.cc:
Use TABLE_SHARE
removed unnecessary assert
fixed indentation
changed some char * -> const char*
sql/sql_acl.h:
changed some char* -> const char*
sql/sql_base.cc:
Use TABLE_SHARE
sql/sql_cache.cc:
Use TABLE_SHARE
sql/sql_class.cc:
Use TABLE_SHARE
sql/sql_db.cc:
real_name -> table_name
sql/sql_delete.cc:
Use TABLE_SHARE
sql/sql_derived.cc:
Use TABLE_SHARE
sql/sql_handler.cc:
Use TABLE_SHARE
sql/sql_help.cc:
Use TABLE_SHARE
sql/sql_insert.cc:
Use TABLE_SHARE
sql/sql_load.cc:
Use TABLE_SHARE
sql/sql_parse.cc:
Use TABLE_SHARE
sql/sql_rename.cc:
real_name -> table_name
sql/sql_select.cc:
Use TABLE_SHARE
table->blob_fields now points to field offsets, not fields
tmp_table->table_name now points to alias name
sql/sql_show.cc:
Use TABLE_SHARE
sql/sql_table.cc:
Use TABLE_SHARE
sql/sql_test.cc:
Use TABLE_SHARE
sql/sql_trigger.cc:
Use TABLE_SHARE
sql/sql_udf.cc:
Use TABLE_SHARE
sql/sql_union.cc:
real_name -> table_name
sql/sql_update.cc:
Use TABLE_SHARE
sql/sql_view.cc:
Use TABLE_SHARE
sql/table.cc:
Split TABLE to TABLE and TABLE_SHARE
Changed blob_field to be field offsets instead of pointer to fields
Only initialize table->s->default_values with default record (not all table->record[#])
Some indentation changes
sql/table.h:
Split TABLE to TABLE and TABLE_SHARE
sql/tztime.cc:
real_name -> table_name
sql/unireg.cc:
Use TABLE_SHARE
sql/unireg.h:
Use TABLE_SHARE
The problem was that when a QUICK_SELECT access method is chosen,
test_if_skip_sort_order() discovered that the index being used
by the quick select will not deliver tuples in sorted order.
In this case test_if_skip_sort_order() tried to change the index
used by the quick select, but it didn't properly set the other
members of the quick select, and especially the range flags of
the ranges in QUICK_SELECT::ranges.
The fix re-invokes the function SQL_SELECT::test_quick_select
to correctly create a valid QUICK_SELECT object.
mysql-test/r/order_by.result:
Added test results.
mysql-test/t/order_by.test:
Added test for BUG#7331.
sql/sql_select.cc:
Fix for BUG#7331.
mysql-test/r/view.result:
query cache part moved to separate test
mysql-test/t/view.test:
query cache part moved to separate test
sql/item_func.cc:
fixed for safety
sql/sql_base.cc:
do not use real table call with view
fixed wrapping * substitured items
fixed fix_fields call parameter (refference)
sql/sql_yacc.yy:
added initialisation of SELECT in commands which can use subqueries
sql/table.cc:
fised fix_fields call parameter
sql/table.h:
new view specific method
report test mode if case of failure (default/ps-protocol/embedded)
mysql-test/mysql-test-run.sh:
report test mode if case of failure (default/ps-protocol/embedded)
Create new innodb_sync_spin_loops variable
mysql-test/r/innodb.result:
Create new innodb_sync_spin_loops variable
mysql-test/t/innodb.test:
Create new innodb_sync_spin_loops variable
sql/ha_innodb.h:
Create new innodb_sync_spin_loops variable
sql/mysqld.cc:
Create new innodb_sync_spin_loops variable
sql/set_var.cc:
Create new innodb_sync_spin_loops variable
_stricmp was replaved on sting_compare_func
added breakes for windows
mysql-test/mysql_test_run_new.c:
_stricmp was replaved on sting_compare_func
added breakes for windows
Link mysql_test_run_new as console application
my_manage.c:
The type intptr_t isn't defined for VC 6.0
Changed return type for CreateProcess() to bool
mysql_test_run_new.c:
The type intptr_t isn't defined for VC 6.0
mysqltest.dsp:
Added regex to additional build types for mysqltest
mysqldump.dsp:
Added mysys.lib for linking mysqldump
VC++Files/client/mysqldump.dsp:
Added mysys.lib for linking mysqldump
VC++Files/client/mysqltest.dsp:
Added regex to additional build types for mysqltest
mysql-test/mysql_test_run_new.c:
The type intptr_t isn't defined for VC 6.0
mysql-test/my_manage.c:
The type intptr_t isn't defined for VC 6.0
Changed return type for CreateProcess() to bool
VC++Files/mysql-test/mysql_test_run_new.dsp:
Link mysql_test_run_new as console application
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/ndb_global.h.in:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
libmysql/libmysql.c:
Add support for warnings for prepare of prepared statements
mysql-test/r/func_concat.result:
After merge fixes
mysql-test/r/select.result:
Delete conflicting tables form previous tests
mysql-test/r/view.result:
New code from 4.1 fixed old error
mysql-test/t/create.test:
Ensure that --ps-protocol return same results as normal test
mysql-test/t/func_group.test:
Remove not needed --disable_ps_protocol
mysql-test/t/func_time.test:
Ensure that --ps-protocol return same results as normal test
mysql-test/t/having.test:
Ensure that --ps-protocol return same results as normal test
mysql-test/t/insert_select.test:
Remove not needed --disable_ps_protocol
mysql-test/t/select.test:
Ensure that --ps-protocol return same results as normal test
mysql-test/t/sp.test:
Fixed comment
mysql-test/t/system_mysql_db_fix.test:
Fix that results is same as from system_mysql_db.test
mysql-test/t/trigger.test:
Added comment
mysql-test/t/type_blob.test:
Remove not needed --disable_ps_protocol
mysql-test/t/union.test:
Run most of the test with --ps-protocol
mysql-test/t/user_limits.test:
Ensure that --ps-protocol return same results as normal test
mysql-test/t/view.test:
Removed --error as bug is now fixed
mysql-test/t/warnings.test:
Ensure that --ps-protocol return same results as normal test
ndb/include/Makefile.am:
Don't automaticly use SCCS files
sql/ha_ndbcluster.cc:
Removed compiler warning
sql/log_event.cc:
After merge fix
sql/sql_class.h:
After merge fix
sql/sql_insert.cc:
After merge fix
sql/sql_load.cc:
After merge fix
sql/sql_prepare.cc:
Add support for warnings for prepare of prepared statements
sql/sql_update.cc:
After merge fixes
Install varchar.frm
Otherwise type_varchar fails when running mysql-test-run on installed system
mysql-test/mysql-test-run.sh
Use correct path to clist_tests in on installed system
mysql-test/Makefile.am:
Install varchar.frm
Otherwise type_varchar fails when running mysql-test-run on installed system
mysql-test/mysql-test-run.sh:
Use correct path to clist_tests in on installed system
don't fail w/o bdb (or innodb)
sql/sql_base.cc
typo fixed.
"mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)
mysql-test/r/multi_update.result:
don't fail w/o bdb (or innodb)
mysql-test/t/multi_update.test:
don't fail w/o bdb (or innodb)
sql/sql_base.cc:
typo fixed.
"mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
innobase/log/log0recv.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/drop.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
ndb/include/ndb_global.h.in:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/time.cc:
Auto merged
innobase/row/row0upd.c:
Trivial merge
mysql-test/t/func_concat.test:
Keep local code
mysql-test/t/multi_update.test:
auto merge
sql/ha_ndbcluster.cc:
manual merge
sql/item_timefunc.cc:
manual merge
sql/mysql_priv.h:
manual merge
sql/sql_class.h:
manual merge
sql/sql_delete.cc:
manual merge
sql/sql_insert.cc:
manual merge
sql/sql_lex.cc:
manual merge
sql/sql_lex.h:
manual merge
sql/sql_load.cc:
manual merge
sql/sql_parse.cc:
manual merge
sql/sql_table.cc:
manual merge
sql/sql_update.cc:
manual merge
