mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35405 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1026 commits

Author SHA1 Message Date
msvensson@shellback.(none)
e5004d1312 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-04-27 17:35:29 +02:00
kent@mysql.com
dd2165f6b9 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-04-27 11:38:48 +02:00
msvensson@neptunus.(none)
2c3a3bd87f Remove hacks for building shared libs on aix and qnx 2006-04-26 12:16:57 +02:00
bpontz@mysql.com
92825f3ada configure.in: 
clone-off for 5.0.21
 2006-04-26 08:26:33 +02:00
msvensson@shellback.(none)
56f1424c1a Fix for building shared libraries on AIX with 64-bit mode 
Set building of shared libraries on QNX to defatul OFF
 2006-04-22 21:53:33 +02:00
msvensson@neptunus.(none)
8786a1258f Merge neptunus.(none):/home/msvensson/mysql/my50-bug18837 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-04-21 09:47:21 +02:00
kent@mysql.com
543960f2fb Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-04-19 15:41:56 +02:00
bell@sanja.is.com.ua
cb81389aef Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-13 15:07:50 +03:00
msvensson@neptunus.(none)
f3373899e2 Bug#18837 Many build and test failures when configuring without --disable-shared 
Build "NOINST" tools with -static flag to avoid  any ld problems when using them
 2006-04-13 13:02:58 +02:00
