joerg@trift-lap.fambruehe
f723388b18
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 16:03:02 +02:00
msvensson@pilot.blaudden
b841154e65
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-24 14:07:30 +02:00
joerg@trift2.
6aae2bfe9f
Merge trift2.:/MySQL/M50/bug27456-5.0
...
into trift2.:/MySQL/M51/bug27456-5.1
2007-04-13 10:53:35 +02:00
joerg@trift2.
a3c70abb4e
Header file "decimal.h" needs to be delivered with binary packages:
...
Bug#27456 decimal.h is not installed with public include files
2007-04-12 21:50:56 +02:00
msvensson@pilot.blaudden
7563ebefca
Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h
...
- Move marcos for __attribute__ usage to my_attribute.h and
include that file where needed
2007-04-12 00:43:25 +02:00
msvensson@pilot.blaudden
2218fafa1f
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
msvensson@pilot.blaudden
b554258a8e
Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit
...
- Move the link_sources command from top level Makefile into each subdir
that need to link files
2007-03-27 23:56:48 +02:00
kent@kent-amd64.(none)
9d396c6996
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 13:29:11 +01:00
kent@mysql.com/kent-amd64.(none)
30537c7d75
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-12 13:22:02 +01:00
kent@mysql.com/kent-amd64.(none)
cad1c35618
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-12 13:15:11 +01:00
kent@mysql.com/kent-amd64.(none)
4e4f184170
Makefile.am, configure.in, mysys.dsp:
...
Removed unused files
.del-my_winsem.c:
Delete: mysys/my_winsem.c
.del-my_semaphore.c:
Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
Delete: include/my_semaphore.h
2007-03-12 13:12:42 +01:00
kent@kent-amd64.(none)
58763e383e
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729
my_strtoll10-x86.s:
...
Corrected spelling in copyright text
Makefile.am:
Don't update the files from BitKeeper
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Many files:
Added GPL copyright text
Removed files:
Docs/Support/colspec-fix.pl
Docs/Support/docbook-fixup.pl
Docs/Support/docbook-prefix.pl
Docs/Support/docbook-split
Docs/Support/make-docbook
Docs/Support/make-makefile
Docs/Support/test-make-manual
Docs/Support/test-make-manual-de
Docs/Support/xwf
2006-12-31 01:02:27 +01:00
kent@kent-amd64.(none)
be15e3bc15
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +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)
971c783f7d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
kent@mysql.com/kent-amd64.(none)
4dc1132159
Makefile.am:
...
Disabled abi_check, as it was before merge
2006-12-03 00:25:52 +01:00
kent@kent-amd64.(none)
2b5e2230bb
Merge mysql.com:/home/kent/bk/mysql-5.0-build
...
into mysql.com:/home/kent/bk/mysql-5.1-build
2006-12-02 23:22:53 +01: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
msvensson@neptunus.(none)
10d4ecfbe6
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-13 13:36:50 +01:00
msvensson@neptunus.(none)
3eff32965d
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 13:33:33 +01:00
msvensson@neptunus.(none)
0ef85c5d8d
Remove the tmp file produced when checking abi
2006-11-13 13:32:39 +01:00
msvensson@neptunus.(none)
abd1e54de7
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-04 09:32:36 +01:00
msvensson@neptunus.(none)
39a346b79a
Updates for abi_check
2006-11-04 09:23:19 +01:00
msvensson@neptunus.(none)
b850ae8a54
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-03 14:40:52 +01:00
msvensson@neptunus.(none)
74496f8d01
Remove sql_state-h from list of include files. (Merge error from 4.1)
2006-11-03 13:02:16 +01:00
msvensson@neptunus.(none)
a2e38573bd
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-01 16:11:56 +01:00
msvensson@shellback.(none)
f11aa15c4a
Disable abi_check in 5.1 for the moment
2006-10-27 16:36:08 +02:00
msvensson@neptunus.(none)
abc1c05449
Update the rules for abi_check
2006-10-27 15:57:00 +02:00
msvensson@neptunus.(none)
00fbaf07d1
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-26 22:25:45 +02:00
msvensson@neptunus.(none)
b5b39a4afb
Bug#23427 incompatible ABI change in 5.0.26?
...
- Improve icheck rules in Makefile.am
2006-10-26 22:20:43 +02:00
msvensson@neptunus.(none)
74d8113c2e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 22:02:33 +02:00
msvensson@neptunus.(none)
e0985bef96
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
1a7676fa65
WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks
...
BUG#23427 incompatible ABI change in 5.0.26?
- Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file
2006-10-24 20:32:07 +02:00
elliot@mysql.com
bc2b96fee3
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
2006-06-25 09:59:34 -04:00
jani@ua141d10.elisa.omakaista.fi
c22e7f2dfd
Fix for Bug#18246 "compilation error with tcp_wrapper"
2006-06-21 02:23:18 +03:00
serg@serg.mylan
2b9b84460a
mention new files in Makefile
2006-06-01 00:03:05 +02:00
brian@zim.(none)
eaf850ef5b
Drop a number of OS2 specific files.
2006-04-10 17:48:19 -07:00
brian@zim.(none)
cb07d52a7e
This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.
2006-02-24 13:20:51 -08:00
svoj@april.(none)
7e8b145b94
BUG#17117: header fille "plugin.h" does not have a namespace prefix
...
plugin.h has been moved into include/mysql/plugin.h
2006-02-14 13:51:25 +04:00
bar@mysql.com
d7c773834b
WL#1386 - CTYPE table for unicode character sets
...
A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
Adding new function
Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
Adding new member into MY_CHARSET_HANDLER
Makefile.am:
Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
new files:
ctype data for unicode,
and the tool to generate it from
a Unicode Character Database file.
2006-02-02 10:07:47 +04:00
anozdrin@mysql.com
b1705ae5c4
Merge BUG#15110 from 5.0 into 5.1.
...
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:09:27 +03:00
anozdrin@mysql.com
b04b851ef9
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
...
There are two main idea of this fix:
- introduce a common function for server and client to split user value
(<user name>@<host name>) into user name and host name parts;
- dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
msvensson@neptunus.(none)
dad7268273
Add yassl libs to libmysqlclient_r as well.
...
Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
Similiar to readline)
2006-01-09 10:01:07 +01:00
msvensson@neptunus.(none)
2362c7314a
Merge neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
...
into neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
2006-01-04 16:34:03 +01:00
msvensson@neptunus.(none)
5bacd5067f
Add yassl libs to libmysqlclient_r as well.
...
Add a link to extra/yassl/include/openssl to inlude when compiling with yassl
Similiar to readline)
2006-01-04 16:33:06 +01:00
lars@mysql.com
ad126d90e0
WL#1012: All changes as one single changeset.
...
This includes both code and test cases.
2005-12-22 06:39:02 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
monty@mysql.com
cdf64f0f57
Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)
...
This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
2005-11-05 13:20:35 +02:00