msvensson@neptunus.(none)
ad63d2bdbe
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 16:17:04 +01:00
msvensson@neptunus.(none)
f5550c3304
Bug#23981 memory leaks from yassl code + other
...
- Readd --skip-bdb when valgrinding
2006-11-07 16:09:32 +01:00
anozdrin/alik@alik.
ee15c11b7c
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
2006-11-07 16:24:35 +03:00
msvensson@neptunus.(none)
7b1add1abe
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-07 13:02:35 +01:00
msvensson@neptunus.(none)
2d952d336e
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 13:01:56 +01:00
msvensson@neptunus.(none)
a3602ca86d
Don't allow path to be passed to --mem
2006-11-07 13:01:32 +01:00
msvensson@neptunus.(none)
3485b33453
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-07 12:58:24 +01:00
msvensson@neptunus.(none)
546250e244
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 12:57:30 +01:00
msvensson@neptunus.(none)
eea46ce15b
Correct faulty commit, the opt_tastcase_timeout value is in minutes, to it need to be multiplied with 60 before ping passed to mtr_timer_start
2006-11-07 12:56:55 +01:00
anozdrin/alik@alik.
7cf65fd309
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into alik.:/mnt/raid/alik/MySQL/devel/5.0-merged-5.0-rt
2006-11-07 13:45:56 +03:00
msvensson@neptunus.(none)
d1e3febb12
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-07 11:15:03 +01:00
msvensson@neptunus.(none)
f4de95a886
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 11:13:03 +01:00
msvensson@neptunus.(none)
79ee2c6842
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-07 11:09:14 +01:00
msvensson@neptunus.(none)
9d13ee4c04
Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory>
2006-11-07 11:07:27 +01:00
msvensson@neptunus.(none)
2aeb4df7e3
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-07 10:48:46 +01:00
msvensson@neptunus.(none)
3ff26e9b27
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 10:48:14 +01:00
msvensson@neptunus.(none)
a52b9ffaae
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-07 10:46:49 +01:00
msvensson@neptunus.(none)
06ca418c35
Merge neptunus.(none):/home/msvensson/mysql/my50-rt-im_d_fix
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 10:44:44 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
28abd4dd0d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug19736/my50-bug19736
2006-11-07 11:49:09 +04:00
cmiller@zippy.cornsilk.net
144a98fc39
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-06 23:03:31 -05:00
cmiller@zippy.cornsilk.net
df27c5fa6b
Merge fix.
2006-11-06 23:02:40 -05:00
petr/cps@outpost.site
1b44fe6196
Fix Bug #22494 Instance Manager: Inconsistent error message wording
...
Use better wording
2006-11-07 05:21:33 +03:00
cmiller@zippy.cornsilk.net
a759280347
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my51-bug23411
2006-11-06 17:46:50 -05:00
cmiller@zippy.cornsilk.net
40170fbf58
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
2006-11-06 17:45:47 -05:00
cmiller@zippy.cornsilk.net
87a5134b7c
Bug#23411: ... MOD-ing zero returns strange result
...
The Item_func_mod objects never had maybe_null set, so users had no reason
to expect that they can be NULL, and may therefore deduce wrong results.
Now, set maybe_null.
2006-11-06 17:13:19 -05:00
petr/cps@outpost.site
b28b07f09f
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191
2006-11-06 00:19:55 +03:00
petr/cps@outpost.site
0372ca79ff
fix mysql-test-run.pl to support --timezone option,
...
which got broken during refactoring.
2006-11-06 00:14:04 +03:00
petr/cps@outpost.site
bfbf1cdee9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
2006-11-06 00:11:34 +03:00
msvensson@neptunus.(none)
a56565b8d5
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-04 13:06:51 +01:00
msvensson@neptunus.(none)
56f10ac81a
Remove old comments
2006-11-04 13:06:19 +01:00
msvensson@neptunus.(none)
abd1e54de7
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-04 09:32:36 +01:00
msvensson@neptunus.(none)
83a44bd8ff
Disable user_limits for bug23921
2006-11-04 09:24:10 +01:00
msvensson@neptunus.(none)
d59a3b4d43
Merge neptunus.(none):/home/msvensson/mysql/my50-m-stress
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-04 09:20:20 +01:00
malff/marcsql@weblab.(none)
ff4a58bcc8
Bug#21114 (Foreign key creation fails to table with name format)
...
Fixed the tests for case insensitive platforms
2006-11-03 09:56:44 -07:00
msvensson@neptunus.(none)
aa19771c7a
Fiexes for --stress mode in mysql-test-run.pl
2006-11-03 17:53:57 +01:00
msvensson@neptunus.(none)
899dca14ee
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-03 17:53:10 +01:00
msvensson@neptunus.(none)
63091e074a
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-03 16:18:32 +01:00
msvensson@neptunus.(none)
78af4ae44c
Fix problem with mysql.test relying on "echo" behaviour
2006-11-03 16:09:16 +01:00
msvensson@neptunus.(none)
570f603988
Don't warn about "Found non pid file" for elements that are not files.
2006-11-03 15:26:42 +01:00
msvensson@neptunus.(none)
b850ae8a54
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-03 14:40:52 +01:00
msvensson@neptunus.(none)
5c086315a5
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/my50-m-stress
2006-11-03 13:14:33 +01:00
msvensson@neptunus.(none)
795ad91bc3
Use lowercase for "Too long dbname" test as it will be put ot lower on some platforms and we don't wan't to test that.
2006-11-03 13:12:16 +01:00
msvensson@neptunus.(none)
1c19dc7ed0
Merge neptunus.(none):/home/msvensson/mysql/my41-m-stress
...
into neptunus.(none):/home/msvensson/mysql/my50-m-stress
2006-11-03 12:58:45 +01:00
msvensson@neptunus.(none)
7b4a8e41a6
Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well.
2006-11-03 12:32:05 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
afffedc0e3
Fix for bug #19736 VIEW: column names not quoted properly when view is replicated
...
When we write 'query=...' string to a frm file for views on a slave,
indentifiers are not properly quoted due to missing OPTION_QUOTE_SHOW_CREATE
flag in the thd->options.
Fix: properly set thd->options for the slave thread.
2006-11-03 15:27:37 +04:00
anozdrin/alik@alik.
18fb4abff4
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-11-03 14:00:35 +03:00
msvensson@neptunus.(none)
d94101f796
Fix typo, Add "s" to format specifier for --stress-init-file
2006-11-03 11:42:22 +01:00
kroki/tomash@moonlight.intranet
6967657466
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
2006-11-03 12:47:32 +03:00
kroki/tomash@moonlight.intranet
b7fd43bcd0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
2006-11-03 12:47:31 +03:00
kroki/tomash@moonlight.intranet
d5a69e6fa2
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
2006-11-03 12:30:09 +03:00