Commits · 6c9a4282ffc730aee9340851893dac5eaae33403 · nexedi / MariaDB

11 Jan, 2005 4 commits

Merge · 6c9a4282

unknown authored Jan 11, 2005


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

6c9a4282

Merge mysql.com:/home/jwinstead2/mysql-4.1-7556 · d71ec620
unknown authored Jan 11, 2005
```
into mysql.com:/home/jwinstead2/mysql-4.1-clean
```
d71ec620
Merge mysql.com:/home/jwinstead2/mysql-4.1-7762 · d79d4ff6
unknown authored Jan 11, 2005
```
into mysql.com:/home/jwinstead2/mysql-4.1-clean
```
d79d4ff6
Fix style nit · d61c360c
unknown authored Jan 11, 2005
```
sql/examples/ha_archive.cc:
  Fix style
```
d61c360c

10 Jan, 2005 10 commits

Fix double-initalization of mutex in archive storage engine. (Bug #7762) · 37a3b952

unknown authored Jan 10, 2005


sql/examples/ha_archive.cc:
  Fix redundant initialization of share->mutex
  Fix error handling to always clean up correctly
  Fix a couple of warnings

37a3b952

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · d43e7473
unknown authored Jan 10, 2005
```
into mysql.com:/home/mysql_src/mysql-4.1-clean
```
d43e7473
- removed the mysql-test/suites/jp test suite and marked all files as gone · cb6d8ce0
unknown authored Jan 10, 2005

cb6d8ce0
A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0... · 5ff3c59a
unknown authored Jan 10, 2005
```
A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE).
```
5ff3c59a

os0file.c: · a9f71917

unknown authored Jan 10, 2005

Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined

innobase/os/os0file.c:
Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined

a9f71917

Merge mysql.com:/home/mysql_src/mysql-4.0 · 1300c069

unknown authored Jan 10, 2005

into mysql.com:/home/mysql_src/mysql-4.1-clean


Build-tools/Bootstrap:
  Auto merged
sql/net_serv.cc:
  Auto merged

1300c069

Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]": · b4e07a6e

unknown authored Jan 10, 2005

mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.


sql/net_serv.cc:
  If no VIO, no write.

b4e07a6e

bug#7761 - ndb does not autcommit - postreview fixes · a749dd50
unknown authored Jan 10, 2005
```
sql/sql_table.cc:
  Move ha_enable to before new Copy, to ensure no memory is leaked
```
a749dd50
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2d68e5b3
unknown authored Jan 10, 2005
```
into mysql.com:/home/jonas/src/mysql-4.1
```
2d68e5b3
bug#7761 - ndb does not autocommit during alter table · 93040241
unknown authored Jan 10, 2005
```
sql/sql_table.cc:
  Turn off transactions before locking (as locking will need to know)
```
93040241

09 Jan, 2005 3 commits

set_var.cc: · a3b5ba48

unknown authored Jan 08, 2005

  Whack duplicate variable line. (Affects SHOW VARIABLES.)


sql/set_var.cc:
  Whack duplicate variable line. (Affects SHOW VARIABLES.)

a3b5ba48

Replace all sprintf() calls with my_snprintf() in client.c. All of the · ceda57ae

unknown authored Jan 09, 2005