bell@sanja.is.com.ua
b4980d4383 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2006-04-11 14:49:33 +03:00
bell@sanja.is.com.ua
5fe95af804 Avoid trying to include <asm/atomic.h> when it doesn't work in C++ 
code. (Bug #13621)
 2006-04-10 21:57:29 +03:00
kent@mysql.com
2d8f8ac6e1 configure.in: 
Check for crypt() in libc first (bug#16478)
 2006-04-06 00:43:58 +02:00
bpontz@mysql.com
c1ac02a424 configure.in: 
Increased version number because of clone-off
 2006-03-29 22:20:16 +02:00
msvensson@neptunus.(none)
0811648e31 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
 2006-03-20 21:35:05 +01:00
msvensson@neptunus.(none)
8ca012aefb Don't look for "dlopen" if server linked with -static or -all-static flag. Update after review 2006-03-20 19:55:38 +01:00
msvensson@neptunus.(none)
7bb3f398e0 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my41-bug11835 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
 2006-03-10 10:15:50 +01:00
msvensson@neptunus.(none)
6d4aa0e215 Bug#11835 CREATE FUNCTION crashes server 
- Don't look for 'dl_open' if mysqld is compiled with "-all-static"
 2006-03-10 09:51:08 +01:00
brian@zim.(none)
78abb2d117 Porting fix that allows others to include compiled code with different parsers. 
Makes you wonder what I am up to, doesn't?
 2006-03-09 10:09:52 -08:00
bpontz@mysql.com
7410560baf configure.in: 
cloned
 2006-03-02 12:24:07 +01:00
monty@mysql.com
54274976e7 Fixed compiler warnings from gcc 4.0.2: 
- Added empty constructors and virtual destructors to many classes and structs
- Removed some usage of the offsetof() macro to instead use C++ class pointers
 2006-02-25 17:46:30 +02:00
konstantin@mysql.com
98091b152a Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-02-02 18:17:18 +03:00
kent@mysql.com
1318e790bc configure.in: 
Cloned off 4.1.18, new release number 4.1.19
 2006-01-27 12:10:40 +01:00
kent@mysql.com
4ad32690af configure.in: 
Generated "libmysql.ver" will be in \$(top_builddir)
 2006-01-27 01:38:05 +01:00
konstantin@mysql.com
d2bba04183 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-01-18 15:15:09 +03:00
svoj@april.(none)
70bb06685b Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1
 2006-01-18 00:02:25 +04:00
svoj@april.(none)
f84b301bd1 BUG#3074: Unversioned symbols in shared library 
libmysqlclient versioning when linked with GNU ld.
 2006-01-17 18:51:08 +04:00
joerg@mysql.com
e2b3b1f398 Increase the version number to 4.1.18 2006-01-17 12:55:30 +01:00
joerg@mysql.com
4e37b62ff9 Increment the version number to 5.0.19 2005-12-21 18:50:06 +01:00
ingo@mysql.com
97e3b90f65 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug10932
 2005-12-14 10:40:49 +01:00
jonas@perch.ndb.mysql.com
eae7c39a5c Update ndb version in configure.in 2005-12-13 12:12:41 +01:00
ingo@mysql.com
270cad2f63 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug10932
 2005-12-07 19:47:55 +01:00
knielsen@mysql.com
e7d218d2e9 Bump version number following 5.0.17 release clone-off 2005-12-07 12:43:32 +01:00
ingo@mysql.com
6b18dbef31 Bug#10932 - Building server with key limit of 128, makes test cases fail 
Allow for configuration of the maximum number of indexes per table.
Added and used a configure.in macro.
Replaced fixed limits by the configurable limit.
Limited MyISAM indexes to its hard limit.
Fixed a bug in opt_range.cc for many indexes with InnoDB.

Tested for 2, 63, 64, 65, 127, 128, 129, 255, 256, and 257 indexes.
Testing this part of the bugfix requires rebuilding of the server 
with different options. This cannot be done with our test suite. 
Therefore I added the necessary test files to the bug report.
If you repeat the tests, please note that the ps_* tests fail for
everything but 64 indexes. This is because of differences in the 
meta data, namely field lengths for index names etc.
 2005-12-02 16:27:18 +01:00
joerg@mysql.com
1a8ac44cff Raise the version number (as 4.1.16 has been cloned). 2005-11-30 21:50:09 +01:00
kent@mysql.com
58fc48046c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 13:17:20 +01:00
kent@mysql.com
133c00beb4 configure.in: 
Corrected "include/readline" link for "make distcheck"
 2005-11-19 12:58:22 +01:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-19 11:11:09 +01:00
jimw@mysql.com
f8ce7bc01e Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-17 13:37:30 -08:00
jimw@mysql.com
c1261f588f Merge mysql.com:/home/jimw/my/mysql-4.1-12640 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-17 10:59:21 -08:00
joerg@mysql.com
1aa66c59c0 Raise the version number to 5.0.17. 2005-11-09 14:12:44 +01:00
kent@mysql.com
b269caecb1 Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-04 01:15:35 +01:00
msvensson@neptunus.(none)
10163332a7 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13957/my50-bug13957
 2005-11-03 11:01:13 +01:00
msvensson@neptunus.(none)
b34fbd8629 Bug#13957 yassl: opensrv6c compile failure 
- Added some ifdefs and turn off auto template instantiation, use explicit template instantiation
 2005-11-03 10:37:49 +01:00
jimw@mysql.com
592a4c7cb3 Don't add optimization flags to CFLAGS if the user specified their 
own CFLAGS (ditto for CXXFLAGS). (Bug #12640)
 2005-11-02 18:29:06 -08:00
lenz@mysql.com
72343cef75 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/data0/mysqldev/lenz/mysql-5.0
 2005-11-01 17:39:09 +01:00
msvensson@neptunus.(none)
68fa03258a Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:45:30 +02:00
lenz@mysql.com
8303ca007a - after merge fixes 2005-10-28 11:10:29 +02:00
msvensson@neptunus.(none)
bb571de368 BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking 
- Remove yassl_libsfrom CLIENT_LIBS var
 - Add yassl_libs to libmysql and libmysqld
 2005-10-27 21:48:43 +02:00
lenz@mysql.com
6b123044d0 - after merge fixes 2005-10-27 16:53:14 +02:00
lenz@mysql.com
f793d7b5bf - Removed obsolete and outdated man page files from the man 
directory - these files are now maintained in the mysqldoc
   repository and included in the source distribution during the
   release build. Updated the configure.in script and Makefiles to
   create the man page file list at build time
 - Updated the file list in the RPM spec file to include all currently
   available man pages (this can not be done with wildcards, as
   the man pages are spread across several subpackages. However, RPM
   warns about unpackaged files, so newly added man pages can be 
   spotted)
 2005-10-27 14:51:58 +02:00
kent@mysql.com
977187eb30 configure.in: 
Set the version number to 5.0.16
 2005-10-20 13:37:54 +02:00
msvensson@neptunus.(none)
0684dc1342 Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking 
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs 
   to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
 2005-10-18 15:43:59 +02:00
lenz@mysql.com
dcb347bf8b configure.in: 
- reverted NDB version number, too
 2005-10-14 11:11:19 +02:00
lenz@mysql.com
921803e409 - revert version number in configure.in to 5.0.15 2005-10-14 11:03:40 +02:00
kent@mysql.com
c9d1e83edd configure.in: 
New version 5.0.16
 2005-10-14 01:46:26 +02:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-13 18:23:53 +03:00
jimw@mysql.com
cb0d8aba46 Merge mysql.com:/home/jimw/my/mysql-4.1-8731b 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:28:46 -07:00
jimw@mysql.com
c8a6c2c614 Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how 
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731)
 2005-10-11 09:12:12 -07:00
joerg@mysql.com
3a32f96e31 Increase the version number. 2005-10-07 12:50:29 +02:00
tomas@poseidon.ndb.mysql.com
cdab2c9392 Bug #11749 No message slogan found for Signal 8 received. (need better message) 
+ revised error messages after feedback
+ revides classifications and status
+ removed all progError(..0..) to make sure all error invocations have an error code
+ added some new error codes to replace some generic usage of SYSTEM_ERROR
+ removed some unused codes
 2005-10-05 16:35:28 +02:00
joerg@mysql.com
1345d1bf87 Raise the version. 2005-09-30 13:37:19 +02:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in: 
Enable "make distcheck" to work
 2005-09-24 15:51:45 +02:00
shuichi@mysql.com
a5a4c412f1 Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/shuichi/apps/mysql/bk/mysql-5.0b
 2005-09-21 11:18:04 -07:00
lenz@mysql.com
c87080877c - bumped up version number to 5.0.14-rc in the main tree (5.0.13-rc has 
been branched off)
 2005-09-15 14:57:50 +02:00
lenz@mysql.com
d8bd92895d - bumped up version number from 5.0.13-beta to 5.0.13-rc 
- tagged this ChangeSet as "clone-5.0.13-build"
 2005-09-15 14:53:38 +02:00
shuichi@mysql.com
63cdcbc0ec Fix for Bug#3982 
Added check for availability of multibyte characters and functions
 2005-09-14 21:47:24 -07:00
jimw@mysql.com
a60ed0b75d Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-12 17:00:50 -07:00
jimw@mysql.com
0eec7c3cf4 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-09-12 16:48:00 -07:00
kent@mysql.com
b3446746b9 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-09-13 01:12:17 +02:00
jimw@mysql.com
16e5f22162 Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-09-12 10:19:56 -07:00
joerg@mysql.com
1b2bd746e8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/M40/mysql-4.0
 2005-09-08 12:57:33 +02:00
joerg@mysql.com
54ceb62b8d Merge mysql.com:/M40/clone-4.0 into mysql.com:/M40/upward-4.0 2005-09-08 11:04:43 +02:00
kent@mysql.com
c364baff71 configure.in: 
Flag -DHAVE_DARWIN_THREADS not needed for darwin9
 2005-09-08 03:06:49 +02:00
jimw@mysql.com
a540a66b26 Port to SCO OpenServer 6. May require running ./configure with 
--build=i686-unknown-sysv5SCO_SV6.0.0
 2005-09-07 20:23:07 +02:00
kent@mysql.com
5e5184752d configure.in: 
Back port of code to find the right 'ps' settings
 2005-09-02 10:44:20 +02:00
jimw@mysql.com
d6db387aea Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-31 19:12:16 -07:00
jimw@mysql.com
37bf8394ab Add test for madvise() being declared in C++ code, because it is not 
on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156)
 2005-08-31 10:08:55 -07:00
joerg@mysql.com
415ca4b55b Clone of 4.0.26 is taken, increase version number. 2005-08-31 12:13:22 +02:00
kent@mysql.com
01f3a901a9 configure.in: 
Changed back to 5.0.13-beta
 2005-08-31 03:45:04 +02:00
joerg@mysql.com
2d494220db Reverted a change that breaks "automake". 2005-08-25 18:48:18 +02:00
joerg@mysql.com
1a4e2ef94b Reset version number in the build clone. 2005-08-25 16:57:54 +02:00
jimw@mysql.com
e11e73173f Fix for building without --without-server, which was broken by fix 
for building with --without-server.
 2005-08-24 17:08:55 -07:00
jimw@mysql.com
6964b7491e Merge mysql.com:/home/jimw/my/mysql-5.0-11680 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-24 15:54:23 -07:00
joerg@mysql.com
6fcc98ddb5 Increase version number (but leave status still at "beta"). 2005-08-24 13:41:34 +02:00
jimw@mysql.com
cf5dd176c0 Fix build using --without-server. (Bug #11680) 2005-08-23 11:25:24 -07:00
tomas@poseidon.ndb.mysql.com
83664a8365 configure.in: 
fixed build bug with ndb grep block
 2005-08-23 13:01:46 +02:00
serg@sergbook.mysql.com
1fbb96ea97 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2005-08-23 14:16:17 +04:00
tomas@poseidon.ndb.mysql.com
653e99dea2 removed ndb grep from configure .in 2005-08-23 12:16:16 +02:00
serg@sergbook.mysql.com
eadb86d56f after pull cleanup 2005-08-22 13:20:02 +04:00
elliot@mysql.com
55b81af671 Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/home/emurphy/src/work/mysql-5.0
 2005-08-19 15:29:30 -04:00
joerg@mysql.com
09a3d58987 Increase the version number to 4.1.15 (as 4.1.14 has been cloned off). 2005-08-17 15:03:29 +02:00
serg@sergbook.mysql.com
2870638ef2 client/mysql.cc 
mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
configure.in
    autoconf 2.52 is enough to build mysql-5.0
 2005-08-14 14:06:47 +02:00
serg@serg.mylan
8e5b5d3be7 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-08-06 22:04:32 +02:00
joerg@mysql.com
9959482c95 Ensure version is 5.0.12 (block the clone's "11" from the main tree). 2005-08-05 21:13:06 +02:00
joerg@mysql.com
23603ca7cb Reset the version to 5.0.11 (this is within the updated clone). 2005-08-05 16:35:04 +02:00
lenz@mysql.com
a6182100f1 - Bumped up version number to 5.0.12-beta to indicate the 5.0.11 release build branchoff 2005-08-04 15:20:03 +02:00
serg@serg.mylan
8eb3eacc38 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-07-31 21:11:51 +02:00
joerg@mysql.com
1b4e19f3e6 Increase version number (prepare for new build including security fixes in "zlib"). 2005-07-29 11:54:22 +02:00
joerg@mysql.com
58a6214560 Upgraded the version number, as 5.0.10 is cloned off. 
This push includes the clone tag.
 2005-07-20 18:31:33 +02:00
konstantin@mysql.com
52ba7b69d7 After-merge fixes. 2005-07-19 03:01:25 +04:00
konstantin@mysql.com
52b8928b09 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root 
into  mysql.com:/home/kostja/mysql/mysql-5.0-merge
 2005-07-19 00:55:37 +04:00
konstantin@mysql.com
8b3d39163a Alleviate the autoconf requirement. 2005-07-18 18:03:58 +04:00
serg@serg.mylan
1736483435 Merge 2005-07-17 21:34:57 +02:00
georg@lmy002.wdf.sap.corp
9293bdc849 fix for bug#11893 
increased version number for shared lib to 15
 2005-07-16 00:23:33 +02:00
joerg@mysql.com
ae949ccdd5 4.1.13 has been cloned off 2005-07-13 15:55:22 +02:00
joerg@mysql.com
8b2f9e8f25 Increase version number to 5.0.10, as 5.0.9 has been cloned off. 2005-07-06 12:54:22 +02:00
lenz@mysql.com
c760d27cf1 - bumped up version number in configure.in to 4.0.26 2005-07-04 12:58:53 +02:00
kent@mysql.com
22fd02d157 configure.in: 
Enable build with CXX=gcc and gcc version 4
 2005-07-02 02:00:56 +02:00
msvensson@neptunus.(none)
289553f3ec Bump required version of autoconf to 2.58 2005-06-29 16:41:49 +02:00
kent@mysql.com
7817b69d80 configure.in: 
Enable build with CXX=gcc and gcc version 4
 2005-06-28 04:44:27 +02:00
lenz@mysql.com
4bbb39ac8c - bumped up version number to 5.0.9 now that the 5.0.8 builds have been branched off 2005-06-23 22:41:26 +02:00
svoj@mysql.com
367017d630 WL#2286 - Compile MySQL w/YASSL support 
Fix for compilation failure with Forte Developer C++.
 2005-06-23 21:29:44 +05:00
svoj@mysql.com
c275bde204 Better AR guessing. 2005-06-22 16:29:21 +05:00
svoj@mysql.com
55ae33e8f4 Better comment. 2005-06-22 15:10:12 +05:00
svoj@mysql.com
74373e7d54 WL#2286 - Compile MySQL w/YASSL support 
Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.
 2005-06-22 14:08:28 +05:00
svoj@mysql.com
7660f609e6 WL#2286 - Compile MySQL w/YASSL support 
Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
These compilers have problem with implicit template instantiation in archives
(libyassl.a, libtaocrypt.a). Instantiate templates explicitly.

Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
__cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
 2005-06-19 21:46:44 +05:00
serg@serg.mylan
271f9e484d config/ac-macros/yassl.m4: fix --without-yassl 
configure.in:                  fix --without-darwin-mwcc
 2005-06-18 16:10:53 +02:00
joerg@mysql.com
bd0386839c "configure.in": Correct equality comparison: In shell 'test', it is single '=' (bug#11007). 2005-06-16 13:44:08 +02:00
jimw@mysql.com
153f233627 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-09 19:27:45 -07:00
jimw@mysql.com
927418b199 Make sure we don't mistake a "grep mysqld" for a mysqld process 
when checking if the server is running in mysqld_safe. (Bug #11122)
 2005-06-08 18:57:39 -07:00
joerg@mysql.com
bccd45ca03 Builds of 5.0.7 have begun, so anything added into this tree here will go into 5.0.8. 2005-06-07 19:28:43 +02:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before* 
'#pragma interface' (that comes with the #include'd header file)
 2005-06-05 19:38:52 +02:00
lenz@mysql.com
9afd2563e9 Merge of 4.1 -> 5.0 2005-06-01 15:11:14 +02:00
lenz@mysql.com
e877e71b17 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-06-01 13:06:15 +02:00
lenz@mysql.com
7bd3dd7cb3 - removed references to some obsolete files (BUG#10824) 
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)
 2005-06-01 12:59:10 +02:00
lenz@mysql.com
c58535f6d3 - merged the 4.1.12a Changes back into the main tree 2005-05-26 11:43:47 +02:00
lenz@mysql.com
4a296d4f00 - bumped up version number string to 4.1.12a 2005-05-24 15:14:21 +02:00
msvensson@neptunus.(none)
3f97312341 Change to 5.0.7(again) 2005-05-20 00:04:43 +02:00
msvensson@neptunus.(none)
08d8be1461 Cset exclude: matt@mysql.com|ChangeSet|20050519052223|06259 
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050425090838|60886
 2005-05-19 23:52:17 +02:00
matt@mysql.com
8091707afe configure.in: 
Increment to next version.
 2005-05-19 07:22:23 +02:00
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07:00
monty@mysql.com
db40af2a6f Fix warnings from icc 
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
 2005-05-18 19:00:21 +03:00
matt@mysql.com
8ed0aaacdf Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
 2005-05-18 04:06:27 +02:00
serg@serg.mylan
56fa40e558 sql_yacc.yy: 
missing semicolon added
sql_base.cc:
  bad merge fixed
sp_head.cc, view.test, view.result:
  Correct restoring view name in SP table locking BUG#9758
configure.in:
  restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure
 2005-05-17 17:08:43 +02:00
msvensson@neptunus.(none)
ffd6f926ca Build fixes 2005-05-16 11:24:41 +02:00
konstantin@mysql.com
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +04:00
lenz@mysql.com
f6593cb7d4 - added a check for "u_int32_t" to configure.in that will define 
HAVE_U_INT32_T when available (needed to fix a double typedef in
  libedit)
 2005-05-12 18:18:37 +02:00
kent@mysql.com
7c65e20e32 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
 2005-05-10 13:56:08 +02:00
kent@mysql.com
faf8f825b5 Makefile.am, configure.in: 
Enable creation of embedded lib when --with-darwin-mwcc
 2005-05-10 13:53:47 +02:00
kent@mysql.com
2f9a28b4cc configure.in: 
Bumped up version number to indicate 4.1.12 was branched off
 2005-05-09 18:14:10 +02:00
gbichot@production.mysql.com
a1948f769c [backport of 4.1, because 4.0 autobuild now hits the same problem; 
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
 2005-05-07 11:35:14 +02:00
shuichi@mysql.com
2244ae8cef Added cp932 character set 2005-05-05 11:37:52 -07:00
serg@sergbook.mylan
6b053194db Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-05 16:22:32 +02:00
serg@sergbook.mylan
83dfc216a7 gcc 2.92 compatibility 2005-05-05 16:21:17 +02:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
kent@mysql.com
c4acdc6e0f terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h: 
Initial Metrowerks CodeWarrior compiler support
 2005-05-05 09:15:14 +02:00