mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Ensure that we use unix file format (no \r\n) for all new files

Browse source 
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
This commit is contained in:
unknown 2004-03-20 12:48:14 +02:00
commit 609df31197
6 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/config
View file

@ -71,3 +71,4 @@ hours:
[arjen:]checkout:get
[nick:]checkout:get
checkout:edit
eoln:unix

15
client/mysqltest.c
View file

@ -1662,16 +1662,16 @@ int do_while(struct st_query* q)
happen for any tests in the test suite.
*/
char my_getc(FILE *file)
int my_getc(FILE *file)
{
if (line_buffer_pos == line_buffer)
return fgetc(file);
return line_buffer[--line_buffer_pos];
return *--line_buffer_pos;
}
void my_ungetc(int c)
{
line_buffer[line_buffer_pos++]= c;
*line_buffer_pos++= (char) c;
}
@ -1692,8 +1692,9 @@ my_bool end_of_query(int c)
return 1; /* Found delimiter */
/* didn't find delimiter, push back things that we read */
for (j = 1 ; j <= i ; j++)
my_ungetc(tmp[j]);
my_ungetc(c);
while (i > 1)
my_ungetc(tmp[--i]);
return 0;
}
@ -2396,9 +2397,6 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
}
}
if (glob_replace)
free_replace();
if (record)
{
if (!q->record_file[0] && !result_file)
@ -2419,6 +2417,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
mysql_error(mysql);
end:
free_replace();
last_result=0;
if (ds == &ds_tmp)
dynstr_free(&ds_tmp);

4
mysql-test/r/derived.result
View file

@ -271,8 +271,8 @@ delete P1.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Cou
select * from t1;
N M
3 0
delete P1.*,P2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;
ERROR HY000: The target table P2 of the DELETE is not updatable
delete P1.*,p2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS p2 ON P1.N = p2.N;
ERROR HY000: The target table p2 of the DELETE is not updatable
delete P1.* from `t1` AS P1 INNER JOIN (SELECT aaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;
ERROR 42S22: Unknown column 'aaa' in 'field list'
drop table t1;

12
mysql-test/r/rpl000009.result
View file

@ -112,6 +112,18 @@ n s
2 two test
3 three test
4 four test
stop slave;
reset slave;
load data from master;
start slave;
insert into mysqltest.t1 values (5, 'five bar');
select * from mysqltest.t1;
n s
1 one test
2 two test
3 three test
4 four test
5 five bar
load table mysqltest.t1 from master;
ERROR 42S01: Table 't1' already exists
drop table mysqltest.t1;

2
mysql-test/t/derived.test
View file

@ -157,8 +157,8 @@ UPDATE `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1)
UPDATE `t1` AS P1 INNER JOIN (SELECT aaaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N SET P1.M = 2;
delete P1.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;
select * from t1;
--error 1288
--replace_result P2 p2
--error 1288
delete P1.*,P2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;
-- error 1054
delete P1.* from `t1` AS P1 INNER JOIN (SELECT aaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;

4
mysql-test/t/rpl000009.test
View file

@ -127,11 +127,11 @@ load data from master;
start slave;
# see if replication coordinates were restored fine
connection master;
insert into bar.t1 values (5, 'five bar');
insert into mysqltest.t1 values (5, 'five bar');
save_master_pos;
connection slave;
sync_with_master;
select * from bar.t1;
select * from mysqltest.t1;
# Check that LOAD DATA FROM MASTER reports the error if it can't drop a
# table to be overwritten.