monty@narttu.mysql.fi
7df1dbcd74
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-01-22 19:18:22 +02:00
monty@mysql.com/narttu.mysql.fi
2dcc7110c9
Give warnings for unused objects
...
Changed error message to be compatible with old error file
Added new error message for new DUP_ENTRY syntax
2007-01-22 18:42:52 +02:00
df@kahlann.erinye.com
064b77a890
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work1-testcases-20061
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2007-01-22 16:37:27 +01:00
df@kahlann.erinye.com
9ed4299e22
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work1-testcases-20061
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-22 16:35:36 +01:00
df@kahlann.erinye.com
58bf072264
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2007-01-22 16:30:53 +01:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-01-22 14:04:40 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
f6e70c1453
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2007-01-22 03:33:59 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
ff58749b29
Fix for configure to detect library correctly.
...
Fix to check library in use during runtime.
Fix for Bug#16995, "idle connections not being killed due to timeout when NPTL is used".
2007-01-22 02:32:07 +02:00
tsmith@siva.hindu.god
cc7afe2494
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00
cmiller@zippy.cornsilk.net
c9a0cccc23
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-17 13:34:36 -05:00
cmiller@zippy.cornsilk.net
940e722788
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-17 13:30:01 -05:00
cmiller@zippy.cornsilk.net
00fc0fa9ee
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my51-bug23721
2007-01-17 13:25:05 -05:00
cmiller@zippy.cornsilk.net
8a746fc0d2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
2007-01-17 13:24:20 -05:00
cmiller@zippy.cornsilk.net
332f9ff8b4
Bug#23721: compile fails: check-cpu mishandles cpu flags with \
...
hyphen in it (like ds-cpl).
convert illegal chars in cpu flags to '_' for variable assignment
2007-01-17 13:22:50 -05:00
cmiller@zippy.cornsilk.net
993f325d37
Post-merge cleanup and fix minor BUILD/... "="-equality syntax
...
error.
2007-01-07 12:21:42 -05:00
kent@kent-amd64.(none)
4b2067f324
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-01-01 05:37:55 +01:00
kent@mysql.com/kent-amd64.(none)
21c7eca2bf
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 05:35:10 +01:00
kent@mysql.com/kent-amd64.(none)
88b3c4f03a
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 05:31:23 +01:00
kent@mysql.com/kent-amd64.(none)
0255a1c9c2
mysql_secure_installation.sh:
...
Portable handling of "echo" without newline (bug#24605)
check-cpu:
In developer script safe to use "printf", not "echo -n"
2007-01-01 05:30:31 +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
df@kahlann.erinye.com
3cd034c08e
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2006-12-20 17:52:59 +01:00
df@kahlann.erinye.com
d629e41329
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-20 17:43:45 +01:00
df@kahlann.erinye.com
263876f373
BUG#20061 build script can not detect my cpu
2006-12-20 17:42:44 +01:00
monty@mysql.com/narttu.mysql.fi
88dd873de0
Fixed compiler warnings detected by option -Wshadow and -Wunused:
...
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments
Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c
I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
2006-12-15 00:51:37 +02:00
knielsen/pushbuild@production.mysql.com
afd96d6498
More fully disable ccache when not compatible with gcov.
...
This helps on systems where `which gcc` really points to ccache.
2006-11-28 22:31:05 +01:00
monty@mysql.com/nosik.monty.fi
0e149b7170
Removed compiler warnings
...
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
2006-11-27 18:16:08 +02:00
monty@mysql.com/nosik.monty.fi
e825879800
Remove compiler warnings
...
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
jani@ua141d10.elisa.omakaista.fi
596f64d91a
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string
2006-11-16 14:38:45 +02:00
kostja@bodhi.local
103e0d5ec9
Fix a typo in SETUP.sh
2006-11-06 11:30:54 +03:00
jani@ua141d10.elisa.omakaista.fi
8dd0b2d0ae
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string
2006-10-17 19:54:44 +03:00
jani@ua141d10.elisa.omakaista.fi
02f29377fd
Changed several char* to LEX_STRING*.
2006-10-16 19:57:33 +03:00
brian@zim.(none)
24df00f232
Merge brian@dib.tangent.org:/export/home/brian/mysql/gnu-5.1
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-13 22:09:05 -07:00
brian@dib.
5371798e82
This fixes support for building mysql on Solaris with GNU tools.
2006-09-13 22:09:04 -07:00
jonas@perch.ndb.mysql.com
f8fdc3bcb0
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-05 15:05:52 +02:00
tsmith@maint2.mysql.com
5f5cb7d1f6
Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51
...
into maint2.mysql.com:/data/localhome/tsmith/bk/51
2006-09-04 23:05:17 +02:00
evgen@moonbone.local
e1c245bff3
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt
...
into moonbone.local:/work/tmp_merge-5.1-mysql
2006-09-01 14:08:38 +04:00
jonas@perch.ndb.mysql.com
1ff0ef83ee
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-09-01 10:20:35 +02:00
evgen@moonbone.local
94028c618f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-31 12:14:27 +04:00
tsmith@maint2.mysql.com
0af0180468
Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50
...
into maint2.mysql.com:/data/localhome/tsmith/bk/50
2006-08-31 00:01:43 +02:00
tsmith@maint2.mysql.com
6809271303
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
...
into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/51
2006-08-30 23:20:01 +02:00
tsmith@maint2.mysql.com
d5ee5049be
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
...
into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
2006-08-30 23:14:29 +02:00
tsmith@maint2.mysql.com
843135ae1f
portability fix in BUILD/* for solaris
2006-08-30 21:24:09 +02:00
tsmith@maint2.mysql.com
0da8a4e321
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40
...
into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
2006-08-30 20:04:33 +02:00
jonas@perch.ndb.mysql.com
c2d2b88b4c
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-08-30 08:24:45 +02:00
jonas@perch.ndb.mysql.com
365b69dc7f
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 22:56:23 +02:00
evgen@moonbone.local
8cf9781717
Merge moonbone.local:/work/tmp_merge-5.0-mysql
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-29 18:58:50 +04:00
tsmith@maint1.mysql.com
54e73e93d7
minor portability fix in SETUP.sh
2006-08-29 01:13:06 +02:00