Commits · 30681cf509f455506b8ff809369561734fdc82c2 · nexedi / MariaDB

21 Sep, 2005 1 commit

Don't add all args to mysqltest to MYSQL_TEST env var · 30681cf5

unknown authored Sep 21, 2005


mysql-test/mysql-test-run.pl:
  Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.

30681cf5

20 Sep, 2005 5 commits

Merge mysql.com:/home/psergey/bk-trees/mysql-4.1 · 458a4234
unknown authored Sep 21, 2005
```
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3


sql/mysqld.cc:
  Auto merged
```
458a4234

BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index · a2a8216b

unknown authored Sep 21, 2005

statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)

include/myisam.h:
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
myisam/mi_check.c:
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
myisam/myisamchk.c:
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
mysql-test/r/myisam.result:
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
mysql-test/t/myisam.test:
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/ha_myisam.cc:
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/handler.h:
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/mysqld.cc:
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/set_var.cc:
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/sql_class.h:
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

a2a8216b

Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1818ff1c
unknown authored Sep 20, 2005
```
into  selena.:H:/MYSQL/src/#12929-mysql-4.1


include/my_sys.h:
  Auto merged
```
1818ff1c
Small update for lock functions used in my_cgets() · ac604f71
unknown authored Sep 20, 2005

ac604f71
Bug #10694 LOAD DATA FROM INFILE fails with 'Out of operation records' · 3ce33c2c
unknown authored Sep 20, 2005

3ce33c2c

19 Sep, 2005 7 commits

Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5cf25d80
unknown authored Sep 19, 2005
```
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
```
5cf25d80
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f903f8e3
unknown authored Sep 19, 2005
```
into moonbone.local:/work/13218-bug-4.1-mysql
```
f903f8e3
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · d9315344
unknown authored Sep 19, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysqltest.c:
  Merged from 4.0.
```
d9315344
Fixed Bug#13275 mysqltest empty file bug · a8980733
unknown authored Sep 19, 2005

a8980733

mysql-test-run.pl: · 5df7f93d

unknown authored Sep 19, 2005

  Added flag --valgrind-mysqltest


mysql-test/mysql-test-run.pl:
  Added flag --valgrind-mysqltest

5df7f93d

bug#9282 - ndb · 7150244e

unknown authored Sep 19, 2005

  big delete from causing NdbObjectIdMap::expand at same time 
  as receiver thread perform getObjectId 


ndb/src/ndbapi/Ndbinit.cpp:
  Protect NdbObjectIdMap::expand from getObjectId
ndb/src/ndbapi/ObjectMap.hpp:
  Protect NdbObjectIdMap::expand from getObjectId

7150244e

Fix bug #13218: InnoDB: using a partial-field key prefix in search · 5bc45012

unknown authored Sep 19, 2005

  
This is backport from 5.0 of fix for bug #11039


mysql-test/t/innodb.test:
  Backport from 5.0 of test case for bug#11039
mysql-test/r/innodb.result:
  Backport from 5.0 of test case for bug#11039
sql/opt_sum.cc:
  Fix bug #13218:  backport from 5.0 of bug #11039 fix

5bc45012

18 Sep, 2005 4 commits

Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 · 4014d76c
unknown authored Sep 18, 2005
```
into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
```
4014d76c
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0 · 766eaf6b
unknown authored Sep 18, 2005
```
into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
```
766eaf6b

.del-which.2~463417adb2e37122: · 8618ea63

unknown authored Sep 18, 2005

  Delete: man/which.2


BitKeeper/deleted/.del-which.2~463417adb2e37122:
  Delete: man/which.2

8618ea63

Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 · ce7e95d4

unknown authored Sep 17, 2005

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139


mysql-test/r/rpl_multi_delete2.result:
  Auto merged
mysql-test/t/rpl_multi_delete2-slave.opt:
  Auto merged
mysql-test/t/rpl_multi_delete2.test:
  Auto merged

ce7e95d4

16 Sep, 2005 1 commit

mysql-test-run.pl: · d6afdcb7

unknown authored Sep 17, 2005

  Enabled --valgrind to work (bug#13280)


mysql-test/mysql-test-run.pl:
  Enabled --valgrind to work (bug#13280)

d6afdcb7

15 Sep, 2005 9 commits

Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating · 627bf43d

unknown authored Sep 16, 2005

a restriction to 255 chars for editable buffer.


VC++Files/mysys/mysys.dsp:
  Added my_conio.c
VC++Files/mysys/mysys_ia64.dsp:
  Added my_conio.c
include/my_sys.h:
  Added declarations for my_conio.c functions
mysys/my_conio.c:
  Added _cgets() replacement that is not limited to 255 chars retrieval
  from win32 console.

627bf43d

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

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

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

14 Sep, 2005 9 commits

Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 · aba5027e
unknown authored Sep 14, 2005
```
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
```
aba5027e
Merge mysql.com:/home/mydev/mysql-4.1 · 6a47ca25
unknown authored Sep 14, 2005
```
into  mysql.com:/home/mydev/mysql-4.1-4100
```
6a47ca25
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3be8c907
unknown authored Sep 14, 2005
```
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139