format strings (in all languages) already included field limits on the
specifiers, so this is just protection against future mistakes. (Bug #7556)


sql-common/client.c:
  Replace all sprintf() calls with my_snprintf()

ceda57ae

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 143feae1
unknown authored Jan 08, 2005
```
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
```
143feae1

08 Jan, 2005 14 commits

Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ce1d90d
unknown authored Jan 08, 2005
```
into mysql.com:/home/jwinstead2/mysql-5.0-clean
```
9ce1d90d
Update test as result of merge · 290b1f1e
unknown authored Jan 08, 2005
```
mysql-test/r/heap.result:
  update test
```
290b1f1e

ndb - wl-1442 4.1->5.0 merge fixes · 4e57d01c

unknown authored Jan 08, 2005


ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/include/ndb_constants.h:
  wl-1442 4.1->5.0 merge fixes
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 4.1->5.0 merge fixes

4e57d01c

Merge · c13b924d

unknown authored Jan 08, 2005


client/mysql.cc:
  Auto merged
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge

c13b924d

Merge mysql.com:/home/jwinstead2/mysql-4.1-7233 · 7b60ae79

unknown authored Jan 08, 2005

into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_show.cc:
  Auto merged

7b60ae79

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 675ceab9
unknown authored Jan 08, 2005
```
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
```
675ceab9
few harmless warnings from automated code-checking tools fixed · f13aca53
unknown authored Jan 08, 2005
```
client/mysql.cc:
  few harmless warnings from automated code-checking tools fixed
  cleanup
```
f13aca53
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1 · 093e4905
unknown authored Jan 08, 2005
```
into mysql.com:/home/jwinstead2/mysql-4.1-clean
```
093e4905

ndb - wl-1442 fix Time ordering · 5a92f4fd

unknown authored Jan 08, 2005


mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Time.  adds new type id 25
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Time.  adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Time.  adds new type id 25
sql/ha_ndbcluster.cc:
  wl-1442 fix Time.  adds new type id 25

5a92f4fd

ndb - wl-1442 fix Date ordering · da28014e

unknown authored Jan 08, 2005


mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Date.  reuses old unused Timespec type id
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
sql/ha_ndbcluster.cc:
  wl-1442 fix Date.  reuses old unused Timespec type id

da28014e

ndb - wl-1442 updated ndb_index_ordered.result · b85eaec2
unknown authored Jan 08, 2005
```
mysql-test/r/ndb_index_ordered.result:
  wl-1442 missed result file
```
b85eaec2

ndb - wl-1442 bug#7725 datetime ordering · f3287c74

unknown authored Jan 08, 2005


mysql-test/t/ndb_index_ordered.test:
  wl-1442 datetime ordering
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 datetime ordering

f3287c74

Use 'USING <indextype>' in results of SHOW CREATE TABLE, it's the preferred · 907207fd

unknown authored Jan 08, 2005

syntax. (Bug #7233)


sql/sql_show.cc:
  Use 'USING <indextype>' in SHOW CREATE TABLE, it's the preferred syntax
mysql-test/r/ctype_utf8.result:
  Update results
mysql-test/r/show_check.result:
  Update results
mysql-test/r/sql_mode.result:
  Update results
mysql-test/t/show_check.test:
  Use preferred syntax 'USING BTREE' instead of 'TYPE BTREE'

907207fd

Fix unportable 'tr' usage in libedit build process. (Bug #7669) · 87a07549

unknown authored Jan 08, 2005


cmd-line-utils/libedit/makelist.sh:
  Spell out the character range for braindead versions of tr
  (like /usr/xpg4/bin/tr on Sun Solaris 2.10)

87a07549

07 Jan, 2005 9 commits

set_var.cc: · 2c0ea371

unknown authored Jan 07, 2005

  Reorder variables to properly alphabetize SHOW VARIABLES output.


sql/set_var.cc:
  Reorder variables to properly alphabetize SHOW VARIABLES output.

2c0ea371

Update messages in type_float test results · c94145eb

unknown authored Jan 07, 2005


mysql-test/r/type_float.result:
  Update warning messages
mysql-test/r/type_float.result.es:
  Update warning messages

c94145eb

Create columns_priv with correct column lengths (the alter table · f54801b1

unknown authored Jan 07, 2005

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

f54801b1

Merge mysql.com:/home/jwinstead2/mysql-4.1-clean · a801277d

unknown authored Jan 07, 2005

into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged

a801277d

Correctly truncate integers inserted into field and double columns · e129f2c5

unknown authored Jan 07, 2005

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

e129f2c5

Introduce ROW_TYPE=REDUNDANT and ROW_TYPE=COMPACT for InnoDB table formats · 033636d0

unknown authored Jan 07, 2005


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

033636d0

merge · cdae2f07

unknown authored Jan 07, 2005


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

cdae2f07

Many files: · 5fcd7b7d

unknown authored Jan 07, 2005

  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----

5fcd7b7d

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 61eb031f
unknown authored Jan 07, 2005
```
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
```
61eb031f