Commit graph

34065 commits

Author SHA1 Message Date
lenz@metis.lenznet
cd2a657b01 Merge metis.lenznet:/space/my/bk/mysql-5.0
into  metis.lenznet:/space/my/bk/mysql-5.0-community
2007-01-09 12:27:56 +01:00
cmiller@zippy.cornsilk.net
b8946fa4be Community version numbering. 2007-01-08 15:57:03 -05:00
kent@mysql.com/kent-amd64.(none)
fa5a359f07 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-05 16:57:23 +01:00
kent@mysql.com/kent-amd64.(none)
528b457644 mysql.spec.sh, make_binary_distribution.sh:
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture
2007-01-05 16:53:03 +01:00
mmj@tiger.mmj.dk
8941159ed8 Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-4.1-build
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
2007-01-04 23:20:04 +01:00
mmj@tiger.mmj.dk
f61a873c60 my_global.h:
Patch from Alfredo for TARGET_FAT_BINARY
2007-01-04 23:18:04 +01:00
mmj@tiger.mmj.dk
f0d503a8f2 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
2007-01-04 22:33:34 +01:00
mmj@tiger.mmj.dk
37ae5bbbbe my_global.h:
Add patch from Alfredo for TARGET_FAT_BINARY
2007-01-04 22:22:25 +01:00
cmiller@zippy.cornsilk.net
68428545a5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-community
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
2007-01-03 18:24:28 -05:00
cmiller@zippy.cornsilk.net
10cdf90bd3 Bug#24795: Add SHOW PROFILE
Patch contributed by Jeremy Cole.  CLA received Oct 2006 by Kaj Arnö

Add rudimentary query profiling support.
2007-01-03 17:15:10 -05:00
kent@mysql.com/kent-amd64.(none)
499eb4d8ba view.result:
Temporary work around for bug#25359
2007-01-02 11:01:48 +01:00
kent@mysql.com/kent-amd64.(none)
769e177090 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 10:51:44 +01:00
kent@mysql.com/kent-amd64.(none)
0bc6df6a24 Many files:
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
2007-01-01 10:50:39 +01:00
kent@mysql.com/kent-amd64.(none)
344599948d mysqld.cc, configure.in:
Don't use thread priority by default on Mac OS X (bug#18526)
2007-01-01 09:54:41 +01:00
kent@mysql.com/kent-amd64.(none)
fd833d7037 configure.in:
Build "mysqld_error.h" even if configured --withouth-server (bug#21265)
2007-01-01 08:49:17 +01:00
kent@mysql.com/kent-amd64.(none)
1febd444a2 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 07:23:43 +01:00
kent@mysql.com/kent-amd64.(none)
473b0c7287 configure.in:
Don't build server when configured --without-server (bug#23973)
2007-01-01 07:22:57 +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)
efd16938ce Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-01-01 05:34:17 +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@mysql.com/kent-amd64.(none)
1b8bd0d246 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:04:07 +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
joerg@trift2.
cb5e2b3004 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-12-28 18:22:43 +01:00
joerg@trift2.
4e7118c70b Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-12-28 18:10:21 +01:00
stewart@willster.(none)
344d78a563 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
2006-12-28 22:53:21 +11:00
tomas@poseidon.mysql.com
4333bcabd7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2006-12-27 19:36:41 +01:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
82b03f29ac Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into  xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
2006-12-26 16:23:05 -08:00
svoj@mysql.com/june.mysql.com
591712f53f BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try to
repair it

Multi-table delete that is optimized with QUICK_RANGE reports table
corruption.

DELETE statement must not use KEYREAD optimization, and sets
table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.

With this fix QUICK_RANGE optimization honors table->no_keyread
value and does not enable KEYREAD when it is requested.
2006-12-26 17:47:30 +04: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
joerg@trift2.
930893d247 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-12-21 18:00:42 +01:00
istruewing@chilla.local
ea353c72a6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-21 17:13:38 +01:00
joerg@trift2.
51fcec6a20 configure.in : Update of the NDB version number was missing, do it. 2006-12-21 13:35:41 +01:00
joerg@trift2.
3103f56812 Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-12-21 12:45:41 +01:00
joerg/mysqldev@bk-internal.mysql.com
a420981f74 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-build
2006-12-20 22:29:03 +01:00
istruewing@chilla.local
33b96c3036 Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-20 18:22:26 +01:00
istruewing@chilla.local
d9b9778e53 Bug#25213 - Compiler warnings in MyISAM code
Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls,
due to non-used parameters (in non-debug mode), and
due to seemingly uninitialized variables.

Initialized variables, declared parameters unused, and
casted DBUG_PRINT arguments to get rid of warnings.
2006-12-20 15:32:02 +01:00
istruewing@chilla.local
1d69857c4d Bug#25208 - Warnings in mi_packrec.c
Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls.

Fixed DBUG_PRINT format specifiactions.
2006-12-20 15:18:09 +01:00
df@kahlann.erinye.com
dbf5fe90a6 add file to VC++ project file 2006-12-20 13:23:33 +01:00
joerg@trift2.
d9ff6ef3fa Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M50/clone-5.0
2006-12-20 11:17:31 +01:00
joerg@trift2.
90fc044fc2 Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415). 2006-12-20 11:13:16 +01:00
joerg@trift2.
c9572a10c4 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release
into  trift2.:/MySQL/M50/clone-5.0
2006-12-20 10:58:16 +01:00
joerg@trift2.
eb7dfa032c Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-12-20 10:56:43 +01:00
joerg@trift2.
f9802fd47d Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trudy Pelzer 2006-12-20 10:54:41 +01:00
df@kahlann.erinye.com
dc33e0f49d Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-24896
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-20 10:40:05 +01:00
df@kahlann.erinye.com
e55331b4ed Merge dev:my/build-200612151202-5.0.32/mysql-5.0-release
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-20 09:44:47 +01:00
tsmith/tim@siva.hindu.god
945756e484 Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
into  siva.hindu.god:/usr/home/tim/m/bk/50-build
2006-12-19 20:23:34 -07:00
tsmith/tim@siva.hindu.god
7c82a06dcf Remove warnings by casting 2006-12-19 20:17:33 -07:00
tsmith/tim@siva.hindu.god
73932df7d0 Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
into  siva.hindu.god:/usr/home/tim/m/bk/50-build
2006-12-19 17:46:28 -07:00
tsmith/tim@siva.hindu.god
84a0873d05 Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200
into  siva.hindu.god:/usr/home/tim/m/bk/50-release
2006-12-19 17:43:56 -07:00