Commits · 2a7d78341f0b28b2deacfd2a46cc70c430df66e8 · nexedi / MariaDB

22 Sep, 2005 2 commits

Add files for bdb/build_win64, and tweak the configuration to skip over · 2a7d7834

unknown authored Sep 22, 2005

parts of the library we have omitted.


storage/bdb/dist/s_config:
  Change mode to -rw-r--r--
storage/bdb/dist/s_crypto:
  Change mode to -rw-r--r--
storage/bdb/dist/s_dir:
  Change mode to -rw-r--r--
storage/bdb/dist/s_include:
  Change mode to -rw-r--r--
storage/bdb/dist/s_java_const:
  Change mode to -rw-r--r--
storage/bdb/dist/s_java_stat:
  Change mode to -rw-r--r--
storage/bdb/dist/s_java_swig:
  Change mode to -rw-r--r--
storage/bdb/dist/s_javah:
  Change mode to -rw-r--r--
storage/bdb/dist/s_java:
  Change mode to -rw-r--r--
storage/bdb/dist/s_je2db:
  Change mode to -rw-r--r--
storage/bdb/dist/s_readme:
  Change mode to -rw-r--r--
storage/bdb/dist/s_rpc:
  Change mode to -rw-r--r--
storage/bdb/dist/s_test:
  Change mode to -rw-r--r--
storage/bdb/dist/s_vxworks:
  Change mode to -rw-r--r--
storage/bdb/dist/s_win32_dsp:
  Change mode to -rw-r--r--
storage/bdb/dist/s_win32:
  Change mode to -rw-r--r--
storage/bdb/dist/s_winmsi:
  Change mode to -rw-r--r--
storage/bdb/dist/s_all:
  Don't bother with VxWorks or Java stuff
storage/bdb/dist/s_perm:
  Skip mod_db4 handling
storage/bdb/dist/s_recover:
  Skip examples handling
storage/bdb/dist/s_symlink:
  Skip examples handling
storage/bdb/dist/s_tags:
  Skip test_perf handling
BitKeeper/deleted/.del-build_all.dsp~8d55522d9eb8f029:
  Delete: storage/bdb/build_win32/build_all.dsp
BitKeeper/deleted/.del-db_java_xa.dsp~dffbaca42fa2dc81:
  Delete: storage/bdb/build_win32/db_java_xa.dsp
BitKeeper/deleted/.del-db_lib.dsp~4cc7531e4cd72267:
  Delete: storage/bdb/build_win32/db_lib.dsp
BitKeeper/etc/ignore:
  Simplify some storage/bdb ignore rules
storage/bdb/build_win32/small_dsp.src:
  New BitKeeper file ``storage/bdb/build_win32/small_dsp.src''
storage/bdb/build_win64/app_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/app_dsp.src''
storage/bdb/build_win64/db_test.src:
  New BitKeeper file ``storage/bdb/build_win64/db_test.src''
storage/bdb/build_win64/dynamic_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/dynamic_dsp.src''
storage/bdb/build_win64/ex_repquote.src:
  New BitKeeper file ``storage/bdb/build_win64/ex_repquote.src''
storage/bdb/build_win64/java_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/java_dsp.src''
storage/bdb/build_win64/libdbrc.src:
  New BitKeeper file ``storage/bdb/build_win64/libdbrc.src''
storage/bdb/build_win64/small_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/small_dsp.src''
storage/bdb/build_win64/srcfile_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/srcfile_dsp.src''
storage/bdb/build_win64/static_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/static_dsp.src''
storage/bdb/build_win64/tcl_dsp.src:
  New BitKeeper file ``storage/bdb/build_win64/tcl_dsp.src''

2a7d7834

Remove some files that should not have been added with BDB upgrade, · 403fc7b9

unknown authored Sep 22, 2005

and update ignore file after move of storage engines to storage/.


BitKeeper/deleted/.del-.IGNORE_ME~7d48c5cc6a693365:
  Delete: storage/bdb/build_unix/.IGNORE_ME
BitKeeper/deleted/.del-config.hin~6c9fcc7865fbb64a:
  Delete: storage/bdb/dist/config.hin
BitKeeper/deleted/.del-db_server_proc~f547043c24590673:
  Delete: storage/bdb/dist/template/db_server_proc
BitKeeper/deleted/.del-gen_client_ret~ae4ef5cef951bd76:
  Delete: storage/bdb/dist/template/gen_client_ret