sql/sql_parse.cc:
  Auto merged
```
3be8c907

fix for BUG#11139 (multi-delete with alias breaking replication if table rules are · f89424f8

unknown authored Sep 14, 2005

 present): the problem originally was that the tables in auxilliary_tables did not have 
the correct real_name, which caused problems in the second call to tables_ok(). 
The fix corrects the real_name problem, and also sets the updating flag properly, 
which makes the second call to tables_ok() unnecessary.


mysql-test/r/rpl_multi_delete2.result:
  updates for for BUG#11139
mysql-test/t/rpl_multi_delete2-slave.opt:
  updates for for BUG#11139
mysql-test/t/rpl_multi_delete2.test:
  updates for for BUG#11139
sql/mysql_priv.h:
  fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
   present)
sql/slave.cc:
  fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
   present)
sql/sql_parse.cc:
  fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
   present)
sql/sql_yacc.yy:
  fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
   present)

f89424f8

Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent). · abd4974f

unknown authored Sep 14, 2005


mysql-test/lib/mtr_process.pl:
  Handle errors in child processes separate from the parent process (patch supplied by Kent).
mysql-test/lib/mtr_report.pl:
  New function to handle errors in child processes separate from the parent process (patch supplied by Kent).
  Expected to avoid HUP signals.

abd4974f

Bug#12920 - key_read_requests counter appears to re-set · 5fe65297

unknown authored Sep 14, 2005

After merge fix.


include/keycache.h:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Enlarging them there.
include/my_sys.h:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Removed unused global variables.
myisam/mi_test2.c:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Changed to print default key cache status.
mysys/mf_keycache.c:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Changed their debug printout.
sql/mysqld.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Changed to print full value.
sql/sql_show.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Added a branch for long long values.
sql/sql_test.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  changed to print full values.
sql/structs.h:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Added a branch for long long keycache values.

5fe65297

Minor output format change of the Perl test suite script (align with the shell script). · a5903ed9

unknown authored Sep 14, 2005

mysql-test/lib/mtr_report.pl:
Make the Perl test script output identical to that of the (old) shell script,
so that reported differences compare as equal strings (for automatic analysis).

a5903ed9

Merge mysql.com:/home/mydev/mysql-4.0-4000 · 683e228a

unknown authored Sep 14, 2005

into  mysql.com:/home/mydev/mysql-4.1-4100


include/my_sys.h:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
myisam/mi_test2.c:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
mysys/mf_keycache.c:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
sql/mysqld.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
sql/sql_test.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.

683e228a

Bug#12920 - key_read_requests counter appears to re-set · 07b61cbb
unknown authored Sep 14, 2005
```
Enlarged the counter variables to ulonglong.
```
07b61cbb

13 Sep, 2005 4 commits
- Merge mysql.com:/home/mydev/mysql-4.0-4000 · 1d175fd9
  unknown authored Sep 13, 2005
```
into  mysql.com:/home/mydev/mysql-4.1-4100


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
```
  1d175fd9
- Bug#12845 - Stress test: Server crashes on CREATE .. SELECT statement · 3884629d
  unknown authored Sep 13, 2005
```
Solution for 4.0 and 4.1.
If the caller cannot re-open table(s), it gives a NULL
'refresh' argument to open_table(). We used to ignore
flushes then. Now we ignore drops too.
```
  3884629d
- Merged code. Removed unneccessary repeating. · 02fce1c3
  unknown authored Sep 13, 2005
  
  02fce1c3
- minor compile error fix · b51879f1
  unknown authored Sep 13, 2005
  
  b51879f1