Commit graph

18768 commits

Author SHA1 Message Date
unknown
e167837a63 set_var.cc:
Reorder variables to properly alphabetize SHOW VARIABLES output.


sql/set_var.cc:
  Reorder variables to properly alphabetize SHOW VARIABLES output.
2005-01-07 14:17:08 -06:00
unknown
5802259dc5 Update messages in type_float test results
mysql-test/r/type_float.result:
  Update warning messages
mysql-test/r/type_float.result.es:
  Update warning messages
2005-01-07 20:34:51 +01:00
unknown
306767278d Create columns_priv with correct column lengths (the alter table
that used to fix it was removed in a merge, and now the alter table
that fixes the length comes before the create table so it fixes
pre-existing tables but not the newly-created one).


scripts/mysql_fix_privilege_tables.sql:
  Create columns_priv with correct column lengths
2005-01-07 19:50:41 +01:00
unknown
4675d39cb5 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0


mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged
2005-01-07 12:26:55 -06:00
unknown
25335a9177 Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged
2005-01-07 19:03:35 +01:00
unknown
0c57a67ce0 Correctly truncate integers inserted into field and double columns
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
2005-01-07 17:44:18 +01:00
unknown
6648761d67 Some cleanup in Ndb.hpp (testing for PDF generation).
ndb/include/ndbapi/Ndb.hpp:
  Some editing/cleanup.
2005-01-08 00:55:19 +10:00
unknown
6e74893a6a Introduce ROW_TYPE=REDUNDANT and ROW_TYPE=COMPACT for InnoDB table formats
sql/handler.cc:
  ha_row_type[]: Add REDUNDANT and COMPACT
sql/handler.h:
  enum row_type: Add ROW_TYPE_REDUNDANT and ROW_TYPE_COMPACT
sql/ha_innodb.cc:
  ha_innobase::create(): Detect ROW_TYPE=REDUNDANT
sql/lex.h:
  Add "COMPACT" (COMPACT_SYM) and "REDUNDANT" (REDUNDANT_SYM)
sql/sql_yacc.yy:
  row_types, keyword: Add COMPACT and REDUNDANT
2005-01-07 16:43:27 +02:00
unknown
cbfaa9de6e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-07 15:13:11 +01:00
unknown
bd653371c5 updated docs on event 2005-01-07 15:11:32 +01:00
unknown
e7c19e9e00 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-07 15:07:55 +01:00
unknown
b194c1c1ce merge
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
2005-01-07 15:02:25 +02:00
unknown
75b5d10554 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/export/space/pekka/ndb/version/my50-dt


ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
2005-01-07 13:53:25 +01:00
unknown
9ad1b390fc Many files:
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----
2005-01-07 14:32:05 +02:00
unknown
e1073b1f04 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-07 14:27:07 +02:00
unknown
4290679b75 don't cast lvalue 2005-01-07 14:25:48 +02:00
unknown
c2b7fc9464 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-07 14:14:37 +02:00
unknown
fc35a4d05a added using table object reference in event creation
ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
  changed using new event constructor
2005-01-07 13:00:51 +01:00
unknown
ec6cbbd8a5 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-07 12:32:39 +01:00
unknown
0ef65db5d7 - Updated Do-pkg to include the MySQL Preference Pane into the Mac OS X
installation disk images


Build-tools/Do-pkg:
  - added code to include the MySQLPreferencePane into the installation
    disk image (can be skipped by using --skip-prefpane)
2005-01-07 12:29:15 +01:00
unknown
93831097a8 added get methods on event object 2005-01-07 11:59:22 +01:00
unknown
2331344909 ndb - wl-1442 new varchar
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
2005-01-07 11:55:20 +01:00
unknown
f260ec7379 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-07 11:48:08 +01:00
unknown
b06480082c bug#7690 - ndb startup with shm, use sigaction to escape SA_RESETHAND
configure.in:
  Check for sigaction used in SHM_Transporter
ndb/src/common/transporter/SHM_Transporter.cpp:
  remove unused variable
ndb/src/common/transporter/TransporterRegistry.cpp:
  1) remove unused variable
  2) Use sigaction instead of signal to install signal handler
     This as signal uses SA_RESETHAND
2005-01-07 11:47:01 +01:00
unknown
bec9de67d4 added classification "schema object already exists"
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added classification "schema object already exists"
  retrieved error from sub_stop_ref correctly
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  added classification "schema object already exists"
  + added error code for failed prepare drop subscribe event
2005-01-07 10:48:13 +01:00
unknown
888b665e6c Added test data, test case and test result files for Japanese characters test.
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
2005-01-07 00:48:38 -08:00
unknown
187ff7c6fc Added test case files 2005-01-07 00:40:29 -08:00
unknown
647906259c Added test data and test case files. 2005-01-07 00:32:31 -08:00
unknown
5ebc648ea4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-07 08:40:55 +01:00
unknown
9bb36aa37c merge 2005-01-07 07:15:08 +01:00
unknown
b95768589a merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-01-07 06:47:41 +01:00
unknown
04498c2a4f Bootstrap:
Made the default --mail address to be <build@mysql.com>.


Build-tools/Bootstrap:
  Made the default --mail address to be <build@mysql.com>.
2005-01-06 22:30:23 -06:00
unknown
dd02fd59b6 Skip client_test when testing embedded server
mysql-test/t/client_test.test:
  Doesn't make sense to run this test when running the embedded server
2005-01-07 04:53:05 +01:00
unknown
d732379b30 This just fixes the compile issues for table structure changes.
The test case does not currently work (I am comitting this so that Patrick will have a working copy).
I am going to look at the test case next. It is suspected that it is failing do to a change in mysql_test_run.



