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
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
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
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
thek@kpdesk.mysql.com
3f16931527
Bug#22828 complementary patch:
...
- 'false' not defined in C, use FALSE instead.
2006-11-02 13:33:26 +01:00
thek@kpdesk.mysql.com
fd99994faf
Bug#22828 complementary patch:
...
- 'false' not defined in C, use FALSE instead.
2006-11-02 13:26:57 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
9658dc9127
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug22913/my41-bug22913
2006-11-02 16:25:01 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
82ec5bd111
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
2006-11-02 16:20:52 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
9361705934
Merge mysql.com:/usr/home/ram/work/bug22913/my41-bug22913
...
into mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
2006-11-02 14:33:22 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a072688eea
Fix for bug #22913 : mysql --quick doesn't report some errors.
...
We don't check for errors that may occur during data printing.
2006-11-02 14:32:00 +04:00
kostja@bodhi.local
5196eadc06
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-11-02 02:38:41 +03:00
kostja@bodhi.local
b471ea50f7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-11-02 01:21:37 +03:00
kostja@bodhi.local
6a28c436f7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-02 01:08:39 +03:00
thek@kpdesk.mysql.com
35b833eb86
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-11-01 17:01:51 +01:00
msvensson@shellback.(none)
8d29d65cf3
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-01 16:16:34 +01:00
jonas@perch.ndb.mysql.com
7acfde913a
ndb - revert bug to wait for "proper" bug fix
...
bug#21052
2006-11-01 16:14:49 +01:00
msvensson@neptunus.(none)
a2e38573bd
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-01 16:11:56 +01:00
msvensson@shellback.(none)
c4369f2494
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-01 16:08:17 +01:00
msvensson@shellback.(none)
51e467d0fe
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-01 15:59:15 +01:00
dlenev@mockturtle.local
5961d4721f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2
2006-11-01 16:20:15 +03:00
dlenev@mockturtle.local
bd1b57f930
Small cleanup in code handling stored routines/table prelocking.
...
Use lazy initialization for Query_tables_list::sroutines hash.
This step should significantly decrease amount of memory consumed
by stored routines as we no longer will allocate chunk of memory
required for this HASH for each statement in routine.
2006-11-01 15:41:48 +03:00
thek@kpdesk.mysql.com
df82f58477
Merge kpdesk.mysql.com:/home/thek/dev/bug22828/my41-bug22828
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-11-01 09:24:57 +01:00
msvensson@shellback.(none)
b9d4ccbf18
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-31 19:08:30 +01:00
msvensson@shellback.(none)
2754edbaf3
Improve the reading of .pid files from var/run
...
- Only read *.pid
- Only allow it to contain a number
2006-10-31 19:02:33 +01:00