msvensson@pilot.blaudden
cf553c4361
Use "diff_files" instead ot "exec diff"
2007-02-20 18:47:47 +01:00
msvensson@pilot.blaudden
c282716844
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-20 18:22:50 +01:00
msvensson@pilot.blaudden
0d1d91e829
Replace "exec diff" with diff_files
2007-02-20 18:22:33 +01:00
msvensson@pilot.blaudden
dd74beb6be
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-20 18:21:14 +01:00
msvensson@pilot.blaudden
d6584a920b
Add "diff_files" command to mysqltest
2007-02-20 18:20:58 +01:00
msvensson@pilot.blaudden
cab074cb22
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-20 13:06:25 +01:00
msvensson@pilot.blaudden
a799f2b637
Change "exec echo" commands with different delimiters that are also
...
escape chars to use "write_file" to avoid confusion about what's what.
2007-02-20 13:06:01 +01:00
msvensson@pilot.blaudden
a5045ace69
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 20:31:01 +01:00
msvensson@pilot.blaudden
1e9e0f4e74
Remove extra ; at end of line
2007-02-19 20:30:34 +01:00
msvensson@pilot.blaudden
3359145790
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 18:25:55 +01:00
msvensson@pilot.blaudden
bcb7521b0e
Remove unportable constructs in mysqldump.test
2007-02-19 18:25:42 +01:00
msvensson@pilot.blaudden
9aeb8297b5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 18:25:10 +01:00
msvensson@pilot.blaudden
b540ae533d
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 18:24:32 +01:00
msvensson@pilot.blaudden
d2fe11cb56
Commment out two test's thats just confusing for cmd.exe
2007-02-19 18:23:59 +01:00
msvensson@pilot.blaudden
420bf2a398
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 18:20:33 +01:00
msvensson@pilot.blaudden
cb84744145
Add cat_file command to mysqltest
2007-02-19 18:19:47 +01:00
msvensson@pilot.blaudden
16bce5b815
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 17:41:01 +01:00
msvensson@pilot.blaudden
1fd7e01089
Use a temporary file to pass UTF8 chars to "mysql" in a portable
...
way
2007-02-19 17:40:34 +01:00
msvensson@pilot.blaudden
afd6fb94e0
Remove non portable exec's from csv.test
2007-02-19 17:06:47 +01:00
msvensson@pilot.blaudden
f65cb65d23
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 16:42:54 +01:00
msvensson@pilot.blaudden
91967e5550
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 16:40:11 +01:00
msvensson@pilot.blaudden
d2c02cd10d
Add "append_file" command to mysqltest
2007-02-19 16:39:50 +01:00
msvensson@pilot.blaudden
a6ac991c83
Replace "exec rm" with remove_file and "exec touch" with "write_file"
2007-02-19 15:46:32 +01:00
msvensson@pilot.blaudden
10da8b7e96
Bug#25592 wrong reporting for mysql-test-run.pl --mysqld=--binlog-format=...
2007-02-19 12:59:19 +01:00
msvensson@pilot.blaudden
c122f59c0c
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 12:05:13 +01:00
msvensson@pilot.blaudden
478bb9e27c
Update for running with cmd.exe directly
2007-02-19 12:03:42 +01:00
msvensson@pilot.blaudden
7970e9534b
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-16 16:13:56 +01:00
msvensson@pilot.blaudden
ee38195c90
Use " instead of ' to avoid win problem with '
2007-02-16 16:08:08 +01:00
msvensson@pilot.blaudden
03b71c9209
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-16 15:32:51 +01:00
msvensson@pilot.blaudden
b57994a7c2
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-16 15:23:27 +01:00
msvensson@neptunus.(none)
8931166e55
Workaround for problem where cygwin's bash/sh randomly fails with error 128 which
...
mainly occurs on win2003 64bit.
- Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..."
2007-02-16 15:19:38 +01:00
msvensson@pilot.blaudden
486dfab32b
Merge 192.168.0.10:mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-15 15:56:38 +01:00
cmiller@calliope.local.cmiller/calliope.local
80a35bfd39
Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126
...
into calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint
2007-02-14 12:24:11 -05:00
cmiller@calliope.local
81a46371a9
Merge calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint
...
into calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
2007-02-14 11:38:39 -05:00
cmiller@calliope.local.cmiller/calliope.local
cbdaf5b641
Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126
...
into calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint
2007-02-14 11:27:37 -05:00
cmiller@zippy.cornsilk.net
434830547b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-02-14 10:57:01 -05:00
msvensson@pilot.mysql.com
b6f78aa153
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-14 14:51:49 +01:00
msvensson@pilot.mysql.com
24a242bee1
Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-14 14:45:15 +01:00
msvensson@pilot.mysql.com
45fe5879f4
Bug#18628 mysql-test-run: security problem(part1)
...
- Implement --secure-file-priv=<dir> option that limits
"load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work
with files in specified dir.
- Use above option for mysqld in mysql-test-run.pl
2007-02-14 14:44:34 +01:00
igor@olga.mysql.com
d36e264cc5
Post-merge fix
2007-02-13 19:59:46 -08:00
igor@olga.mysql.com
452c134d3f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-02-13 16:08:01 -08:00
ibabaev@bk-internal.mysql.com
0df74eae05
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-02-14 00:58:54 +01:00
igor@olga.mysql.com
c84ee7079c
Post-merge fix
2007-02-13 15:49:42 -08:00
ibabaev@bk-internal.mysql.com
266300142e
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-02-13 23:35:06 +01:00
igor@olga.mysql.com
a196ccafe6
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-02-13 13:31:23 -08:00
igor@olga.mysql.com
273d016aad
Post-merge fix.
2007-02-13 13:15:23 -08:00
cmiller@zippy.cornsilk.net
11e8f48734
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-02-13 10:54:04 -05:00
igor@olga.mysql.com
fb9e0ad3be
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-02-13 01:34:36 -08:00
msvensson@pilot.mysql.com
7e6e518a47
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-13 10:00:59 +01:00
msvensson@pilot.mysql.com
7dcdbdf37b
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-13 10:00:53 +01:00