msvensson@pilot.blaudden
be1e948543
Merge 192.168.0.10:mysql/my50-m-bug18431
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-03 12:14:36 +01:00
msvensson@pilot.blaudden
d1d64ba50f
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 19:10:07 +01:00
msvensson@pilot.blaudden
c0fdf1792a
Add two more USE_CYGWIN ifdefs to mysqltest
2007-03-01 19:09:43 +01:00
msvensson@pilot.blaudden
c58b2bd757
Don't set the "is_windows" flag if using cygwin
2007-03-01 18:30:29 +01:00
msvensson@pilot.blaudden
f5778fc73e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 18:12:56 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
a934e46ebd
Fixed compiler warnings.
2007-03-01 11:28:33 +02:00
jani@ua141d10.elisa.omakaista.fi
bcbc0031eb
Fixed compiler warnings.
2007-02-28 22:23:35 +02:00
msvensson@pilot.blaudden
ab61d07a30
Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 21:21:37 +01:00
msvensson@pilot.blaudden
cc7e77c5fd
Bug #25074 mysql_upgrade test can't give consistent results
...
- Tell the programs executed by mysql_upgrade to only read
from the defaults file generated by msyql_upgrade
- Fix memory leaks
2007-02-28 21:05:39 +01:00
msvensson@pilot.blaudden
05ed84a3d2
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
2007-02-28 15:04:20 +01:00
msvensson@pilot.blaudden
548112ce36
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint-without-cygwin
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-28 10:06:21 +01:00
msvensson@pilot.blaudden
ed61e4868d
Use cygwin for --exec and --system in mysqltest for MySQL before 5.0
2007-02-28 10:05:51 +01:00
msvensson@pilot.blaudden
38d9e75a52
Bug#19410 Test 'kill' fails on Windows + SCO
...
- Use "mysql_stmt_field_count" to determine if there is a need to
call "mysql_stmt_store_result"
2007-02-28 09:10:38 +01:00
monty@mysql.com/narttu.mysql.fi
510c1238ac
Portability fix
...
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
2007-02-22 20:20:49 +02:00
monty@mysql.com/narttu.mysql.fi
e5cc397f33
Fixed compiler warnings (for linux and win32 and win64)
...
Fixed a couple of usage of not initialized warnings (unlikely cases)
2007-02-22 16:59:57 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-02-21 14:07:08 +02: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
c7d138cfa3
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-20 14:21:11 +01:00
msvensson@pilot.blaudden
26432d16e8
New version of 'do_cat_file' that will trim cr/lf to lf
2007-02-20 14:20:49 +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
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
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
00ee20edaa
Add echo.c as EXTRA_DIST file
2007-02-19 13:21:06 +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
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
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@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.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
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
joerg@trift2.
e56eb2288c
Fix bug#23293 "readline detection broken on NetBSD":
...
Its root cause is a difference between the "readline" and "libedit" (header files)
definitions of "rl_completion_entry_function", where the "libedit" one is wrong anyway:
This variable is used as a pointer to a function returning "char *",
but "libedit" declares it as returning "int" and then adds casts on usage.
Change it to "CPFunction *" and get rid of the casts.
2007-01-31 15:25:56 +01:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-01-22 14:04:40 +02:00
tsmith@siva.hindu.god
02ddf3d04c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:33:28 -07:00
tsmith@siva.hindu.god
244b2004ee
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:06:36 -07:00
tsmith@siva.hindu.god
6fd02a439f
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
2007-01-18 09:53:30 -07:00
iggy@recycle.(none)
294af0a42e
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-18 11:46:29 -05:00
iggy@recycle.(none)
ef5f757ac2
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Create space safe strings for system() calls in mysql_upgrade.exe
2007-01-18 11:38:05 -05:00
msvensson@neptunus.(none)
77b0123882
Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-16 17:53:45 +01:00
msvensson@neptunus.(none)
ae03f5d382
Don't reuse prepared statements if running with reconnect enabled
2007-01-16 17:47:41 +01:00
msvensson@neptunus.(none)
11ddeb693d
Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-16 14:13:48 +01:00
msvensson@neptunus.(none)
f507bb2cb3
Bug#15518 Reusing a stmt that has failed during prepare does not clear error
...
- Always reset error when calling mysql_stmt_prepare a second time
- Set stmt->state to MYSQL_STMT_INIT_DONE before closing prepared stmt in server.
- Add test to mysql_client_test
- Remove mysql_stmt_close in mysqltest after each query
- Close all open statements in mysqltest if disable_ps_protocol is called.
2007-01-16 13:39:42 +01:00