s/\r\n/\n/ in mysql-test/*/system_mysql_db*

according to http://www.bitkeeper.com/Documentation.FAQS.Windows_NT.html


mysql-test/t/system_mysql_db.test:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_fix-master.opt:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_fix.test:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_refs.test:
  s/\r\n/\n/
mysql-test/r/system_mysql_db.result:
  s/\r\n/\n/
mysql-test/r/system_mysql_db_refs.result:
  s/\r\n/\n/

1 files changed, 28 insertions, 28 deletions

diff --git a/mysql-test/r/system_mysql_db_refs.result b/mysql-test/r/system_mysql_db_refs.result
index e15934b03ac..ac072505bc9 100644
--- a/mysql-test/r/system_mysql_db_refs.result
+++ b/mysql-test/r/system_mysql_db_refs.result
@@ -18,44 +18,44 @@ create table test_columns_priv select * from mysql.columns_priv;
 delete from test_columns_priv;
 insert into test_columns_priv (Host,Db,User,Table_name,Column_name) values (@name,@name,@name,@name,@name);
 select
-if(isnull(test_db.Host),'WRONG!!!','ok') as test_db_Host,

-if(isnull(test_host.Host),'WRONG!!!','ok') as test_host_Host,

-if(isnull(test_user.Host),'WRONG!!!','ok') as test_user_Host,

-if(isnull(test_tables_priv.Host),'WRONG!!!','ok') as test_tables_priv_Host,

-if(isnull(test_columns_priv.Host),'WRONG!!!','ok') as test_columns_priv_Host

-from      test_db

-left join test_host         on test_db.Host=test_host.Host

-left join test_user         on test_db.Host=test_user.Host

-left join test_tables_priv  on test_db.Host=test_tables_priv.Host

+if(isnull(test_db.Host),'WRONG!!!','ok') as test_db_Host,
+if(isnull(test_host.Host),'WRONG!!!','ok') as test_host_Host,
+if(isnull(test_user.Host),'WRONG!!!','ok') as test_user_Host,
+if(isnull(test_tables_priv.Host),'WRONG!!!','ok') as test_tables_priv_Host,
+if(isnull(test_columns_priv.Host),'WRONG!!!','ok') as test_columns_priv_Host
+from      test_db
+left join test_host         on test_db.Host=test_host.Host
+left join test_user         on test_db.Host=test_user.Host
+left join test_tables_priv  on test_db.Host=test_tables_priv.Host
 left join test_columns_priv on test_db.Host=test_columns_priv.Host;
 test_db_Host	test_host_Host	test_user_Host	test_tables_priv_Host	test_columns_priv_Host
 ok	ok	ok	ok	ok
 select
-if(isnull(test_db.Db),'WRONG!!!','ok') as test_db_Db,

-if(isnull(test_host.Db),'WRONG!!!','ok') as test_host_Db,

-if(isnull(test_tables_priv.Db),'WRONG!!!','ok') as test_tables_priv_Db,

-if(isnull(test_columns_priv.Db),'WRONG!!!','ok') as est_columns_priv_Db

-from      test_db

-left join test_host         on test_db.Db=test_host.Db

-left join test_tables_priv  on test_db.Db=test_tables_priv.Db

+if(isnull(test_db.Db),'WRONG!!!','ok') as test_db_Db,
+if(isnull(test_host.Db),'WRONG!!!','ok') as test_host_Db,
+if(isnull(test_tables_priv.Db),'WRONG!!!','ok') as test_tables_priv_Db,
+if(isnull(test_columns_priv.Db),'WRONG!!!','ok') as est_columns_priv_Db
+from      test_db
+left join test_host         on test_db.Db=test_host.Db
+left join test_tables_priv  on test_db.Db=test_tables_priv.Db
 left join test_columns_priv on test_db.Db=test_columns_priv.Db;
 test_db_Db	test_host_Db	test_tables_priv_Db	est_columns_priv_Db
 ok	ok	ok	ok
-select

-if(isnull(test_db.User),'WRONG!!!','ok') as test_db_User,

-if(isnull(test_user.User),'WRONG!!!','ok') as test_user_User,

-if(isnull(test_tables_priv.User),'WRONG!!!','ok') as test_tables_priv_User,

-if(isnull(test_columns_priv.User),'WRONG!!!','ok') as test_columns_priv_User

-from      test_db

-left join test_user         on test_db.User=test_user.User

-left join test_tables_priv  on test_db.User=test_tables_priv.User

+select
+if(isnull(test_db.User),'WRONG!!!','ok') as test_db_User,
+if(isnull(test_user.User),'WRONG!!!','ok') as test_user_User,
+if(isnull(test_tables_priv.User),'WRONG!!!','ok') as test_tables_priv_User,
+if(isnull(test_columns_priv.User),'WRONG!!!','ok') as test_columns_priv_User
+from      test_db
+left join test_user         on test_db.User=test_user.User
+left join test_tables_priv  on test_db.User=test_tables_priv.User
 left join test_columns_priv on test_db.User=test_columns_priv.User;
 test_db_User	test_user_User	test_tables_priv_User	test_columns_priv_User
 ok	ok	ok	ok
-select

-if(isnull(test_tables_priv.User),'WRONG!!!','ok') as test_tables_priv_User,

-if(isnull(test_columns_priv.User),'WRONG!!!','ok') as test_columns_priv_User

-from      test_tables_priv

+select
+if(isnull(test_tables_priv.User),'WRONG!!!','ok') as test_tables_priv_User,
+if(isnull(test_columns_priv.User),'WRONG!!!','ok') as test_columns_priv_User
+from      test_tables_priv
 left join test_columns_priv on test_tables_priv.Table_name=test_columns_priv.Table_name;
 test_tables_priv_User	test_columns_priv_User
 ok	ok