BitKeeper/deleted/.del-rec_btree~a5adf9b5626f4d9f:
  Delete: storage/bdb/dist/template/rec_btree
BitKeeper/deleted/.del-rec_crdel~7300927240b9d2d7:
  Delete: storage/bdb/dist/template/rec_crdel
BitKeeper/deleted/.del-rec_dbreg~b44e71f4622abd02:
  Delete: storage/bdb/dist/template/rec_dbreg
BitKeeper/deleted/.del-rec_db~f59dc271ee2f2ed3:
  Delete: storage/bdb/dist/template/rec_db
BitKeeper/deleted/.del-rec_fileops~86598044415274cd:
  Delete: storage/bdb/dist/template/rec_fileops
BitKeeper/deleted/.del-db_server.x~f2754d16c385befc:
  Delete: storage/bdb/rpc_server/db_server.x
BitKeeper/deleted/.del-db_server_proc.c~550295a7279e753:
  Delete: storage/bdb/rpc_server/c/db_server_proc.c
BitKeeper/deleted/.del-gen_client.c~3bea25e4cabac1d5:
  Delete: storage/bdb/rpc_client/gen_client.c
BitKeeper/deleted/.del-gen_db_server.c~978be757dca7e000:
  Delete: storage/bdb/rpc_server/c/gen_db_server.c
BitKeeper/deleted/.del-rec_hash~8b32ca72e303bedd:
  Delete: storage/bdb/dist/template/rec_hash
BitKeeper/deleted/.del-rec_qam~b914dc918c67b2d0:
  Delete: storage/bdb/dist/template/rec_qam
BitKeeper/deleted/.del-rec_txn~787bfed583e17818:
  Delete: storage/bdb/dist/template/rec_txn
BitKeeper/etc/ignore:
  Update files to ignore from storage engine directions, especially bdb,
  and some new additions to be ignored from libmysqld.

403fc7b9

21 Sep, 2005 2 commits
- Merge mysql.com:/home/jimw/my/mysql-5.1-bdb · d80db0d8
  unknown authored Sep 21, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.1-clean


VC++Files/storage/bdb/bdb.dsp:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
```
  d80db0d8
- Standardised on capital letters for NDBCLUSTER · c4b65f50
  unknown authored Sep 20, 2005
  
  c4b65f50
20 Sep, 2005 6 commits

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · e9c8c410
unknown authored Sep 20, 2005
```
into  c-1309e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
```
e9c8c410
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 352c5c10
unknown authored Sep 20, 2005
```
into  c-1309e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
```
352c5c10

Handle default engine type better for · cd58d302

unknown authored Sep 20, 2005

partitioned tables


mysql-test/r/partition.result:
  New test cases for SHOW CREATE TABLE
mysql-test/r/partition_range.result:
  New test cases for SHOW CREATE TABLE
mysql-test/t/partition.test:
  New test cases for SHOW CREATE TABLE
mysql-test/t/partition_range.test:
  New test cases for SHOW CREATE TABLE
sql/handler.h:
  Handle default engine type better
sql/sql_partition.cc:
  Handle default engine type better
sql/sql_show.cc:
  Handle default engine type better
sql/sql_table.cc:
  Handle default engine type better
sql/sql_yacc.yy:
  Handle default engine type better
sql/table.cc:
  Handle default engine type better
sql/unireg.cc:
  Handle default engine type better

cd58d302

ndb - backport from 5.1-ndb-dd: AttributeHeader: store size in bytes · 560e1036

unknown authored Sep 20, 2005


storage/ndb/include/kernel/AttributeHeader.hpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  backport from 5.1-ndb-dd: AttributeHeader: store size in bytes

560e1036

added missing hpp file for install/dist · 204742fb
unknown authored Sep 20, 2005

204742fb

Bug #13323 · fe194f9e

unknown authored Sep 19, 2005

Select count(*) returned 2 on empty table where handler
used exact count


mysql-test/r/partition.result:
  New test case for Bug #13323
mysql-test/t/partition.test:
  New test case for Bug #13323
sql/ha_partition.cc:
  Fix for Bug #13323

fe194f9e

16 Sep, 2005 3 commits

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · a22891f4
unknown authored Sep 16, 2005
```
into mysql.com:/M51/mysql-5.1


configure.in:
  Auto merged
```
a22891f4
Merge the 5.0.13 clone changes up to 5.1 · d8922887
unknown authored Sep 16, 2005
```
include/my_global.h:
  Auto merged
