msvensson@pilot.blaudden
86625d711f
Fix bug in mtr.pl where slave wes using same query log file as master
2007-03-01 18:31:09 +01:00
msvensson@pilot.blaudden
c58b2bd757
Don't set the "is_windows" flag if using cygwin
2007-03-01 18:30:29 +01:00
malff/marcsql@weblab.(none)
14e1ed367e
Merge weblab.(none):/home/marcsql/TREE/mysql-4.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-4.1-runtime
2007-03-01 05:59:16 -07:00
msvensson@pilot.blaudden
c506169c06
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-03-01 11:41:53 +01:00
msvensson@pilot.blaudden
c1f8e7f913
MySQL versions before 5.0 still use cygwin, no need
...
to convert path
2007-03-01 11:41:29 +01:00
tsmith@quadxeon.mysql.com
380e2de10a
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-03-01 01:59:31 +01:00
tsmith@quadxeon.mysql.com
b99c49421b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/40
2007-03-01 01:58:31 +01:00
kent@mysql.com/kent-amd64.(none)
904972ceee
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-02-28 22:31:58 +01:00
kent@mysql.com/kent-amd64.(none)
4bddd1f6ca
Makefile.am:
...
EXCEPTIONS-CLIENT is now static part of repository
2007-02-28 22:30:50 +01:00
kent@mysql.com/kent-amd64.(none)
444072f299
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-02-28 22:13:35 +01:00
kent@mysql.com/kent-amd64.(none)
f471a67fa6
Makefile.am:
...
EXCEPTIONS-CLIENT is now static part of repository
EXCEPTIONS-CLIENT:
BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT
2007-02-28 22:09:09 +01:00
kent@mysql.com/kent-amd64.(none)
1fad124e01
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-02-28 21:19:19 +01:00
msvensson@pilot.blaudden
b6fd729beb
Merge pilot.blaudden:/home/msvensson/mysql/bug24878/my41-bug24878
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-28 16:38:31 +01:00
msvensson@pilot.blaudden
6ca22c6672
Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages
...
- Add printout of current time when mysqld is killed by an
unhandled signal
2007-02-28 16:37:50 +01:00
msvensson@pilot.blaudden
3fc549d430
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Build lib/init-db.sql from the output of mysql_create_system_tables
- Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
- Leave netware/init_db.sql until 5.0 where we should soon have possibility
to test with mysql-test-run.pl
2007-02-28 15:03:47 +01:00
msvensson@pilot.blaudden
c0da93cd97
When using a --mem=<dir> the memdir must be removed to assure
...
afresh start
2007-02-28 13:47:41 +01:00
msvensson@pilot.blaudden
44959af241
Bug#26416 mysql-test-run exits with "Hangup" when piped to grep
...
- Thanks to Christian for the patch!
2007-02-28 10:52:51 +01:00
msvensson@pilot.blaudden
3393c1e489
Bug#26686 mysql-test-run.pl aborts when waitpid returns -1
...
- Add error handling for waitpid returns -1 for "simple run of command"
2007-02-28 10:37:32 +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
gbichot@dl145h.mysql.com
d204dc2d21
Fix for BUG#26050 "LOAD DATA INFILE breaks ACID"; the ok must be sent
...
to the client only after the binlog write and engine commit.
No testcase for this bug, as to reproduce it, we need to "kill -9" mysqld,
which we cannot do in the testsuite. But, I tested by hand.
2007-02-26 20:35:28 +01:00
msvensson@pilot.blaudden
23b6b4a565
Only allow a version number to be read from "/etc/debian_version"
2007-02-26 14:52:51 +01:00
istruewing@chilla.local
ce9be400ef
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1--main
2007-02-26 13:31:52 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
a6458e1aee
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-02-25 00:10:06 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fc265e4e0a
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-02-24 11:36:15 +01:00
joerg@trift2.
929bdae377
Merge trift2.:/MySQL/M40/clone-4.0
...
into trift2.:/MySQL/M40/mysql-4.0
2007-02-22 11:16:42 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
049251624a
Fix for bug #26038 : X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
...
Having maybe_null flag unset for geometry/spatial functions leads to
wrong Item_func_isnull::val_int()'s results.
Fix: set maybe_null flag and add is_null() methods.
2007-02-21 14:45:19 +04:00
istruewing@chilla.local
dbbf5d02a9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1--main
2007-02-21 00:06:23 +01:00
msvensson@pilot.blaudden
d6584a920b
Add "diff_files" command to mysqltest
2007-02-20 18:20:58 +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
joerg@trift2.
74fed0c305
After-merge fix:
...
The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".
2007-02-20 13:10:27 +01:00
joerg@trift2.
0daf91a62a
Merge trift2.:/MySQL/M40/clone-4.0
...
into trift2.:/MySQL/M41/merge-4.1
2007-02-20 13:02:39 +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
d2fe11cb56
Commment out two test's thats just confusing for cmd.exe
2007-02-19 18:23:59 +01:00
msvensson@pilot.blaudden
cb84744145
Add cat_file command to mysqltest
2007-02-19 18:19:47 +01:00
msvensson@pilot.blaudden
d2c02cd10d
Add "append_file" command to mysqltest
2007-02-19 16:39:50 +01:00
thek@kpdesk.mysql.com
8f24815af1
Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my41-bug23240
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-runtime
2007-02-19 15:26:07 +01:00
istruewing@chilla.local
237e50db12
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1--main
2007-02-19 12:02:53 +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
thek@kpdesk.mysql.com
dd41fd5732
Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time
...
- Starting time of a query sent by file bootstrapping wasn't initialized
and starting time defaulted to 0. This later used value by the Now-
item and is translated to 1970-01-01 11:00:00.
- marking the time with thd->set_time() before the call to
mysql_parse resolves this issue.
2007-02-19 09:37:34 +01:00
joerg@trift2.
0cdbda1273
include/config-win.h :
...
Companion change to this one
ChangeSet@1.2206 , 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
include/my_pthread.h@1.67 , 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
2007-02-16 16:31:31 +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.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)
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
joerg@trift2.
8ddb3af50c
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-02-15 13:46:54 +01:00
tsmith@siva.hindu.god
ab168f0e40
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into siva.hindu.god:/home/tsmith/m/bk/maint/40
2007-02-14 12:42:11 -07: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
msvensson@pilot.mysql.com
9f720bb733
Use my_vsnprintf instead of vsnprintf
2007-02-14 16:49:41 +01:00