stewart@willster.(none)
826628c99b
post merge fix
2006-10-24 00:18:57 +10:00
stewart@willster.(none)
3c2eeb2c15
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
2006-10-23 23:57:28 +10:00
stewart@willster.(none)
5926602aa7
Bug #19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
...
fixes for ndb_* tests broken by previous fix
be more careful in ndb about setting errors on failure of info call (especially
in open)
2006-10-23 23:46:35 +10:00
stewart@willster.(none)
fc776db8e7
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
...
into willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
2006-10-23 23:43:48 +10:00
andrey@example.com
fd759850aa
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug23037/my51
2006-10-23 15:27:24 +02:00
andrey@example.com
6237be99d0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug23037/my50
2006-10-23 15:21:23 +02:00
andrey@example.com
4e3ac17f01
after merge fix
2006-10-23 15:11:24 +02:00
andrey@example.com
d18cb100be
Merge example.com:/work/bug23037/my50
...
into example.com:/work/bug23037/my51
2006-10-23 14:29:11 +02:00
msvensson@neptunus.(none)
6b5ec53962
Don't use the "4.1 vardir trick" on OS that does not have native symlink(i.e windows)
2006-10-23 13:32:20 +02:00
msvensson@neptunus.(none)
38c66b638f
Netware uses size_t as socklen_t
2006-10-23 13:26:04 +02:00
andrey@example.com
389c6a019e
Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table"
...
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
2006-10-23 13:12:30 +02:00
msvensson@neptunus.(none)
377e21df50
When looking for libc the path need to be converted from wine to unix format before test that directory exists
2006-10-23 12:56:25 +02:00
pekka@orca.ndb.mysql.com
af27544fd6
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
2006-10-23 12:55:53 +02:00
msvensson@neptunus.(none)
cad9d6b106
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-23 12:19:52 +02:00
msvensson@neptunus.(none)
e5c2351b4a
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-23 12:17:15 +02:00
msvensson@neptunus.(none)
43aa130a38
If "var" is a symlink which does not point to anything, remove it before creating real var
2006-10-23 12:16:40 +02:00
msvensson@neptunus.(none)
962fe84784
As both ndb and im are components that may be disabled as well as the binaries may not exist. Look for
...
their binaries in a separate function and produce test casea failures for the test thet needs these components
2006-10-23 12:02:56 +02:00
kostja@bodhi.local
81962878d8
A post-merge fix.
2006-10-23 13:55:29 +04:00
msvensson@neptunus.(none)
2459dd55f5
Copy *.cnf file from std_data/ when doing a binary distribution
2006-10-23 10:56:13 +02:00
kostja@bodhi.local
2fecf79536
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-10-23 12:35:56 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
7ad7d6e324
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
2006-10-23 13:25:24 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
1f65242652
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-23 13:18:56 +05:00
ramil/ram@myoffice.izhnet.ru
6cb5224279
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
2006-10-23 13:18:52 +05:00
kostja@bodhi.local
4cb57ac048
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-10-23 12:06:59 +04:00
msvensson@neptunus.(none)
4fbdbf1a4c
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-23 15:59:00 +08:00
ramil/ram@mysql.com/myoffice.izhnet.ru
dd2a1d1e96
Merge mysql.com:/usr/home/ram/work/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
2006-10-23 12:58:20 +05:00
kostja@bodhi.local
0ef2ae34e7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-10-23 11:51:45 +04:00
jonas@perch.ndb.mysql.com
cfd146d911
5.1.12 - release clone
...
ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
2006-10-23 09:48:36 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a67472f289
Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-23 12:44:25 +05:00
ramil/ram@myoffice.izhnet.ru
d4c7b6da83
Merge mysql.com:/usr/home/ram/work/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
2006-10-23 12:07:48 +05:00
ramil/ram@myoffice.izhnet.ru
800d80542f
Merge mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
...
into mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
2006-10-23 10:32:39 +05:00
jonas@perch.ndb.mysql.com
79d8773e31
ndb -
...
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
2006-10-22 08:24:31 +02:00
gkodinov@dl145s.mysql.com
b1bd09cbfa
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-21 09:33:53 +02:00
cmiller@zippy.cornsilk.net
dae79f0a50
Fix bad merge.
2006-10-20 22:21:05 -04:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5f12986d7d
configure.in:
...
Raised version number to 5.0.28
2006-10-21 01:22:16 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f97fe50dbb
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-10-21 01:13:50 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
08d47a3b81
make_win_bin_dist:
...
Copy udf examples and raid.h
Create target "include" directory before copying files to it
CMakeLists.txt:
Only compile in bdb if configured
configure.in:
Raised version number to 5.0.27
2006-10-21 00:57:08 +02:00
tsmith/tim@siva.hindu.god
1965238b82
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-20 16:02:48 -06:00
tsmith/tim@siva.hindu.god
5a217c51dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-20 15:56:59 -06:00
cmiller@zippy.cornsilk.net
5a39b2732c
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-afterbreak
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-20 17:49:38 -04:00
cmiller@zippy.cornsilk.net
c2119709c6
Fix bad merge from #14262 .
2006-10-20 17:44:03 -04:00
cmiller@zippy.cornsilk.net
482712bf83
Merge zippy.cornsilk.net:/home/cmiller/emergency/mysql-5.0.26a-release
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-10-20 17:30:28 -04:00
cmiller@zippy.cornsilk.net
b96ab282ea
Bug #23427 : incompatible ABI change in 5.0.26?
...
Revert 1 June change enough to restore ABI compatibility with previous
versions.
2006-10-20 17:17:24 -04:00
tsmith/tim@siva.hindu.god
d5d1404d4b
Merge siva.hindu.god:/usr/home/tim/m/bk/50
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-20 13:53:39 -06:00
tsmith/tim@siva.hindu.god
09e094850b
Applied InnoDB snapshot 5.1-ss927
...
Fixes:
- Bug #23368 : crash during insert, table has foreign key pointing into other schema,permission
2006-10-20 13:44:49 -06:00
tsmith/tim@siva.hindu.god
07db2bc7e5
Merge siva.hindu.god:/usr/home/tim/m/bk/inno/51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-20 13:31:12 -06:00
tsmith/tim@siva.hindu.god
8998ecbc21
Merge siva.hindu.god:/usr/home/tim/m/bk/inno/50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-20 13:28:47 -06:00
tsmith/tim@siva.hindu.god
c965f53784
Merge siva.hindu.god:/usr/home/tim/m/bk/inno/50
...
into siva.hindu.god:/usr/home/tim/m/bk/inno/51
2006-10-20 12:44:12 -06:00
tsmith/tim@siva.hindu.god
032f356f7c
Apply InnoDB snapshot ss923
...
Fixes:
- Bug #18077 : InnoDB uses full explicit table locks in stored FUNCTION
2006-10-20 12:36:15 -06:00
tsmith/tim@siva.hindu.god
deee020489
Apply InnoDB snapshot ss923
...
Fixes:
- Bug #18077 : InnoDB uses full explicit table locks in stored FUNCTION
2006-10-20 12:34:31 -06:00