configure.in:
  Manual merge (= no change).
```
d8922887

merge · 732dee5b

unknown authored Sep 16, 2005


sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged

732dee5b

15 Sep, 2005 27 commits

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · fa1bb240
unknown authored Sep 15, 2005
```
into moonbone.local:/work/12887-bug-5.0-mysql
```
fa1bb240

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · d4004567

unknown authored Sep 15, 2005

into moonbone.local:/work/12887-bug-5.0-mysql


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
  Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
  Auto merged
mysql-test/r/flush_block_commit.result:
  Auto merged
mysql-test/r/flush_table.result:
  Auto merged
mysql-test/r/lock_multi.result:
  Auto merged
mysql-test/r/rpl_server_id1.result:
  Auto merged
mysql-test/r/rpl_server_id2.result:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
mysql-test/t/bool.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/func_concat.test:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s.test:
  Auto merged
mysql-test/t/rpl_loaddatalocal.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged

d4004567

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · fdc9e5d0
unknown authored Sep 15, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
fdc9e5d0

bad merge fixed · 4a86a5e6

unknown authored Sep 15, 2005


mysql-test/r/insert_select.result:
  duplicated test removed
mysql-test/t/insert_select.test:
  duplicated test removed

4a86a5e6

Merge moonbone.local:/work/12887-bug-4.1-mysql · 3444e243
unknown authored Sep 15, 2005
```
into moonbone.local:/work/12887-bug-5.0-mysql


vio/viosocket.c:
  Auto merged
```
3444e243
Merge bk-internal:/home/bk/mysql-4.1 · 39c7eb9d
unknown authored Sep 15, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
39c7eb9d

Manual merge · 577e915b

unknown authored Sep 15, 2005


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/bool.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/func_concat.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
  Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
  Auto merged
mysql-test/r/flush_block_commit.result:
  Auto merged
mysql-test/r/flush_table.result:
  Auto merged
mysql-test/r/lock_multi.result:
  Auto merged
mysql-test/r/rpl_server_id1.result:
  Auto merged
mysql-test/r/rpl_server_id2.result:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s.test:
  Auto merged
mysql-test/t/rpl_loaddatalocal.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged

577e915b

Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1ae85660
unknown authored Sep 15, 2005
```
into  selena.:H:/MYSQL/src/fin-mysql-5.0
```
1ae85660
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9577158d
unknown authored Sep 15, 2005
```
into moonbone.local:/work/12887-bug-4.1-mysql
```
9577158d

Fix bug#12887 Distinct is not always applied after rollup · 9ca76cbc

unknown authored Sep 15, 2005

For queries with GROUP BY and without hidden GROUP BY fields DISTINCT is
optimized away becuase such queries produce result set without duplicates.
But ROLLUP can add rows which may be same to some rows and this fact was
ignored.

Added check so if ROLLUP is present DISTINCT can't be optimized away.


sql/sql_select.cc:
  Fix bug #12887 Distinct is not always applied after rollup
mysql-test/r/olap.result:
  Test case for bug #12887 Distinct is not always applied after rollup
mysql-test/t/olap.test:
  Test case for bug #12887 Distinct is not always applied after rollup

9ca76cbc

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · a45bc3ae
unknown authored Sep 15, 2005
```
into moonbone.local:/work/11416-bug-5.0-mysql
```
a45bc3ae
Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by Kent) · 3af139f8
unknown authored Sep 15, 2005

3af139f8
Merge mysql.com:/home/jimw/my/mysql-4.1-12723 · ede5c905
unknown authored Sep 15, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


vio/viosocket.c:
  Auto merged
```
ede5c905

Merge · 607d87bb

unknown authored Sep 15, 2005


mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

607d87bb

Merge selena.:H:/MYSQL/src/fin-mysql-4.1 · 69523357

unknown authored Sep 15, 2005

into  selena.:H:/MYSQL/src/fin-mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
  Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
  Auto merged
mysql-test/r/flush_block_commit.result:
  Auto merged
mysql-test/r/flush_table.result:
  Auto merged
mysql-test/r/lock_multi.result:
  Auto merged
mysql-test/r/rpl_server_id1.result:
  Auto merged
mysql-test/r/rpl_server_id2.result:
  Auto merged
mysql-test/t/bool.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/func_concat.test:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s.test:
  Auto merged
mysql-test/t/rpl_loaddatalocal.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged

