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 |
|
tsmith@siva.hindu.god
|
6fd02a439f
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
|
2007-01-18 09:53:30 -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)
|
1b32febd2e
|
Merge recycle.(none):/src/bug22807/my51-bug22807
into recycle.(none):/src/mysql-5.1-maint
|
2007-01-18 11:43:55 -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
|
eec44018b2
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
|
2007-01-18 09:32:41 -07:00 |
|
tsmith@siva.hindu.god
|
fcd5f26d01
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
|
2007-01-18 09:22:20 -07:00 |
|
tsmith@siva.hindu.god
|
d4aa9f0c62
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
|
2007-01-18 09:21:27 -07:00 |
|
tsmith@siva.hindu.god
|
2dc96063b4
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
|
2007-01-18 09:20:25 -07:00 |
|
tsmith@siva.hindu.god
|
a5f153efd3
|
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
|
2007-01-18 09:16:07 -07:00 |
|
tsmith@siva.hindu.god
|
e39a4e6006
|
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
|
2007-01-18 08:55:33 -07:00 |
|
tsmith@siva.hindu.god
|
4b3840612e
|
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
|
2007-01-18 08:52:45 -07: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 |
|
joerg/mysqldev@mysql.com/production.mysql.com
|
c3ab6de255
|
Raise version number after cloning 4.0.29
|
2007-01-18 16:41:32 +01:00 |
|
iggy@alf.
|
e08238266b
|
Bug#25408 5.1 Can't compile on Windows
- DBUG_ENTER must be called before assignment on Windows and Netware.
|
2007-01-18 10:34:50 -05: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 |
|
ramil/ram@mysql.com/myoffice.izhnet.ru
|
6eba677517
|
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
|
2007-01-18 17:10:00 +04:00 |
|
ramil/ram@myoffice.izhnet.ru
|
3760672ead
|
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
|
2007-01-18 16:40:49 +04:00 |
|
ramil/ram@myoffice.izhnet.ru
|
9d86d7e97b
|
Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
|
2007-01-18 15:59:40 +04:00 |
|
ramil/ram@mysql.com/myoffice.izhnet.ru
|
c57442d6d8
|
after merge fix.
|
2007-01-18 15:28:45 +04:00 |
|
lars/lthalmann@dl145h.mysql.com
|
fb0be729e6
|
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
|
2007-01-18 10:54:46 +01:00 |
|
ramil/ram@myoffice.izhnet.ru
|
a2303ea3fe
|
Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
|
2007-01-18 11:13:13 +04:00 |
|
ramil/ram@mysql.com/myoffice.izhnet.ru
|
5c42e68388
|
after merge fix.
|
2007-01-18 10:51:29 +04:00 |
|
ramil/ram@mysql.com/myoffice.izhnet.ru
|
e8968822dc
|
Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
|
2007-01-18 09:39:47 +04:00 |
|
tsmith@siva.hindu.god
|
2ae081e041
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
|
2007-01-17 17:43:26 -07:00 |
|
tsmith@siva.hindu.god
|
230b191951
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
|
2007-01-17 17:18:10 -07:00 |
|
tsmith@siva.hindu.god
|
8f5fdfe730
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
|
2007-01-17 16:44:10 -07:00 |
|
tsmith@siva.hindu.god
|
d6d7385a18
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
|
2007-01-17 16:40:41 -07:00 |
|
tsmith@siva.hindu.god
|
018acedba7
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
|
2007-01-17 16:40:17 -07:00 |
|
tsmith@siva.hindu.god
|
fa927d7e05
|
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
|
2007-01-17 16:38:49 -07:00 |
|
cmiller@zippy.cornsilk.net
|
f2d4988c37
|
errmsg change
|
2007-01-17 18:15:35 -05:00 |
|
cmiller@zippy.cornsilk.net
|
abd057be56
|
errmsg update from Stefan.
|
2007-01-17 15:01:28 -05:00 |
|
joerg@trift2.
|
d1a61e1c08
|
Merge trift2.:/MySQL/M50/upward-5.0
into trift2.:/MySQL/M51/push-5.1
|
2007-01-17 20:47:53 +01:00 |
|
lars/lthalmann@dl145k.mysql.com
|
74f748999b
|
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
|
2007-01-17 19:48:35 +01:00 |
|
lars/lthalmann@mysql.com/dl145j.mysql.com
|
044bb38433
|
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
|
2007-01-17 19:43:46 +01: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 |
|
lars/lthalmann@dl145j.mysql.com
|
5810ca92c9
|
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
|
2007-01-17 19:32:14 +01:00 |
|
lars/lthalmann@mysql.com/dl145j.mysql.com
|
b25079d61a
|
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
|
2007-01-17 19:30:05 +01: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 |
|
lars/lthalmann@mysql.com/dl145j.mysql.com
|
bbaf32754f
|
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
|
2007-01-17 19:28:55 +01: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 |
|
kostja@bodhi.local
|
1480f9f48c
|
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into bodhi.local:/opt/local/work/mysql-5.1-runtime
|
2007-01-17 20:47:50 +03:00 |
|
kostja@bodhi.local
|
15c9d8a6c9
|
Disable symlinks under valgrind builds (again), with a comment.
|
2007-01-17 20:46:09 +03:00 |
|
kostja@bodhi.local
|
4399e3244d
|
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into bodhi.local:/opt/local/work/mysql-5.1-runtime
|
2007-01-17 16:03:10 +03:00 |
|
kostja@bodhi.local
|
a9590803fc
|
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
into bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max
|
2007-01-17 16:00:33 +03:00 |
|