sql/ha_federated.cc:
  Changed for table structure change.
2005-01-06 19:37:16 -08:00
unknown
c0e6e87926 Updates for Monty's changes in the table structure. All tests pass currently.
Seems like such a short commit message...


sql/examples/ha_archive.cc:
  Updates for Monty's change to table structures.
  The way the loop through blobs worked has changed.
sql/examples/ha_tina.cc:
  Update for monty's change in table structures. 
  Only used for copying null bytes.
2005-01-06 18:34:17 -08:00
unknown
ccbadbc94a Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3
2005-01-07 12:06:57 +11:00
unknown
5de7459359 Along the road to a working Impl3 of WL2278.
ndb/src/common/transporter/TransporterRegistry.cpp:
  Only try to get dynamic port number for TCP transporters.
ndb/src/mgmapi/mgmapi.cpp:
  DBUG_RETURN in ndb_mgm_set_connection_int_parameter
  
  Unique negative error codes for ndb_mgm_get_connection_int_parameter
ndb/src/mgmsrv/MgmtSrvr.cpp:
  add MgmtSrvr::set_connect_string(const char *str)
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Add:
  - prototype for set_connect_string
  - get_config_retriever
ndb/src/mgmsrv/main.cpp:
  Fake a connect string and connect back to ourselves.
  
  This enables us to use mgmapi routines to get configuration information.
  i.e. ndb_mgm_get_connection_int_parameter for getting dynamic port numbers to connect to.
2005-01-07 12:05:56 +11:00
unknown
fb0f6c9de1 Fix for compiling error in sql_parse
sql/sql_parse.cc:
  Fixing merge issue with goto label missing.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-06 16:31:18 -08:00
unknown
e95db1ce68 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-06 23:59:15 +01:00
unknown
888f2fce98 2 small fixes for binlog (sorry for grouping them - I won't do it again):
WL#2335 (wait if binlog or binlog index file hits disk full or quota exceeded),
fix for BUG#7236 ("--expire_logs_days does not apply if all statements
happen in transactions"), and a behaviour change: abort if mysqld can't start
binlog at startup (if running with --log-bin of course).


sql/log.cc:
  2 small fixes for binlog:
  1) We create binlog and binlog index file with flag MY_WAIT_IF_FULL, so that they have the same
  behaviour as MyISAM tables when disk is full or quota exceeded (wait, try to finish write
  every minute, warn in error log every 10 minutes). That's WL#2335.
  2) Honour expire-log-days when we write a transaction to binlog (we honoured it already when writing
  an autocommit statement). This fixes BUG#7236.
sql/mysqld.cc:
  If we fail to create binlog or binlog index file or write to them at mysqld's startup, mysqld
  will exit. The former behaviour was to print error and continue, which led to stupid things like
  if you mispell a directory name in --log-bin, you don't immediately notice your mistake and
  you corrupt your recovery/replication. New behaviour is consistent with if you mispelt innodb_data_file_path.
2005-01-06 23:53:58 +01:00
unknown
2297b865e5 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 21:48:51 +01:00
unknown
5770356338 Merge mysql.com:/home/jwinstead2/mysql-4.1-7539
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 21:47:52 +01:00
unknown
ae7cfe9ee8 Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0


client/mysqladmin.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
2005-01-06 21:39:57 +01:00
unknown
fd2433762c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-06 21:35:50 +01:00
unknown
ba9b518ab1 Merge mysql.com:/home/mysql_src/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.1-clean


mysys/my_write.c:
  Auto merged
2005-01-06 21:31:47 +01:00
unknown
5b47aaed3a Fix for BUG#7714 "if disk full, sometimes MyISAM doesn't wait for free space, corrupts table"
This happened only if my_write() couldn't write even one byte.
I cannot easily add a .test for this, but I tested by hand before and after the change.


mysys/my_write.c:
  Monty and I could not find a reason why a write should not wait for free disk space
  (if disk is full) because it could not write at least one byte; doing so certainly
  corrupts tables. my_pwrite() and my_fwrite() don't test for -1, so no problem.
2005-01-06 21:30:39 +01:00
unknown
e50bfebe99 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 21:26:07 +01:00
unknown
58f8f9b3ca updated event example to make use of new NdbError member in NdbEventOperation
added my_pthread_init to get dbug print correct in Hugo
    added define for event error code



ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
  updated event example to make use of new NdbError member in NdbEventOperation
  + use define to check error code
ndb/include/kernel/signaldata/CreateEvnt.hpp:
  updated create event signal to use define
ndb/include/ndbapi/NdbEventOperation.hpp:
  added NdbError member to NdbEventOperation
ndb/include/ndbapi/ndberror.h:
  added define for event error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  changed name of error code
ndb/src/ndbapi/NdbEventOperation.cpp:
  added NdbError
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  added debug printout
  added some error handling
ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  added NdbError
ndb/src/ndbapi/Ndberr.cpp:
  added NdbError for NdbEventOperationImpl
ndb/src/ndbapi/ndberror.c:
  changed some error codes
ndb/test/ndbapi/test_event.cpp:
  added testcase for BUG#7627
ndb/test/src/HugoTransactions.cpp:
  added printout in event
ndb/test/src/NDBT_Test.cpp:
  added my_pthread_init to get dbug print correct
2005-01-06 21:13:04 +01:00
unknown
7826587dbe Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0
2005-01-06 21:03:09 +01:00
unknown
3770d90689 main.cpp:
correcting 4.1 merge error


ndb/src/mgmsrv/main.cpp:
  correcting 4.1 merge error
2005-01-06 21:01:32 +01:00