69523357

Turn off EOLN_NATIVE flag of some test files · 69011492

unknown authored Sep 15, 2005


mysql-test/r/analyze.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/create_select_tmp.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/flush_block_commit.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/flush_table.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/have_moscow_leap_timezone.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/have_outfile.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/innodb-lock.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/lock_multi.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_commit_after_flush.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_drop.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_free_items.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_multi_delete2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_multi_update.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_multi_update2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_server_id1.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_server_id2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_set_charset.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_start_stop_slave.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/timezone3.result:
  Turn off EOLN_NATIVE flag

69011492

Fix errmsg.txt · af13cfdf

unknown authored Sep 15, 2005


sql/share/errmsg.txt:
  Remove english error message, it does not belong there

af13cfdf

Merge mysql.com:/home/my/mysql-4.0 · e1627dfb

unknown authored Sep 15, 2005

into  mysql.com:/home/my/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106:
  Auto merged
BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14:
  Auto merged
BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838:
  Auto merged
BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72:
  Auto merged
BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2:
  Auto merged
BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585:
  Auto merged
BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001:
  Auto merged
BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9:
  Auto merged
BitKeeper/deleted/.del-query_cache_notembedded.test:
  Auto merged
BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87:
  Auto merged
mysql-test/t/analyze.test:
  Auto merged
mysql-test/t/ansi.test:
  Auto merged
mysql-test/t/backup-master.sh:
  Auto merged
mysql-test/t/bdb-alter-table-2-master.opt:
  Auto merged
mysql-test/t/bdb-deadlock.test:
  Auto merged
mysql-test/t/bdb_cache-master.opt:
  Auto merged
mysql-test/t/bdb_cache.test:
  Auto merged
mysql-test/t/bool.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/constraints.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/ctype_cp1251.test:
  Auto merged
mysql-test/t/ctype_latin1_de-master.opt:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/ctype_tis620.test:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
mysql-test/t/drop_temp_table.test:
  Auto merged
mysql-test/t/func_concat.test:
  Auto merged
mysql-test/t/func_encrypt-master.opt:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
mysql-test/t/func_isnull.test:
  Auto merged
mysql-test/t/gcc296.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/init_file-master.opt:
  Auto merged
mysql-test/t/init_file.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb_cache-master.opt:
  Auto merged
mysql-test/t/innodb_cache.test:
  Auto merged
mysql-test/t/innodb_handler.test:
  Auto merged
mysql-test/t/isam.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/lock_tables_lost_commit-master.opt:
  Auto merged
mysql-test/t/lock_tables_lost_commit.test:
  Auto merged
mysql-test/t/lowercase_table-master.opt:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/lowercase_table2.test:
  Auto merged
mysql-test/t/lowercase_table3-master.opt:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/multi_update-master.opt:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/myisam-blob-master.opt:
  Auto merged
mysql-test/t/myisam-blob.test:
  Auto merged
mysql-test/t/mysqlbinlog-master.opt:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/packet.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/query_cache_merge.test:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_alter.test:
  Auto merged
mysql-test/t/rpl_chain_temp_table.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_do_grant.test:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table-slave.opt:
  Auto merged
mysql-test/t/rpl_commit_after_flush.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_failsafe.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop-master.opt:
  Auto merged
mysql-test/t/rpl_flush_log_loop-master.sh:
  Auto merged
mysql-test/t/rpl_flush_log_loop-slave.opt:
  Auto merged
mysql-test/t/rpl_flush_log_loop-slave.sh:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_ignore_grant-slave.opt:
  Auto merged
mysql-test/t/rpl_ignore_grant.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_free_items.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m-master.opt:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s-slave.opt:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s.test:
  Auto merged
mysql-test/t/rpl_loaddatalocal.test:
  Auto merged
mysql-test/t/rpl_log-master.opt:
  Auto merged
mysql-test/t/rpl_log-slave.opt:
  Auto merged
mysql-test/t/rpl_master_pos_wait.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_multi_delete-slave.opt:
  Auto merged
mysql-test/t/rpl_multi_delete.test:
  Auto merged
mysql-test/t/rpl_multi_delete2.test:
  Auto merged
mysql-test/t/rpl_optimize.test:
  Auto merged
mysql-test/t/rpl_relayspace-slave.opt:
  Auto merged
mysql-test/t/rpl_relayspace.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_skip_error-slave.opt:
  Auto merged
