msvensson@shellback.(none)
7b81440439
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-08 13:52:32 +01:00
ted@ted.mysql.internal
b29fb42bca
Merge ted.mysql.internal:/home/ted/src/mysql/50-gca
...
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint
2006-11-08 06:12:26 +03:00
ted@ted.mysql.internal
3e6735e277
BUG#20100 fix: mysql_upgrade modified to also accept all
...
the communication parameters from the command line
and pass 'em correctly to both mysqlcheck and mysql
2006-11-08 05:45:50 +03:00
msvensson@neptunus.(none)
6bc6064ec4
Update result file after having changed error message
2006-11-07 17:42:15 +01:00
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
msvensson@neptunus.(none)
ffa100d2d0
Bug#23981 memory leaks from yassl code + other
...
- Fix memory leak in vio_VioSSLFD that occurs when one of the calls to SSL_* function fails. As in the "ssl_des"
test case where the server is currently not supposed to be able to read the specific cert/key file.
- Change error message to be generic as it's called both from server and client code.
2006-11-07 15:20:24 +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)
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
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)
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)
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
df27c5fa6b
Merge fix.
2006-11-06 23:02:40 -05:00
cmiller@zippy.cornsilk.net
19cb3d3bf7
Fix after merge.
2006-11-06 20:41:18 -05:00
cmiller@zippy.cornsilk.net
da6c5b18cc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-06 18:01:47 -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
msvensson@neptunus.(none)
56f10ac81a
Remove old comments
2006-11-04 13:06:19 +01:00
msvensson@neptunus.(none)
83a44bd8ff
Disable user_limits for bug23921
2006-11-04 09:24:10 +01:00
msvensson@neptunus.(none)
39a346b79a
Updates for abi_check
2006-11-04 09:23:19 +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
msvensson@neptunus.(none)
aa19771c7a
Fiexes for --stress mode in mysql-test-run.pl
2006-11-03 17:53:57 +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)
fa79d0fccb
Fix DBUG_PRINT in mysqltest, the real value to print is in ds_cmd
2006-11-03 16:06:13 +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)
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)
74496f8d01
Remove sql_state-h from list of include files. (Merge error from 4.1)
2006-11-03 13:02: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
msvensson@neptunus.(none)
580b540d25
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-03 11:50:59 +01:00
msvensson@neptunus.(none)
d94101f796
Fix typo, Add "s" to format specifier for --stress-init-file
2006-11-03 11:42:22 +01:00
cmiller@zippy.cornsilk.net
e235c8c421
Fix merge collision.
2006-11-02 18:27:52 -05:00
cmiller@zippy.cornsilk.net
af5acac047
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-02 17:39:52 -05:00
cmiller@zippy.cornsilk.net
c34f3219b3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-02 17:27:42 -05:00
msvensson@shellback.(none)
15835edddd
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-02 23:09:32 +01:00
kent/mysqldev@mysql.com/production.mysql.com
27f3bb1065
configure.in:
...
Raise version number to 4.1.23
2006-11-02 21:58:42 +01:00
iggy@rolltop.ignatz42.dyndns.org
2704ba3675
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-11-02 15:16:33 -05:00
iggy@rolltop.ignatz42.dyndns.org
9f329f2cf2
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my41-mtr_vs_config
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
2006-11-02 15:09:23 -05:00
iggy@rolltop.ignatz42.dyndns.org
39d7c5a6bc
Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
...
Visual Studio builds each configuration in a different sub-directory. Only the sub-
directories for release and debug are currently searched.
2006-11-02 15:05:20 -05:00
anozdrin/alik@booka.
7096cd20a4
Wait for IM to start accepting connections after restart (part 2).
2006-11-02 21:43:52 +03:00
anozdrin/alik@booka.
8bc5a89178
Wait for IM to start accepting connections after restart.
2006-11-02 16:53:14 +03:00
thek@kpdesk.mysql.com
cbc3de73cf
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-11-02 13:37:17 +01:00
thek@kpdesk.mysql.com
3542d83a71
Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-11-02 13:35:28 +01:00