monty@narttu.mysql.fi
8a80e36ac3
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
mtaylor@qualinost.(none)
f8f11eb2d9
Reverting change adding /etc/mysql support, as it breaks some installs.
2007-01-26 12:17:50 -08:00
mtaylor@qualinost.(none)
58ae89cb76
User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0.
2007-01-26 12:00:38 -08:00
jani@ua141d10.elisa.omakaista.fi
0b4ee9e5b8
Cleanup of thread-type (linuxthread or NTPL) detection code
...
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
2007-01-25 20:10:31 +02:00
svoj@april.(none)
3efc296508
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-01-25 01:44:30 +04:00
svoj@mysql.com/april.(none)
ea7fe60fbc
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-01-25 01:26:57 +04: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
iggy@recycle.(none)
205f7a0583
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-19 13:20:52 -05:00
iggy@recycle.(none)
0343fd801c
Merge recycle.(none):/src/bug22807/my51-bug22807
...
into recycle.(none):/src/mysql-5.1-maint
2007-01-19 13:19:12 -05:00
iggy@recycle.(none)
d6d5195cbd
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/bug22807/my51-bug22807
2007-01-19 13:11:03 -05:00
iggy@recycle.(none)
d3e6cb6b3b
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Corrected compiler warnings and performance problems with new
dynstr_append_os_quoted function.
2007-01-19 13:09:48 -05:00
tsmith@siva.hindu.god
1fbf01baf0
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:34:51 -07:00
tsmith@siva.hindu.god
02ddf3d04c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:33:28 -07:00
tsmith@siva.hindu.god
6b729ff2cd
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 10:30:39 -07:00
tsmith@siva.hindu.god
244b2004ee
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:06:36 -07:00
iggy@recycle.(none)
294af0a42e
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-18 11:46:29 -05:00
iggy@recycle.(none)
e6d1953c8d
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/bug22807/my51-bug22807
2007-01-18 11:40:22 -05:00
iggy@recycle.(none)
ef5f757ac2
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Create space safe strings for system() calls in mysql_upgrade.exe
2007-01-18 11:38:05 -05:00
tsmith@siva.hindu.god
94f7990ef8
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:41:52 -07:00
lars/lthalmann@dl145j.mysql.com
1e356251a0
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-12 12:31:44 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c380de50ef
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-01-12 12:22:54 +01:00
cmiller@zippy.cornsilk.net
9ff7d182e3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:44:39 -05:00
cmiller@zippy.cornsilk.net
896e2623eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:43:44 -05:00
thek@kpdesk.mysql.com
85c33ace3f
Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
2007-01-11 15:25:13 +01:00
thek@kpdesk.mysql.com
36fc42cb10
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2007-01-11 15:23:34 +01:00
thek@kpdesk.mysql.com
965aa4c74f
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2007-01-11 15:21:06 +01:00
thek@kpdesk.mysql.com
75d91dedac
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2007-01-11 15:16:33 +01:00
thek@kpdesk.mysql.com
55558582ae
Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
2007-01-11 15:14:34 +01:00
thek@kpdesk.mysql.com
1802d5aabb
Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2007-01-11 14:11:58 +01:00
thek@kpdesk.mysql.com
f4f37a8049
Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
2007-01-11 14:10:04 +01:00
thek@kpdesk.mysql.com
f7688d5f10
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2007-01-11 14:08:12 +01:00
thek@kpdesk.mysql.com
0982a1d9b4
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2007-01-11 14:04:01 +01:00
Kristofer.Pettersson@naruto.
472ff94b4d
Merge naruto.:C:/cpp/bug24751/my41-bug24751
...
into naruto.:C:/cpp/mysql-4.1-maint
2007-01-11 13:13:06 +01:00
Kristofer.Pettersson@naruto.
d9ad0cd0ba
Merge naruto.:C:/cpp/bug24751/my50-bug24751
...
into naruto.:C:/cpp/mysql-5.0-maint
2007-01-11 13:09:13 +01:00
Kristofer.Pettersson@naruto.
a27ca8d0ad
Merge naruto.:C:/cpp/bug24751/my51-bug24751
...
into naruto.:C:/cpp/mysql-5.1-maint
2007-01-11 12:22:15 +01:00
Kristofer.Pettersson@naruto.
552e9a5d4b
Merge naruto.:C:/cpp/bug24751/my50-bug24751
...
into naruto.:C:/cpp/bug24751/my51-bug24751
2007-01-11 10:43:14 +01:00
Kristofer.Pettersson@naruto.
3adcf75e1d
Merge naruto.:C:/cpp/bug24751/my41-bug24751
...
into naruto.:C:/cpp/bug24751/my50-bug24751
2007-01-11 09:41:44 +01:00
Kristofer.Pettersson@naruto.
270752654e
Bug#24751 - Possible infinit loop in init_io_cache() when insufficient memory
...
- When cache memory can't be allocated size is recaclulated using 3/4 of
the requested memory. This number is rounded up to the nearest
min_cache step.
However with the previous implementation the new cache size might
become bigger than requested because of this rounding and thus we get
an infinit loop.
- This patch fixes this problem by ensuring that the new cache size
always will be smaller on the second and subsequent iterations until
we reach min_cache.
2007-01-11 09:40:17 +01:00
thek@kpdesk.mysql.com
a73273c758
Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.0
2007-01-09 14:37:52 +01:00
thek@kpdesk.mysql.com
0906993457
Cset exclude: thek@kpdesk.mysql.com|ChangeSet|20061106104152|07628
2007-01-09 12:28:46 +01:00
cmiller@zippy.cornsilk.net
a16eaf3301
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
2007-01-07 09:31:49 -05:00
istruewing@chilla.local
54c147a1bc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-01-03 10:27:51 +01:00
istruewing@chilla.local
d37ff7d7bc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-01-03 08:52:50 +01:00
kent@mysql.com/kent-amd64.(none)
67868597bb
Many files:
...
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
Changed copyright header formatting some
plugin_example.c, daemon_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +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
svoj@april.(none)
de87e3174c
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-12-30 04:36:06 +04:00
svoj@mysql.com/april.(none)
bcbb50c1d2
Merge mysql.com:/home/svoj/devel/mysql/BUG23526/mysql-5.0-engines2
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-12-30 03:44:25 +04:00