Commits · b7b774ee29c10afdce9e71ac45002389f18fe97c · nexedi / MariaDB

20 Feb, 2007 11 commits
- Use "diff_files" instead ot "exec diff" · b7b774ee
  unknown authored Feb 20, 2007
  
  b7b774ee
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · e95e092b
  unknown authored Feb 20, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
```
  e95e092b
- Replace "exec diff" with diff_files · ac7b44c1
  unknown authored Feb 20, 2007
  
  ac7b44c1
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · da4abd2e
  unknown authored Feb 20, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
```
  da4abd2e
- Add "diff_files" command to mysqltest · f10cfb05
  unknown authored Feb 20, 2007
  
  f10cfb05
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · cc5774e9
  unknown authored Feb 20, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
```
  cc5774e9
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 485ab9a4
  unknown authored Feb 20, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
  485ab9a4
- New version of 'do_cat_file' that will trim cr/lf to lf · 1009e0d3
  unknown authored Feb 20, 2007
  
  1009e0d3
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · fb4ed070
  unknown authored Feb 20, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/mysql.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
```
  fb4ed070
- Change "exec echo" commands with different delimiters that are also · e78413ca
  unknown authored Feb 20, 2007
```
escape chars to use "write_file" to avoid confusion about what's what.
```
  e78413ca
- Bug#25807 LOAD DATA INFILE does not work with Pipes · ec6807d3
  unknown authored Feb 20, 2007
```
 - Additional fix for io_cache_init being called on a closed file


mysys/mf_iocache.c:
  The file does not need to be open when init_io_cache is called
  so don't call my_tell in that case
```
  ec6807d3
19 Feb, 2007 29 commits
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 71a25f2b
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
```
  71a25f2b
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · a9afbd50
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
  a9afbd50
- Turn the "is_windows" flag _on_ when compiled on windows · ca994409
  unknown authored Feb 19, 2007
  
  ca994409
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 2080df12
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/mysqldump.test:
  Auto merged
```
  2080df12
- Remove extra ; at end of line · 6fa33adf
  unknown authored Feb 19, 2007
  
  6fa33adf
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · eb3fd8ce
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/mysqldump.test:
  Auto merged
```
  eb3fd8ce
- Remove unportable constructs in mysqldump.test · 8e748300
  unknown authored Feb 19, 2007
  
  8e748300
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 145c1770
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
```
  145c1770
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 082ad734
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Manual merge
```
  082ad734
- Commment out two test's thats just confusing for cmd.exe · a8be1b93
  unknown authored Feb 19, 2007
  
  a8be1b93
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 8cb50382
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/r/mysqltest.result:
  SCCS merged
```
  8cb50382
- Add cat_file command to mysqltest · 8d7e8d97
  unknown authored Feb 19, 2007
  
  8d7e8d97
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 4ee96f8c
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/mysqlbinlog.test:
  Auto merged
```
  4ee96f8c
- Use a temporary file to pass UTF8 chars to "mysql" in a portable · 2b46c20a
  unknown authored Feb 19, 2007
```
way
```
  2b46c20a
- Remove non portable exec's from csv.test · 9e5efc37
  unknown authored Feb 19, 2007
```
mysql-test/r/csv.result:
  Update result file
   - There is no builtin equvivalent of "cat"
   - ls was replaced with "file_exists" which does not produce any output
mysql-test/t/csv.test:
  Replce obscure exec's with mysqltest builtin commands
```
  9e5efc37
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · f2e3bc0e
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
```
  f2e3bc0e
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · a25c33cf
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
```
  a25c33cf
- Add "append_file" command to mysqltest · d329b1f2
  unknown authored Feb 19, 2007
  
  d329b1f2
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 52e8f391
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
```
  52e8f391
- Replace "exec rm" with remove_file and "exec touch" with "write_file" · f94e7751
  unknown authored Feb 19, 2007
  
  f94e7751
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 4392754e
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/Makefile.am:
  Manual merge
```
  4392754e
- Add echo.c as EXTRA_DIST file · dcd3b8d4
  unknown authored Feb 19, 2007
  
  dcd3b8d4
- Bug#25592 wrong reporting for mysql-test-run.pl --mysqld=--binlog-format=... · dbfa53d2
  unknown authored Feb 19, 2007
```
mysql-test/mysql-test-run.pl:
  Allow both dash and underscore as separator for mysqld option
```
  dbfa53d2
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · a4a619dc
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
```
  a4a619dc
- Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum · d7b2f201
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


sql/share/errmsg.txt:
  Auto merged
```
  d7b2f201
- Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum · 4e1974c3
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


sql/share/errmsg.txt:
  Auto merged
```
  4e1974c3
- Clean "gen_lex_hash" if it's been built · 5e7c6c29
  unknown authored Feb 19, 2007
  
  5e7c6c29
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 7bab154f
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
```
  7bab154f
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 583e4f0e
  unknown authored Feb 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  SCCS merged
```
  583e4f0e