msvensson@neptunus.(none)
58baec3f76
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-05 11:18:00 +01:00
df@kahlann.erinye.com
41a2a6080c
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-05 10:05:15 +01:00
df@kahlann.erinye.com
6541302bb2
re-enable multiple test runs in sequence for 4.1 on non-windows
2006-12-05 10:03:24 +01:00
mskold/marty@mysql.com/linux.site
f8bd5d312b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-05 06:38:08 +01:00
thek@kpdesk.mysql.com
57f78d4ddc
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
2006-12-04 23:51:54 +01:00
thek@kpdesk.mysql.com
05410c7db8
Disabled flush2 until pushbuild framework can handle test which
...
disables binlog.
2006-12-04 22:46:12 +01:00
iggy@rolltop.ignatz42.dyndns.org
e0eed3a34b
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-12-04 15:33:53 -05:00
iggy@rolltop.ignatz42.dyndns.org
f427935804
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-12-04 15:32:16 -05:00
msvensson@neptunus.(none)
2f79d20bc3
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:36:53 +01:00
msvensson@neptunus.(none)
128b73fc36
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
544d0c909b
mysqltest
...
Close any statements that might be open before program exit
Close any statments that might be open when calling "disable_ps_protocol"
2006-12-04 19:16:55 +01:00
msvensson@neptunus.(none)
877c037ac6
mysql-test-run.pl: Append .nlm to the binary name on NetWare
2006-12-04 19:15:09 +01:00
msvensson@neptunus.(none)
db3a21e75b
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:08:52 +01:00
msvensson@neptunus.(none)
33c248eee5
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:06:42 +01:00
istruewing@chilla.local
098abfadd0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-04 19:03:01 +01:00
msvensson@neptunus.(none)
a9f4f4ed11
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:01:31 +01:00
istruewing@chilla.local
9a8d3db463
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2006-12-04 18:58:02 +01:00
iggy@rolltop.ignatz42.dyndns.org
a13e3ebe80
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-12-04 12:39:49 -05:00
gkodinov@dl145s.mysql.com
d253588c69
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0
2006-12-04 18:05:42 +01:00
petr/cps@outpost.site
80fe32d526
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into outpost.site:/home/cps/mysql/trees/5.0-runtime-19044
2006-12-04 19:54:50 +03:00
petr/cps@outpost.site
2bc1898bc6
Fix Bug #19044 IM aborts on exit
...
On windows IM aborted on assert once one
stoppped it. The reason is that we didn't
close the sockets on windows and therefore,
the listener thread wasn't able to finish.
This happened because we used close() call
for it. While on windows one should use
closesocket().
On other platfroms we have appropriate defines
for closesocket(), so this is the function which
should be used.
2006-12-04 19:48:49 +03:00
msvensson@neptunus.(none)
c2488ba10f
Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connection to MySQL
...
- Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
attempt in mysqltest
2006-12-04 15:48:34 +01:00
mskold/marty@mysql.com/linux.site
6e8f99d29b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-04 15:09:47 +01:00
Kristofer.Pettersson@naruto.
f91e48c762
Merge naruto.:C:/cpp/bug17733/my50-bug17733
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-12-04 14:43:34 +01:00
gkodinov/kgeorge@macbook.gmz
2a9edce6f6
type_varchar.result:
...
fixed a valgrind problem
2006-12-04 14:29:51 +02:00
gkodinov/kgeorge@macbook.gmz
063fe51c69
item_func.cc:
...
fixed a valgrind warning
type_varchar.test:
fixed a valgrind warning
2006-12-04 14:26:05 +02:00
anozdrin/alik@booka.
a9e1563fa4
Use standard shell instead of BASH.
2006-12-04 14:05:27 +03:00
kent@mysql.com/kent-amd64.(none)
d72b71ef9f
mysql_install_db.sh:
...
If --srcdir and --windows is given, check if error message file
is in source or build tree (bug#24557)
Makefile.am:
Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
Added --srcdir=DIR option, used from top Makefile.am in dist-hook
target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
the source and build tree.
Call "mysql_install_db" with new option --srcdir, to enable the script
to find all that is needed, if source and build directory is not the same
(bug#24557)
2006-12-02 23:16:47 +01:00
kent@mysql.com/kent-amd64.(none)
cbf529790a
Makefile.am:
...
Added "mysql_client_test.def"
mysql_client_test.def:
BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
2006-12-02 06:06:31 +01:00
andrey@example.com
b5e44560f6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug24395-v2/my50
2006-12-02 00:30:10 +01:00
kent@mysql.com/kent-amd64.(none)
ee8cdf9ded
Merge mysql.com:/home/kent/bk/mysql-4.1-build
...
into mysql.com:/home/kent/bk/mysql-5.0-build
2006-12-02 00:27:34 +01:00
andrey@example.com
b275089b66
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into example.com:/work/bug24395-v2/my41
2006-12-01 23:11:44 +01:00
kent@mysql.com/kent-amd64.(none)
fb5abf8f4f
mysql_upgrade.def Makefile.am:
...
Added new "mysql_upgrade.def" for Netware (bug#23504)
*.def:
Allocate 128K stack for all executables (bug#23504)
2006-12-01 23:09:14 +01:00
istruewing@chilla.local
763fdea487
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-01 18:49:20 +01:00
istruewing@chilla.local
341bd06408
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-01 18:38:08 +01:00
thek@kpdesk.mysql.com
94b48caf2e
Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-12-01 18:00:45 +01:00
istruewing@chilla.local
ab70ed5e48
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2006-12-01 15:49:49 +01:00
istruewing@chilla.local
0c273a79fc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2006-12-01 15:46:58 +01:00
jonas@perch.ndb.mysql.com
d19c93e900
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-12-01 14:05:41 +01:00
jonas@perch.ndb.mysql.com
76bdda5523
ndb - bug#24752
...
This prevent any subsequent node restarts, but it's better than crashing an alive node
2006-12-01 13:57:29 +01:00
df@kahlann.erinye.com
da7820c37d
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-01 13:02:54 +01:00
thek@kpdesk.mysql.com
b201d4ef93
Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS"
...
- Refactoring of duplicate code
- Modified bad test cases
- Changed expected error when operating on information_schema.
2006-12-01 12:50:57 +01:00
jonas@perch.ndb.mysql.com
115643aab5
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-12-01 11:35:12 +01:00
kostja@bodhi.local
87a87bc04b
A fix and a test case for Bug#24179 "select b into $var" fails with
...
--cursor_protocol": fix a misleading error message in case of
SELECT .. INTO.
2006-12-01 13:25:06 +03:00
jonas@perch.ndb.mysql.com
7232d0f24a
ndb - bug#24748
...
Skip rollback if only committedRead in transaction
2006-12-01 11:24:37 +01:00
df@kahlann.erinye.com
e6a2d18421
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2006-12-01 10:36:42 +01:00
df@kahlann.erinye.com
feb70084d3
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-01 10:27:19 +01:00
jonas@perch.ndb.mysql.com
61c6f532d2
ndb -
...
add testcase for bug#24717
+ fix typo
2006-12-01 10:25:11 +01:00
Kristofer.Pettersson@naruto.
6c8d7ea894
Bug#17733 Flushing logs causes daily server crash
...
Server crashes if a flush commmand is issued and binlog is closed.
- added check to prevent binlog access when binlog file isn't opened.
2006-12-01 09:49:19 +01:00
jonas@perch.ndb.mysql.com
9d1ff70e85
ndb - bug#24717
...
5.0 version
Add some extra state to try to prevent sending committedread to node too early
2006-12-01 09:06:01 +01:00