into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/set_var.cc:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged

mysql-test/r/variables.result:
  new test
mysql-test/t/ctype_utf8.test:
  typos fixed
mysql-test/t/variables.test:
  new test
sql/mysqld.cc:
  sys_str_var->value must be not NULL
sql/set_var.cc:
  initialize sys_str_var->value from a constructor
sql/set_var.h:
  initialize sys_str_var->value from a constructor

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

innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
mysys/mf_soundex.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged

Portability fixes


mysql-test/resolve-stack:
  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/connect.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/constraints.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/count_distinct3.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_big5.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_collate.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_create.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_many.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_mb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_recoding.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_ucs.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_ujis.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_utf8.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/date_formats-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/date_formats.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/drop_temp_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/fulltext2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_compress.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_concat.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_default.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_encrypt-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_gconcat.test:
  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/func_sapdb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/gcc296.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/gis-rtree.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/gis.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant2.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/heap_auto_increment.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/heap_btree.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/heap_hash.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/help.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/init_connect-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/init_connect.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_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/insert_update.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/isam.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/key_cache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/key_cache.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/lowercase_table_qcache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table_qcache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/mix_innodb_myisam_binlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/multi_statement.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/negation_elimination.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/packet.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/preload.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/repair_part1.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/row.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl000001-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_do_grant.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_flush_tables.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_init_slave-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_init_slave.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_insert_id-slave.opt:
  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_misc_functions-slave.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_misc_functions.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_update.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_openssl.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_optimize.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_relayrotate-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_relayrotate.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_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_temporary.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_trunc_binlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_until.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_user_variables.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sql_mode.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/subselect.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/subselect2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/subselect_innodb.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/type_nchar.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/type_set.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/union-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/variables-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/warnings-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/r/ansi.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/bdb-deadlock.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/bdb_cache.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/bool.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/cast.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/check_var_limit.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/connect.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/constraints.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/count_distinct3.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_big5.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_collate.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_cp1251.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_create.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_latin1_de.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_mb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_recoding.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_tis620.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_ucs.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_ujis.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/ctype_utf8.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/date_formats.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/delete.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/drop_temp_table.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/errors.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/foreign_key.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/fulltext2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/func_compress.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/func_concat.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/func_default.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/func_gconcat.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/func_if.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/func_isnull.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/func_sapdb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/gcc296.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/gis-rtree.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/gis.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/grant.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/grant2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/grant_cache.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/have_big5.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/have_compress.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/have_crypt.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/have_met_timezone.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/have_query_cache.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/have_tis620.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/have_ucs2.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/have_ujis.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/heap_auto_increment.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/heap_btree.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/heap_hash.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/help.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/init_connect.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/innodb-deadlock.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/innodb_cache.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/innodb_handler.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/insert_update.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/isam.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/key_cache.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/loaddata.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/lock_multi.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/lock_tables_lost_commit.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/lowercase0.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/lowercase2.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/lowercase_table.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/lowercase_table2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/lowercase_table3.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/lowercase_table_qcache.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/mix_innodb_myisam_binlog.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/multi_statement.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/myisam-blob.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/mysqlbinlog.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/mysqldump.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/negation_elimination.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/not_embedded.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/overflow.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/packet.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/preload.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/query_cache.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/query_cache_merge.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/repair_part1.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/repair_part2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/row.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_EE_error.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_alter.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_chain_temp_table.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_change_master.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_do_grant.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_empty_master_crash.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_error_ignored_table.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_failsafe.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_flush_log_loop.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_flush_tables.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_get_lock.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_heap.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_ignore_grant.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_init_slave.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_insert_id.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_loaddata.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_loaddata_rule_m.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_loaddata_rule_s.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_loaddatalocal.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_master_pos_wait.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_max_relay_size.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_misc_functions.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_multi_delete.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_multi_update.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_openssl.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_optimize.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_relayrotate.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_relayspace.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_reset_slave.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_skip_error.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_temporary.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_trunc_binlog.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_until.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_user_variables.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sql_mode.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/subselect.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/subselect2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/subselect_innodb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/system_mysql_db.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/system_mysql_db_refs.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/timezone.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/true.require:
  Turn off EOLN_NATIVE flag
mysql-test/r/type_nchar.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/type_set.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/warnings.result:
  Turn off EOLN_NATIVE flag
BitKeeper/etc/config:
  Ensure that we use unix file format (no \r\n) for all new files
client/mysqltest.c:
  Fix for previous push (long delimiters)
mysql-test/r/derived.result:
  Fixed results
mysql-test/r/rpl000009.result:
  Fixed results
mysql-test/t/derived.test:
  Make test portable (for lower_case_table_names=2)
mysql-test/t/rpl000009.test:
  After merge fix

  Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key


innobase/btr/btr0btr.c:
  Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key

  Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key
btr0cur.c:
  Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record


innobase/btr/btr0cur.c:
  Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record
innobase/btr/btr0btr.c:
  Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key

