Commits · 9ca07a42836d887274bae827195978859bcdb7d8 · Kirill Smelkov / mariadb

17 Sep, 2005 2 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ca07a42
unknown authored Sep 17, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
```
9ca07a42

Brian's "he is too lazy to commit this so Eric is going to have to do it"... · 0031af06

unknown authored Sep 16, 2005

Brian's "he is too lazy to commit this so Eric is going to have to do it" environmental variable hack for prefix. This allows you to just set a prefix in your profile which will be used in all of your builds. AKA you can be even lazier(!) about calling BUILD scripts. Don't blame Eric, Brian borrowed his keyboard.

BUILD/SETUP.sh:
Added option to set environmental variable in case you are lazy about setting prefix (ala Brian)
BUILD/autorun.sh:
Change of syntax

0031af06

16 Sep, 2005 7 commits
- Added testcase for BUG#13118 · 7e138425
  unknown authored Sep 16, 2005
  
  7e138425
- Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 · cc270d2f
  unknown authored Sep 16, 2005
```
into  127.(none):/home/osku/mysql/5.0/clean
```
  cc270d2f
- InnoDB: Remove unused #defines BTR_PAGE_MAX_KEY_SIZE and BTR_COMPRESS_LIMIT. · 1d169a8e
  unknown authored Sep 16, 2005
  
  1d169a8e
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7f6146f7
  unknown authored Sep 16, 2005
```
into moonbone.local:/work/12291-bug-5.0-mysql
```
  7f6146f7
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5bfca146
  unknown authored Sep 16, 2005
```
into mysql.com:/M50/mysql-5.0
```
  5bfca146
- Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b56b3bd
  unknown authored Sep 16, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
```
  1b56b3bd
- fixed length detection · e1ff851e
  unknown authored Sep 16, 2005
```
sql/sql_show.cc:
  fixed typo
  fixed length detection
```
  e1ff851e
15 Sep, 2005 31 commits

Fix bug #12291 Table wasn't reinited for index scan after sequential scan · 28028b5f

unknown authored Sep 16, 2005

Optimizer did choose "Range checked for each record" for one of the tables.
For first few loops over that table it choose sequential access, on later
stage it choose to use index. Because table was previously initialized for 
sequential access, it skips intitialization for index access, and when
server tries to retrieve data error occurs.

QUICK_RANGE_SELECT::init() changes so if file already initialized for
sequential access, it calls ha_rnd_end() and initializes file for index
access.


sql/opt_range.cc:
  Fix bug #12291 Table wasn't reinited for index scan after sequential scan
mysql-test/t/select.test:
  Test case for bug #12291 Table wasn't reinited for index scan after sequential scan
mysql-test/r/select.result:
  Test case for bug #12291 Table wasn't reinited for index scan after sequential scan

28028b5f

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

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

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

dde66e48

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

bad merge fixed · c7d162a2

unknown authored Sep 15, 2005


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

c7d162a2

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


vio/viosocket.c:
  Auto merged
```
109d2cfa
Merge bk-internal:/home/bk/mysql-4.1 · 2a5505c7
unknown authored Sep 15, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
2a5505c7
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0 · 72717006
unknown authored Sep 15, 2005

72717006

Manual merge · c5f78752

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

c5f78752

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

Fix bug#12887 Distinct is not always applied after rollup · 36d163d6

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

36d163d6

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · bb20af75
unknown authored Sep 15, 2005
```
into moonbone.local:/work/11416-bug-5.0-mysql
```
bb20af75
Merge mysql.com:/home/jimw/my/mysql-4.1-12723 · 1600ee94
unknown authored Sep 15, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


vio/viosocket.c:
  Auto merged
```
1600ee94
Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by Kent) · f7bcd099
unknown authored Sep 15, 2005

f7bcd099

Merge · d01927dc

unknown authored Sep 15, 2005


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

d01927dc

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

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

f3df83e5

Turn off EOLN_NATIVE flag of some test files · c11974e6

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

c11974e6

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

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

f6da85f4

Turn off EOLN_NATIVE flag for all test files · 900645b8

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

900645b8

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 31566bd7
unknown authored Sep 15, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
```
31566bd7
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 997054eb
unknown authored Sep 15, 2005
```
into  mysql.com:/export/space/pekka/ndb/version/my50
```
997054eb

Merge mysql.com:/export/space/pekka/ndb/version/my41 · 98fc2f39

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

98fc2f39

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

ndb - bug#9994 backpatch fixes from 5.0 · 6363fd57

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

6363fd57

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6ecd4f53
unknown authored Sep 15, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0


sql/sql_show.cc:
  Auto merged
```
6ecd4f53
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · fbe338f4
unknown authored Sep 15, 2005
```
into  neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029
```
fbe338f4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6e100a3c
unknown authored Sep 15, 2005
```
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
```
6e100a3c

Information schema fix for WL#2787 · 557d0ca4

unknown authored Sep 15, 2005


mysql-test/r/information_schema.result:
  new fields in I_S
sql/sql_show.cc:
  added niew firlds to view information schema

557d0ca4

Bug #13029 YaSSL not compatibile w/ JSSE (Java implementation of SSL) · 3cf33e7a
unknown authored Sep 15, 2005
```
-Applied patch from Todd


extra/yassl/src/ssl.cpp:
  Call processReply until clientFinishedComplete or error
```
3cf33e7a