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
0b5c41acc7
Bug#25807 LOAD DATA INFILE does not work with Pipes
...
- Additional fix for io_cache_init being called on a closed file
2007-02-20 12:06:04 +01:00
msvensson@pilot.blaudden
269d9daf0d
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 20:34:29 +01:00
msvensson@pilot.blaudden
86f6955701
Turn the "is_windows" flag _on_ when compiled on windows
2007-02-19 20:34:12 +01:00
msvensson@pilot.blaudden
1e9e0f4e74
Remove extra ; at end of line
2007-02-19 20:30:34 +01:00
msvensson@pilot.blaudden
bcb7521b0e
Remove unportable constructs in mysqldump.test
2007-02-19 18:25:42 +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
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
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
00ee20edaa
Add echo.c as EXTRA_DIST file
2007-02-19 13:21:06 +01:00
msvensson@pilot.blaudden
e3448ec05a
Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 12:50:36 +01:00
msvensson@pilot.blaudden
51f96e43c5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 12:04:21 +01:00
msvensson@pilot.blaudden
478bb9e27c
Update for running with cmd.exe directly
2007-02-19 12:03:42 +01:00
msvensson@pilot.blaudden
c2c4604580
Don't output escape char from 'do_eval' on windows. "It" won't
...
know it's an escape char.
Replace /dev/null with NUL
Replace "closed stdout" with "not open fd"
2007-02-19 12:00:17 +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
c1c7ba0aa0
Add echo.c to be built on Windows
2007-02-16 15:25:49 +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@pilot.blaudden
dc6f9d5d1b
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-16 15:23:06 +01:00
msvensson@pilot.blaudden
8ba162d761
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-16 15:22:31 +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
msvensson@pilot.blaudden
5349dffb36
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-15 15:56:05 +01:00
msvensson@neptunus.(none)
c94085cc5d
Merge neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-02-15 15:05:25 +01:00
msvensson@neptunus.(none)
68158c982d
Merge neptunus.(none):/home/msvensson/mysql/bug10777/my41-bug10777
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2007-02-15 15:04:53 +01:00
msvensson@neptunus.(none)
cf5d849bcf
Merge neptunus.(none):/home/msvensson/mysql/bug10777/my41-bug10777
...
into neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777
2007-02-15 14:58:24 +01:00
msvensson@pilot.mysql.com
7771db0183
Remove the newly added space in error message, should not be there
2007-02-15 11:17:25 +01:00
msvensson@pilot.mysql.com
67cc343c34
Add check of format specifiers in error message strings
...
Update error message text accordingly to be equal between all translations
2007-02-14 19:31:06 +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.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
msvensson@pilot.mysql.com
c01c9b8899
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-14 16:50:15 +01:00
msvensson@pilot.mysql.com
9f720bb733
Use my_vsnprintf instead of vsnprintf
2007-02-14 16:49:41 +01:00
cmiller@zippy.cornsilk.net
154f7f396e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-02-14 10:47:39 -05: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
msvensson@pilot.mysql.com
a34b469a38
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-14 14:01:26 +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
cmiller@zippy.cornsilk.net
9e9dd4327c
Bug#25807: LOAD DATA INFILE does not work with Pipes
...
Showstopper and regression against 5.0.24.
Previously, we ignored seek() errors (see Bug#22828) and let seek()s
against pipes fail. Now, since we check that a seek didn't fail,
and return without reading, this bug popped up.
This restores the behavior for file-ish objects that could never be
seek()ed.
2007-02-13 16:35:29 -05:00
ibabaev@bk-internal.mysql.com
cf9aca84b3
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
...
into bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
2007-02-13 21:25:22 +01:00
msvensson@pilot.mysql.com
2872fcfa42
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-13 19:00:04 +01:00
msvensson@pilot.mysql.com
410939b664
Write some debug info to result log file before dying in 'do_exec'
2007-02-13 18:59:46 +01:00
msvensson@pilot.mysql.com
a1cd4ba68c
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-13 17:00:23 +01:00
msvensson@pilot.mysql.com
a0e3ca046b
Reset value of variable "escaped" in "default" label causing $variables not
...
to be expanded in same cases
2007-02-13 16:59:58 +01: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
cmiller@zippy.cornsilk.net
6473de8db1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-02-13 10:02:00 -05:00