into mysql.com:/space/my/mysql-4.0

into mysql.com:/space/my/mysql-4.0-build

   "-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
   Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
   how we name all other packages)


Build-tools/Do-pkg:
   - PGK and DMG names now include the full arch name (e.g. 
     "-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
     Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
     how we name all other packages)

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged

After merge fixes
Portability fixes


client/mysqltest.c:
  Fixed that unget() is done properly (needed for QNX where one can't do many ungetc() in a row)
include/errmsg.h:
  After merge fixes
mysql-test/mysql-test-run.sh:
  merge fix
mysql-test/r/system_mysql_db.result:
  Updated results for 4.1
mysql-test/r/union.result:
  Added new test
mysql-test/t/derived.test:
  Portability fix (for Mac OS X)
mysql-test/t/system_mysql_db_refs.test:
  Remove warnings
mysql-test/t/union.test:
  Added test to show bug in current union implementation (to be fixed in 4.1)
scripts/mysql_create_system_tables.sh:
  Fix wrong column define
scripts/mysql_fix_privilege_tables.sh:
  Fix for mysql-test-run
scripts/mysql_fix_privilege_tables.sql:
  Merge with 4.0 to get comments.
  Updated so that it works with privilege tables for MySQL 3.23.
sql/repl_failsafe.cc:
  After merge fix

Fixed some wrong column specifications in mysql_fix_privilege_tables


mysql-test/mysql-test-run.sh:
  Portability fix
mysql-test/r/func_math.result:
  portability fix
mysql-test/r/rpl_error_ignored_table.result:
  portability fix
mysql-test/t/func_math.test:
  portability fix
mysql-test/t/rpl_error_ignored_table.test:
  portability fix
scripts/mysql_fix_privilege_tables.sh:
  func.name was not generated correctly
scripts/mysql_fix_privilege_tables.sql:
  Fixed some wrong column specifications

scripts/mysql_install_db.sh:
  typo fixed
  (thanks Alex Dupre <ale@FreeBSD.org> for noticing this!)

BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
  Delete: VC++Files/libmysql/libmysql.def
VC++Files/client/mysqlclient.dsp:
  Add strtod.c to get rid of linker errors
VC++Files/mysql.dsw:
  Add dependency on mysys for batch build

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

client/mysqltest.c:
  Auto merged
include/errmsg.h:
  Auto merged
include/mysql_version.h.in:
  Auto merged
innobase/que/que0que.c:
  Auto merged
mysql-test/t/rpl000009.test:
  Auto merged
sql/set_var.cc:
  Auto merged
libmysql/errmsg.c:
  merge with 4.0
libmysql/libmysql.c:
  merge with 4.0
mysql-test/mysql-test-run.sh:
  merge with 4.0
mysql-test/r/rpl000009.result:
  merge with 4.0
scripts/mysql_fix_privilege_tables.sh:
  merge with 4.0
sql/repl_failsafe.cc:
  merge with 4.0

Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work


client/mysqltest.c:
  More debug information
innobase/que/que0que.c:
  Fixed wrong usage of __attribute
mysql-test/mysql-test-run.sh:
  Portability fix; Added CLIENT_BINDIR
mysql-test/t/system_mysql_db_fix.test:
  Removed \r
mysql-test/t/system_mysql_db_refs.test:
  Removed \r
scripts/mysql_fix_privilege_tables.sh:
  Don't set root password from first option
  Added --bindir option

  new file

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

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear

UCS2 now has its own my_like_range function.

into mysql.com:/space/my/mysql-4.1-build

   not work as expected) - need to investigate (after 4.1.2 is released)

I am fixing it here in 4.1, not in 4.0, as it goes with another change
which I did in 4.1 (fix for BUG#3204
""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs").


client/mysqlbinlog.cc:
  correcting code to compute the position right when we are reading
  a remote binlog.

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


client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged

we now detect that the server is sending us a log which we did not request
by testing the info in the fake Rotate event.
I also changed code to not print the fake Rotate which describes the
log we asked for (it's always the first received event but old masters
may not send it).


client/mysqlbinlog.cc:
  Detect when the master is sending us a binlog which we have not requested,
  then stop.
  Skip the fake Rotate event if there is one (there may be none if
  the server to which we connect is < 4.0.14).
mysql-test/r/mysqlbinlog.result:
  result update: master-bin.000002 is not printed anymore (as mysqlbinlog
  stops at the end of the requested log, master-bin.000001).
mysql-test/t/mysqlbinlog.test:
  comment is wrong now

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

  Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work


innobase/trx/trx0trx.c:
  Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work
innobase/trx/trx0undo.c:
  Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work
innobase/include/trx0undo.h:
  Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work

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

Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X


include/m_ctype.h:
  Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
include/mysql.h:
  Removed compiler warning
libmysqld/lib_sql.cc:
  Removed compiler warning
mysys/charset2html.c:
  Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
regex/regcomp.c:
  Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
sql-common/client.c:
  Indentation fix