mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
11618 commits 2781 branches 343 tags 1.6 GiB
Commit graph

2985 commits

Author SHA1 Message Date
unknown
152df24f76 small addition to the fix for #3188 
dropping of tables added to the testcase


mysql-test/r/subselect.result:
  result fixed
mysql-test/t/subselect.test:
  dropping added
 2004-03-23 18:25:44 +04:00
unknown
b02e83becf Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.3188


sql/item.cc:
  Auto merged
 2004-03-23 13:09:50 +04:00
unknown
a25455eea5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.3067
 2004-03-23 11:58:04 +04:00
unknown
a0d0da6f26 Fix for #3067 (REPAIR TABLE reenables disabled keys) 
myisam/mi_check.c:
  we only restore key_map if it's required
mysql-test/r/repair_part1.result:
  appropriate test result
mysql-test/t/repair_part1.test:
  test case
 2004-03-22 21:34:36 +04:00
unknown
a0dce8c864 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean


sql/item.cc:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
 2004-03-22 17:48:29 +04:00
unknown
560fc0379b aliases should be compared with my_strcasecmp (BUG#3251) 
some db comparison code cleupup
removed compiler warnings


mysql-test/r/lowercase_table.result:
  test for BUG#3251
mysql-test/t/lowercase_table.test:
  test for BUG#3251
sql/item.cc:
  simple strcmp can be used for db name comparison
sql/set_var.h:
  changed initialisation order to satisfy compiler
sql/sql_cache.cc:
  simple strcmp can be used for db name comparison
sql/sql_db.cc:
  better use special cherset for files
sql/sql_parse.cc:
  simple strcmp can be used for db name comparison
  aliases should be compared with my_strcasecmp
sql/sql_select.cc:
  aliases should be compared with my_strcasecmp
 2004-03-22 15:43:13 +02:00
unknown
afbf1bbaa4 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/sql_parse.cc:
  Auto merged
 2004-03-21 16:39:37 +02:00
unknown
5764e4f684 after merge changes 2004-03-21 16:39:14 +02:00
unknown
81836c8ec3 more sys_var_str fixes 
mysql-test/r/variables.result:
  more tests
mysql-test/t/variables.test:
  more tests
sql/set_var.cc:
  don't crash on NULL
 2004-03-20 17:08:01 +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
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
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
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
5395e2e08a DROP DATABASE now returns (affected_rows) number of tables dropped 2004-03-19 16:43:03 +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
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
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
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
ee63578fe2 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_db.cc:
  Auto merged
 2004-03-18 11:04:36 +01:00
unknown
84b256013b make DROP DATABASE to behave as documented in the manual - to report number of files deleted 2004-03-18 11:03:24 +01:00
unknown
f107cb7098 Don't change server suffix if given to configure 
Portability fixes


client/mysqltest.c:
  Fixed output of 'affected rows'
innobase/os/os0file.c:
  Portability fix (for AIX)
mysql-test/r/rpl_trunc_binlog.result:
  Update results after merge
sql/mysqld.cc:
  Don't change server suffix if given to configure
 2004-03-18 01:48:46 +02:00
unknown
24148f04c7 merge fixes (use old code) 
client/mysqladmin.c:
  Auto merged
client/mysqltest.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2004-03-18 00:16:04 +02:00
unknown
022c5241a9 after merge fixes 
include/my_tree.h:
  After merge fixes
mysql-test/r/create.result:
  After merge fixes
mysql-test/r/insert.result:
  After merge fixes
mysql-test/r/multi_update.result:
  After merge fixes
mysql-test/r/query_cache.result:
  After merge fixes
mysql-test/r/rpl_error_ignored_table.result:
  After merge fixes
mysql-test/r/rpl_optimize.result:
  After merge fixes
mysql-test/r/show_check.result:
  After merge fixes
mysql-test/t/insert.test:
  After merge fixes (Remove columns with space last)
mysql-test/t/multi_update.test:
  After merge fixes
mysql-test/t/show_check.test:
  After merge fixes
sql/field.cc:
  Remove compiler warnings
sql/sql_base.cc:
  Fix bug when table was refreshed
 2004-03-18 00:09:13 +02:00
unknown
d730756649 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
 2004-03-17 21:04:49 +04:00
unknown
6fd2a7bcba fixed structure error from last merge for bug #2874 
BitKeeper/deleted/.del-system_mysql_db.test~f5a7ec0e9440c043:
  Delete: mysql-test/t/reserv/system_mysql_db.test
BitKeeper/deleted/.del-system_mysql_db_fix.test~180b2fd4873a9c49:
  Delete: mysql-test/t/reserv/system_mysql_db_fix.test
BitKeeper/deleted/.del-system_mysql_db_fix-master.opt~2897a9ebb17f930e:
  Delete: mysql-test/t/reserv/system_mysql_db_fix-master.opt
BitKeeper/deleted/.del-system_mysql_db_refs.test~e5bffdb55190a23c:
  Delete: mysql-test/t/reserv/system_mysql_db_refs.test
 2004-03-17 21:01:07 +04:00
unknown
8bdbfee96b merge 
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/subselect.result:
  resolving conflicts
mysql-test/t/subselect.test:
  resolving conflicts
 2004-03-17 18:57:51 +04:00
unknown
47f561de04 Added test case for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk; 
(thankee Monty)


mysql-test/r/order_by.result:
  Added test case for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
mysql-test/t/order_by.test:
  Added test case for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
 2004-03-17 18:43:58 +04:00
unknown
0de92f8255 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
 2004-03-17 16:19:52 +04:00
unknown
ca0ece1374 Fix for bug#3086: SHOW GRANTS doesn't follow ANSI_QUOTES 2004-03-17 16:19:09 +04:00
unknown
48121583e7 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.233


sql/field.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
 2004-03-17 14:04:02 +04:00
unknown
e308d66aad Fix for #233 
test for IGNORE added


mysql-test/r/gis.result:
  test result for IGNORE added
mysql-test/t/gis.test:
  test for IGNORE added
 2004-03-17 14:03:26 +04:00
unknown
8b623739ef Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-03-17 10:35:55 +01:00
unknown
9d78adc16f Fix for BUG#2922 "Crash (signal11) after "load data from master"" 
with a testcase.
We needed to init_master_info before we flush_master_info
in LOAD DATA FROM MASTER.


mysql-test/r/rpl000009.result:
  result update
mysql-test/t/rpl000009.test:
  adding a test for RESET SLAVE + LOAD DATA FROM MASTER
sql/repl_failsafe.cc:
  LOAD DATA FROM MASTER udpates the master info in the slave,
  so needs to ensure that it is properly inited first
  (otherwise, after RESET SLAVE, we are flush_io_cache()ing
  an uninitialized IO_CACHE master.info).
  Note that it master info is already inited (active_mi->inited==1),
  init_master_info() will do nothing, which is what we want.
 2004-03-17 10:35:03 +01:00
unknown
219bbd5232 merge with 4.0 
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/include/log0log.h:
  Auto merged
innobase/include/log0log.ic:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/page/page0cur.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
 2004-03-17 10:36:12 +02:00
unknown
a8aacf8764 merge with 4.0 
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-com0shm.c~6a16f0c3d81de1f:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
extra/replace.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/configure.in:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/dict/dict0boot.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/dict/dict0mem.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/ha/hash0hash.c:
  Auto merged
innobase/include/btr0btr.ic:
  Auto merged
innobase/include/data0type.ic:
  Auto merged
innobase/include/dict0mem.h:
  Auto merged
innobase/include/log0log.ic:
  Auto merged
innobase/include/mach0data.ic:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/include/row0upd.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/include/trx0rseg.ic:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/mtr/mtr0log.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/page/page0cur.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/read/read0read.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/rem/rem0rec.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0purge.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0undo.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/thr/thr0loc.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/rpl_error_ignored_table.result:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/mf_pack.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
tests/thread_test.c:
  Auto merged
client/mysqldump.c:
  Keep original indentation
mysql-test/r/merge.result:
  keep old file
scripts/mysql_fix_privilege_tables.sh:
  Keep old structure in merge with 4.0
sql/table.cc:
  merge with 4.0 + simple optimizations
 2004-03-16 22:41:30 +02:00
unknown
f2f9b653ee Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1


sql/item_func.cc:
  Auto merged
 2004-03-16 20:55:51 +02:00
unknown
f0587eeaa6 merge 
sql/sql_select.cc:
  Auto merged
 2004-03-16 20:23:07 +02:00
unknown
71c61a9ebe after review & some other fixes 
mysql-test/r/subselect.result:
  after merge fix
sql/item_func.cc:
  fixed used_tables_cache
sql/item_func.h:
  fixed used_tables_cache
sql/sql_select.cc:
  removed != and !
 2004-03-16 20:19:36 +02:00
unknown
cb3cb957b2 uuid() tests 2004-03-16 16:35:53 +01:00
unknown
1f0b9d14c3 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
 2004-03-16 16:35:52 +01:00
unknown
8242d1f19d 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-16 17:35:50 +02:00
unknown
22da65838d merge 
sql/sql_yacc.yy:
  Auto merged
 2004-03-16 17:35:49 +02:00
unknown
9c6b9eba65 EOVERFLOW moved to my_base.h - it is used not only in strtod.c 
error message corrected


include/my_base.h:
  EOVERFLOW moved to my_base.h - it is used not only in strtod.c
mysql-test/r/variables.result:
  error message corrected
mysql-test/t/variables.test:
  error message corrected
sql/item_func.cc:
  error message corrected
sql/sql_yacc.yy:
  error message corrected
strings/strtod.c:
  EOVERFLOW moved to my_base.h - it is used not only in strtod.c
 2004-03-16 16:35:47 +01:00