msvensson@neptunus.(none)
56d2a6fd3c
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 19:22:48 +02:00
msvensson@neptunus.(none)
844369130f
Remove debug printout
2006-10-24 19:22:27 +02:00
msvensson@neptunus.(none)
28ca3dea79
Bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table"
...
- Fix check in mysql_client_test to reflect the change of datatype
for DEFAULT column
2006-10-24 19:16:18 +02:00
msvensson@neptunus.(none)
a45e6ba7e8
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 18:51:07 +02:00
msvensson@neptunus.(none)
a8d1c62e5f
Run mysql_client_test without --silent
...
Flush both stdout and stderr before abort'ing mysql_client_test
2006-10-24 18:49:19 +02:00
msvensson@neptunus.(none)
d02838deb0
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 18:08:38 +02:00
msvensson@neptunus.(none)
80f4c1056f
Fix spelling errors in test files
2006-10-24 17:54:45 +02:00
msvensson@neptunus.(none)
3df77e48af
Add analyze_testcase_failure which is called when mysqltest has failed
...
with error 1 and we are running with --force
The specific "analyze" code is enclosed in a .test file fwich can easily
be modified to be more advanced
2006-10-24 17:36:46 +02:00
stewart@willster.(none)
a8037f478d
fix result file for ndb_multi
2006-10-25 00:41:55 +10:00
msvensson@neptunus.(none)
ccc33b4e53
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 16:00:42 +02:00
stewart@willster.(none)
dc38d0249a
fix ndb_cache_multi2
...
util thread wasn't behaving correctly after 241 error due to get_table_statistics
not properly returning an error code
2006-10-24 23:26:58 +10:00
msvensson@neptunus.(none)
4bd1021a03
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 14:32:31 +02:00
msvensson@neptunus.(none)
26183402d1
Use same type for local variables as arguments, avoid compile error on NetWare
2006-10-24 13:52:50 +02:00
msvensson@neptunus.(none)
c972edc663
Enable the ATTRIBUTE_FORMAT macros to check format of variable arg parameters
2006-10-24 13:34:10 +02:00
msvensson@neptunus.(none)
e5bf79e608
Replace all refernces to .la libraries with direct references
...
to their .libs/*.a library
Add comment describing why mwldnlm is called with "x" flag
2006-10-24 13:12:34 +02:00
msvensson@neptunus.(none)
6b920ebd84
Temporary fixes for building from source dist in pushbuild
2006-10-24 11:16:53 +02:00
joerg@trift2.
837746340e
Bump version number to 5.0.29, as 28 will be based directly on 27.
2006-10-24 10:57:17 +02:00
msvensson@neptunus.(none)
25abce028e
When using yaSSL on NetWare some of the OpenSSL specifix hacks can be skipped
2006-10-24 10:43:15 +02:00
mskold/marty@mysql.com/linux.site
8da80dd39d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-24 08:29:37 +02:00
msvensson@shellback.(none)
a3ffd80fc9
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-23 22:14:00 +02:00
msvensson@neptunus.(none)
e4df2aac07
Avoid matching the trailing carriage return when parsing the mysqld.spec file
...
This fixes problem where --replace_result failed in rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"
2006-10-23 20:36:44 +02:00
msvensson@neptunus.(none)
792adb7ce3
The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value.
2006-10-23 16:51:48 +02:00
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
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
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
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@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
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
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
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
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