mysql-test/t/rpl_skip_error.test:
  Auto merged
mysql-test/t/rpl_multi_update.test:
  Auto merged
mysql-test/t/rpl_multi_update2.test:
  Auto merged
mysql-test/t/rpl_server_id1.test:
  Auto merged
mysql-test/t/rpl_server_id2.test:
  Auto merged
mysql-test/t/rpl_set_charset.test:
  Auto merged
mysql-test/t/rpl_start_stop_slave.test:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/system_mysql_db_refs.test:
  Auto merged
mysql-test/t/system_mysql_db_fix-master.opt:
  Auto merged
mysql-test/t/timezone-master.opt:
  Auto merged
mysql-test/t/timezone.test:
  Auto merged
mysql-test/t/type_set.test:
  Auto merged
mysql-test/t/variables-master.opt:
  Auto merged
mysql-test/t/timezone3.test:
  Auto merged

e1627dfb

Turn off EOLN_NATIVE flag for all test files · f2ff2a2d

unknown authored Sep 15, 2005

Ignored some generated files


mysql-test/t/analyze.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ansi-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ansi.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/backup-master.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb-alter-table-2-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb-deadlock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb_cache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/bool.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/cast.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/constraints.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/convert.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/create_select_tmp.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_cp1251-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_cp1251.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_latin1_de-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_latin1_de.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_tis620-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_tis620.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_ujis-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_ujis.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/drop_temp_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/flush_block_commit.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_concat.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_encrypt-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_if.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_isnull.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/gcc296.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant_cache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/init_file-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/init_file.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb-deadlock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb-lock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb_cache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb_handler.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/isam.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/loaddata.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lock_multi.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lock_tables_lost_commit-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/lock_tables_lost_commit.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table3-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table3.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/mix_innodb_myisam_binlog-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/mix_innodb_myisam_binlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/multi_update-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/myisam-blob-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/myisam-blob.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/mysqlbinlog-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/mysqlbinlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/mysqldump.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/packet.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/query_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/query_cache_merge.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/query_cache_notembedded.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/repair.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/repair_part2-master.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/repair_part2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl000016-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_EE_error.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_alter.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_chain_temp_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_change_master.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_commit_after_flush.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_do_grant.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_drop.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_empty_master_crash.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_error_ignored_table-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_error_ignored_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_failsafe.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-master.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-slave.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_free_items-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_free_items.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_get_lock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_heap.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_ignore_grant-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_ignore_grant.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_insert_id.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_m-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_m.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_s-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_s.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddatalocal.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_log-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_log-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_master_pos_wait.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_max_relay_size.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete2-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_update.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_update2-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_update2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_optimize.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_relayspace-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_relayspace.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_reset_slave.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_server_id1.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_server_id2-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_server_id2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_set_charset.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_skip_error-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_skip_error.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_start_stop_slave.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_trunc_binlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db_fix-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db_fix.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db_refs.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone3-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone3.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/type_set.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/variables-master.opt:
  Turn off EOLN_NATIVE flag
BitKeeper/etc/ignore:
  added support-files/MacOSX/preflight

f2ff2a2d

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · fa8082c4
unknown authored Sep 15, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
```
fa8082c4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 36625437
unknown authored Sep 15, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
36625437
updated ndb restore test prog to work better with wl2325 · 6432d4ac
unknown authored Sep 15, 2005

6432d4ac
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4f0723b7
unknown authored Sep 15, 2005
```
into  mysql.com:/export/space/pekka/ndb/version/my50
```
4f0723b7

Merge mysql.com:/export/space/pekka/ndb/version/my41 · 8cf0cce3

unknown authored Sep 15, 2005

into  mysql.com:/export/space/pekka/ndb/version/my50


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  ul

8cf0cce3

- bumped up version number to 5.0.14-rc in the main tree (5.0.13-rc has · 7235fda3
unknown authored Sep 15, 2005
```
  been branched off)
```
7235fda3
- bumped up version number from 5.0.13-beta to 5.0.13-rc · a06a8ceb
unknown authored Sep 15, 2005
```
- tagged this ChangeSet as "clone-5.0.13-build"
```
a06a8ceb

ndb - bug#9994 backpatch fixes from 5.0 · 73f0ed05

unknown authored Sep 15, 2005

      IGNORE on merge 4.1->5.0


ndb/src/kernel/blocks/ERROR_codes.txt:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  bug#9994 backpatch fixes from 5.0

73f0ed05