Commit graph

11755 commits

Author SHA1 Message Date
unknown
331ff0d8f5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-20 15:49:55 +01:00
unknown
02d2d70cb1 The automatic DROP TEMPORARY TABLE is now DROP TEMPORARY TABLE IF EXISTS,
this is better in this case:
- imagine user1 has created a temp table
- imagine user2 does FLUSH TABLES WITH READ LOCK, then takes a backup,
then RESET MASTER then UNLOCK TABLES, like mysqldump --first-slave
- then in the binlog you will finally have the DROP TEMPORARY TABLE,
but not the CREATE TEMPORARY TABLE, so when you later restore with
mysqlbinlog|mysql, mysql will complain that table does not exist.
Replication was already protected of this (it processes DROP TEMPORARY
TABLE as if there was a IF EXISTS), now I add it directly to the query
for mysqlbinlog|mysql to work.


mysql-test/r/drop_temp_table.result:
  result update (query changed)
2004-03-20 15:49:17 +01:00
unknown
b399754780 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/set_var.cc:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
2004-03-20 14:36:49 +01:00
unknown
eb3ded5665 select @@smth=@@sys_str_var crash fixed
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
2004-03-20 14:36:00 +01:00
unknown
9876b6a7ac Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
2004-03-20 14:36:58 +02:00
unknown
7699bb4784 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1


sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2004-03-20 13:37:30 +02:00
unknown
f379d7b172 after review changes
sql/item.cc:
  removed double_fix & already_fixed in Item_field
sql/item.h:
  added quick_fix_field() for cases when we are sure that no need full fix_field processing
  fixed neg() method for numeric constants to have the same logic as constant parser
  Item_null, Item_real, ... are constant which are fixed by creation
sql/item_cmpfunc.h:
  right fix_fields in and_conds call
sql/item_func.cc:
  changed Item_field constructor call
  fix_field emulation call
sql/item_strfunc.cc:
  correct layout
sql/item_subselect.cc:
  correct layout
  changed Item_field constructor call
sql/item_sum.cc:
  changed Item_field constructor call
sql/item_sum.h:
  changed Item_field constructor call
sql/sql_base.cc:
  fixed layout
  right fix_fields calls
sql/sql_help.cc:
  changed Item_field constructor call
sql/sql_load.cc:
  changed Item_field constructor call
sql/sql_parse.cc:
  constant changed
sql/sql_select.cc:
  fixed layout
  fix_field emulation insted of real fix_fields call
sql/sql_show.cc:
  changed Item_field constructor call
sql/sql_union.cc:
  changed Item_field constructor call
  double_fix removed
sql/sql_update.cc:
  renamed variable, fixed layout
sql/sql_yacc.yy:
  typo fixed
  fix_fields emulation calls
  hegation of numbers fixed
2004-03-20 13:36:26 +02:00
unknown
2d20eddcbb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-20 12:50:12 +02:00
unknown
612c949418 Merge mysql.com:/home/my/mysql-4.0 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
2004-03-20 12:49:17 +02:00
unknown
609df31197 Ensure that we use unix file format (no \r\n) for all new files
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
2004-03-20 12:48:14 +02:00
unknown
3e5f1eaecf 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


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
2004-03-20 06:09:18 +02:00
unknown
72d15bccaa btr0btr.c:
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
2004-03-19 22:51:25 +02:00
unknown
eb72cf6649 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-03-19 18:57:45 +01:00
unknown
a53fc49e80 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2004-03-19 18:50:18 +01:00
unknown
84418a9edc - 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)


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)
2004-03-19 18:49:14 +01:00
unknown
fd15d5ae1f Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-19 18:09:32 +01:00
unknown
c56697f095 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-19 17:37:36 +01:00
unknown
380bd1d909 merge with 4.0 to get portability fixes
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
2004-03-19 18:35:49 +02:00
unknown
28813a9ea9 Added test to show bug in current union implementation
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
2004-03-19 18:33:38 +02:00
unknown
86ae07cd24 Portability fixes
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
2004-03-19 18:26:02 +02:00
unknown
88267ae534 typo in mysql_install_db fixed
scripts/mysql_install_db.sh:
  typo fixed
  (thanks Alex Dupre <ale@FreeBSD.org> for noticing this!)
2004-03-19 17:19:33 +01:00
unknown
4bfa7a0122 Minor changes to fix Windows project files
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
2004-03-19 14:43:04 -01:00
unknown
5395e2e08a DROP DATABASE now returns (affected_rows) number of tables dropped 2004-03-19 16:43:03 +01:00
unknown
85c7ce3687 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1648
2004-03-19 15:02:26 +01:00
unknown
67ea8aac5e merge with 4.0 (to get compiler error fixes for innodb)
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
2004-03-19 15:17:56 +02:00
unknown
6b46555767 Removed \r 2004-03-19 15:03:12 +02:00
unknown
9935110b30 Portability fixes
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
2004-03-19 14:52:48 +02:00
unknown
1653cdde19 uca-dump.c:
new file
2004-03-19 16:29:37 +04:00
unknown
00ff1f609e Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-19 13:04:46 +02:00
unknown
d212d76094 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-19 14:36:12 +04:00
unknown
433c2bf535 Fix for bug#1439 UDF Corruption 2004-03-19 14:35:00 +04:00
unknown
6c937d7153 Fix for the bug #2976: NATURAL JOIN produces duplicate columns.
Improvement natural join code in the setup_conds(). 


