Commit graph

40121 commits

Author SHA1 Message Date
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
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
kostja@bodhi.local
103e0d5ec9 Fix a typo in SETUP.sh 2006-11-06 11:30:54 +03: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
petr/cps@outpost.site
8de747b0c7 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1-runtime
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
2006-11-06 00:05:02 +03:00
petr/cps@outpost.site
1b231a177f Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
into  outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191
2006-11-06 00:00:44 +03:00
petr/cps@outpost.site
660c2f0cde Merge outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
into  outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
2006-11-05 23:31:42 +03:00
petr/cps@outpost.site
51ff0db079 Add missing DBUG_RETURN() 2006-11-05 23:25:34 +03:00
brian@zim.(none)
8a56fcff6a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into  zim.(none):/home/brian/mysql/merge-5.1
2006-11-05 12:06:09 -08:00
brian@zim.(none)
1a92614216 Removed Innodb variable at request of Innobase. 2006-11-05 12:03:19 -08: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)
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
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)
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)
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)
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 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)
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
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
kroki/tomash@moonlight.intranet
1dbf98d162 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-cleanup
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
2006-11-03 12:25:34 +03:00
kroki/tomash@moonlight.intranet
fbf508d686 Cleanup: fix race in rename.test. 2006-11-03 12:16:31 +03:00
iggy@rolltop.ignatz42.dyndns.org
1d66d35fb3 Fix compile failure. 2006-11-02 21:03:41 -05:00
kent/mysqldev@suse9-x86.mysql.com
7c2ff3c307 sort.c:
Create block around DBUG_ENTER late in function
2006-11-03 02:35:09 +01:00
cmiller@zippy.cornsilk.net
e235c8c421 Fix merge collision. 2006-11-02 18:27:52 -05:00
cmiller@zippy.cornsilk.net
b074e13483 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-02 17:51:59 -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
malff/marcsql@weblab.(none)
181459d444 Post merge fix 2006-11-02 14:02:07 -07:00