iggy@recycle.(none)
ba01167cec
Merge recycle.(none):/src/mysql-5.1-maint
...
into recycle.(none):/src/mysql-5.1-maint_27691
2007-04-23 16:46:17 -04:00
iggy@recycle.(none)
4bde20d175
Bug #27691 bk compilation with VC++ 2005 fails
...
- Added appropiate casts.
2007-04-23 16:42:57 -04:00
iggy@recycle.(none)
7c68e6893c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into recycle.(none):/src/bug24732/my51-bug24732
2007-04-23 16:35:20 -04:00
iggy@recycle.(none)
13b54aa963
Bug#24732 Executables do not include Vista manifests
...
- Post merge cleanup.
2007-04-23 16:23:32 -04:00
iggy@recycle.(none)
658d2127e5
Merge recycle.(none):/src/bug24732/my50-bug24732
...
into recycle.(none):/src/bug24732/my51-bug24732
2007-04-23 15:47:26 -04:00
iggy@recycle.(none)
7a358c4b5c
Bug#24732 Executables do not include Vista manifests
...
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.
2007-04-23 15:41:24 -04:00
iggy@recycle.(none)
0b88f8c74c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into recycle.(none):/src/bug25621/my51-bug25621
2007-04-23 14:37:32 -04:00
iggy@recycle.(none)
b8ac729f9d
Merge recycle.(none):/src/bug25621/my50-bug25621
...
into recycle.(none):/src/bug25621/my51-bug25621
2007-04-23 14:34:10 -04:00
iggy@recycle.(none)
30d6cf311a
Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit
...
- On Windows, connection handlers while exiting properly did not
decrement the server's thread count.
2007-04-23 14:28:33 -04:00
msvensson@pilot.blaudden
2ac94c30f4
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-23 17:01:02 +02:00
msvensson@pilot.blaudden
33fcd2bcc6
Only list "scripts" once in SUBDIRS
2007-04-23 16:39:22 +02:00
msvensson@pilot.blaudden
402d712991
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-23 14:02:09 +02:00
msvensson@pilot.blaudden
1561c39c5d
Add "name of struct" as first arg to comp_sql
...
Fix "make distcheck"
2007-04-23 14:01:48 +02:00
msvensson@pilot.blaudden
b941ef8633
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-23 13:28:09 +02:00
msvensson@pilot.blaudden
7ddc33753e
Use a temp variable "error" for storing return code of pclose
...
so the WEXITSTATUS macro can "fiddle" with it as it so pleases
2007-04-23 13:27:55 +02:00
msvensson@pilot.blaudden
714c36ce27
It's not possible to use the return value of fputs
...
to check if the creation of mysql_upgrade_info suceeded.
Instead use 'upgrade_already_done' to check that file was
created properly.
2007-04-23 13:07:49 +02:00
msvensson@pilot.blaudden
b11a1c8fd4
Update test to work also when --pager does not exist in "mysql"
2007-04-23 12:58:35 +02:00
msvensson@pilot.blaudden
d1de41c59a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-23 12:05:00 +02:00
msvensson@pilot.blaudden
10181a7fa7
Fix warnings reported by icc
2007-04-23 12:02:58 +02:00
msvensson@pilot.blaudden
a31fce0a6c
Remove left over file abi_check
2007-04-23 11:46:47 +02:00
msvensson@pilot.blaudden
a23eeb620c
Remove left over file fix_priv_tabs.result
2007-04-23 11:41:55 +02:00
msvensson@pilot.blaudden
7411813e48
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-23 11:03:40 +02:00
msvensson@pilot.blaudden
d26965c361
Protect against killing pid's that would "killall" or "kill self"
2007-04-23 11:01:22 +02:00
mjorgensen@blade09.mysql.com
7855ae51f0
Merge bk-internal:/home/bk/mysql-5.1
...
into blade09.mysql.com:/tmp/mmj/mysql-5.1-runtime
2007-04-21 18:35:01 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
5004557953
test fixed for embedded server
2007-04-21 13:26:44 +05:00
holyfoot/hf@hfmain.(none)
381c72b80a
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-21 13:20:13 +05:00
ibabaev@bk-internal.mysql.com
c22d6fbb2b
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-04-21 03:51:51 +02:00
igor@olga.mysql.com
8c85357ea3
Post-merge fix.
2007-04-20 17:47:14 -07:00
malff/marcsql@weblab.(none)
c574d95a5c
manual merge
2007-04-20 17:49:07 -06:00
mtaylor@qualinost.(none)
f5245757e1
Made changes to debian control files to support building 5.1 packages.
2007-04-20 16:15:30 -07:00
ibabaev@bk-internal.mysql.com
c09d1cfe92
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-04-21 00:36:21 +02:00
mtaylor@qualinost.(none)
e593503303
Branched for 5.1
2007-04-20 14:49:47 -07:00
malff/marcsql@weblab.(none)
2d6d8e2abe
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-04-20 15:31:41 -06:00
mtaylor@qualinost.(none)
d63c70c910
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
...
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-debian
2007-04-20 14:16:33 -07:00
mtaylor@qualinost.(none)
0690dac3aa
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-debian
2007-04-20 14:09:43 -07:00
mtaylor@qualinost.(none)
3b5d1076bb
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-debian
...
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-debian
2007-04-20 13:54:32 -07:00
evgen@moonbone.local
4434ff13a9
Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
2007-04-21 00:33:56 +04:00
msvensson@pilot.blaudden
b0d923d73b
Don't copy subidrs of scripts/
2007-04-20 20:46:55 +02:00
cmiller@zippy.cornsilk.net
219f3fb7c6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-04-20 13:57:24 -04:00
cmiller@zippy.cornsilk.net
bd31322626
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
2007-04-20 13:52:57 -04:00
cmiller@zippy.cornsilk.net
0b69216315
Avoid compiler warnings.
2007-04-20 13:49:06 -04:00
tomas@whalegate.ndb.mysql.com
fc61036567
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
2007-04-20 19:34:49 +02:00
msvensson@maint1.mysql.com
a581ad07ea
Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint
...
into maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-maint
2007-04-20 15:36:56 +02:00
msvensson@maint1.mysql.com
4d0fdd70d1
Protect against copying a ny subdirectories in scripts/
2007-04-20 15:36:04 +02:00
mats@romeo.(none)
f4c4de6a56
Added missing result file for rpl_critical_errors.
2007-04-20 14:08:12 +02:00
mats@romeo.(none)
ae9744f266
Adding missing result file for rpl_critical_errors.
2007-04-20 14:03:15 +02:00
gshchepa/uchum@gshchepa.loc
6c5d17ef56
Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt
...
into gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
2007-04-20 16:44:50 +05:00
gshchepa/uchum@gshchepa.loc
4fcf1316bb
Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704
...
into gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
2007-04-20 15:31:33 +05:00
gshchepa/uchum@gshchepa.loc
f5a229b3d1
Bug#27704: incorrect comparison of rows with NULL components
...
Support for NULL components was incomplete for row comparison,
fixed. Added support for abort_on_null at compare_row() like
in 5.x
2007-04-20 15:14:09 +05:00
gkodinov/kgeorge@magare.gmz
bcde01f6ff
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27786-5.0-opt
2007-04-20 12:01:54 +03:00