mysql-test/r/join.result:
  Fix for the bug #2976: NATURAL JOIN produces duplicate columns
mysql-test/r/join_outer.result:
  Fix for the bug #2976: NATURAL JOIN produces duplicate columns
mysql-test/r/select.result:
  Fix for the bug #2976: NATURAL JOIN produces duplicate columns
2004-03-19 12:36:55 +04:00
unknown
54735ae3a9 Bug #3087 CONCAT_WS makes the server die in case of illegal mix of collations 2004-03-19 12:09:14 +04:00
unknown
8bbb6d2b42 Bug #2821 Table default character set affects LONGBLOB fields 2004-03-19 11:37:49 +04:00
unknown
bf4e1d4681 min_sort_char was added, for the future UCA implementation.
UCS2 now has its own my_like_range function.
2004-03-19 10:00:46 +04:00
unknown
44452dfa77 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-03-18 22:48:37 +01:00
unknown
9081ad1245 - reverted use of AC_CONFIG_SUBDIRS for BDB for now (it somehow did
not work as expected) - need to investigate (after 4.1.2 is released)
2004-03-18 22:46:41 +01:00
unknown
1450ee3a67 Fix for BUG#3214 "mysqlbinlog --read-from-remote-server --position prints wrong positions"
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.
2004-03-18 20:53:33 +02:00
unknown
a068b4a755 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1


client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
2004-03-18 19:31:06 +02:00
unknown
83e696e61c Fix for BUG#3204 ""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs":
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
2004-03-18 19:29:07 +02:00
unknown
647498e965 fixed signed numeric literal parsing
sql/item.h:
  added negation methods for numeric Items
sql/sql_yacc.yy:
  fixed numeric literal
2004-03-18 18:27:03 +02:00
unknown
5b540f0555 WL#1648 - Start/Stop Inserting Duplicates Into a Table 2004-03-18 16:47:16 +01:00
unknown
85dddd908a merge
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-03-18 15:21:06 +02:00
unknown
1a81e04145 DBUG_ASSERT(fixed == 1); added to val*
small optimisation in signed_literal


sql/field.cc:
  layout fixed
sql/item.cc:
  DBUG_ASSERT(fixed == 1); added to val*
  layout fixed
  fixed= 1; added where it was forgoten in fix_fields
  Item_string can be used without fix_fields
sql/item.h:
  DBUG_ASSERT(fixed == 1); added to val*
  Item_string can be used without fix_fields
sql/item_cmpfunc.cc:
  DBUG_ASSERT(fixed == 1); added to val*
sql/item_cmpfunc.h:
  fixed layout and getting Item statistic
sql/item_func.cc:
  DBUG_ASSERT(fixed == 1); added to val*
sql/item_func.h:
  DBUG_ASSERT(fixed == 1); added to val*
sql/item_geofunc.cc:
  DBUG_ASSERT(fixed == 1); added to val*
sql/item_strfunc.cc:
  DBUG_ASSERT(fixed == 1); added to val*
  layout fixed
sql/item_strfunc.h:
  DBUG_ASSERT(fixed == 1); added to val*
sql/item_subselect.cc:
  DBUG_ASSERT(fixed == 1); added to val*
sql/item_sum.cc:
  DBUG_ASSERT(fixed == 1); added to val*
sql/item_sum.h:
  DBUG_ASSERT(fixed == 1); added to val*
sql/item_timefunc.cc:
  DBUG_ASSERT(fixed == 1); added to val*
sql/item_timefunc.h:
  DBUG_ASSERT(fixed == 1); added to val*
sql/item_uniq.h:
  DBUG_ASSERT(fixed == 1); added to val*
sql/sql_base.cc:
  Item creation revised
sql/sql_help.cc:
  Item creation revised
sql/sql_load.cc:
  Item creation revised
sql/sql_parse.cc:
  fix_field call added
sql/sql_select.cc:
  Item creation revised
sql/sql_show.cc:
  Item creation revised
sql/sql_union.cc:
  Item creation revised
sql/sql_update.cc:
  Item creation revised
sql/sql_yacc.yy:
  Item creation revised
  small optimisation in signed_literal
2004-03-18 15:14:36 +02:00
unknown
bffc3339c5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-18 14:57:23 +02:00
unknown
3caab0f327 trx0undo.h, trx0undo.c, 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/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
2004-03-18 14:57:22 +02:00
unknown
cabf982953 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-18 14:54:12 +02:00
unknown
5b624042b8 Removed compiler warning
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
2004-03-18 14:53:38 +02:00
unknown
257d8ede4b Fix for #3188
mysql-test/r/subselect.result:
  appropriate test result
mysql-test/t/subselect.test:
  test case
sql/item.cc:
  we can get NULL here if the field isn't unique
2004-03-18 16:49:48 +04:00
unknown
27d2014109 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-03-18 13:17:44 +01:00