mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32422 commits 2793 branches 343 tags 1.7 GiB
Commit graph

32422 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith/tim@siva.hindu.god
360540e891 Revert patch for bug #19764, which did not work with prepared statements. 2006-10-11 23:35:52 -06:00
tsmith/tim@siva.hindu.god
f5c4d75e8f Bug #19764: SHOW commands end up in the slow log as table scans 
Set a flag when a SHOW command is parsed, and check it in log_slow_statement().  SHOW commands are not counted as slow queries, even if they use table scans.
 2006-10-03 21:26:55 -06:00
msvensson@neptunus.(none)
c3820867ce Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-02 10:11:18 +02:00
tsmith/tim@siva.hindu.god
5ffa3e1bff Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol) 2006-09-30 02:00:04 -06:00
jimw@rama.(none)
f3ead515fb Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-29 19:32:05 -07:00
jimw@rama.(none)
0296227343 Merge rama.(none):/home/jimw/my/mysql-4.1-clean 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-29 19:28:44 -07:00
jimw@rama.(none)
52d22ad827 Disable __attribute__ entirely on g++ < 3.4. (Bug #2717) 2006-09-29 19:28:16 -07:00
jimw@rama.(none)
5963b5af0f Merge bk-internal:/home/bk/mysql-4.1-maint 
into  rama.(none):/home/jimw/my/mysql-4.1-clean
 2006-09-29 19:26:33 -07:00
cmiller@zippy.cornsilk.net
5275e2437a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-29 16:24:21 -04:00
cmiller@zippy.cornsilk.net
097d60a883 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-29 11:18:26 -04:00
jimw@rama.(none)
2961966b3b Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-28 20:17:17 -07:00
jimw@rama.(none)
d5d89bcf63 Fix merge of __attribute__ cleanup. 2006-09-28 20:15:58 -07:00
cmiller@zippy.cornsilk.net
f53e014f75 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-28 21:42:00 -04:00
cmiller@zippy.cornsilk.net
2067fbcaf7 Fixed bad fix for a bad merge. 2006-09-28 21:40:43 -04:00
jimw@rama.(none)
68eadc8a79 Merge rama.(none):/home/jimw/my/mysql-4.1-clean 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-28 18:09:10 -07:00
jimw@rama.(none)
a2e8d08bd2 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-28 17:57:45 -07:00
jimw@rama.(none)
9c3012e646 Merge rama.(none):/home/jimw/my/mysql-5.0-18246 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-28 17:56:51 -07:00
evgen@moonbone.local
dead2e0f14 view.test: 
After merge fix
 2006-09-29 01:35:11 +04:00
evgen@moonbone.local
ee67c4c453 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/5505-bug-5.0-opt-mysql
 2006-09-29 01:01:52 +04:00
evgen@moonbone.local
f6fbbf2002 Fixed bug#5505: Wrong error message on INSERT into a view 
On an INSERT into an updatable but non-insertable view an error message was
issued stating the view being not updatable. This can lead to a confusion of a
user.

A new error message is introduced. Is is showed when a user tries to insert
into a non-insertable view.
 2006-09-29 01:00:18 +04:00
iggy@rolltop.ignatz42.dyndns.org
3f2c9aa796 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-28 15:56:05 -04:00
cmiller@zippy.cornsilk.net
fa6bd76b09 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-28 15:46:08 -04:00
cmiller@zippy.cornsilk.net
8dd3e7f489 Fixed incorrect merge of gluh's reversion of B-g#21432. 2006-09-28 15:45:17 -04:00
iggy@rolltop.ignatz42.dyndns.org
d0d057a43c Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-28 15:36:59 -04:00
iggy@rolltop.ignatz42.dyndns.org
e89c10e99c Bug#22224: Windows build depends on ib_config.h 
This change has already been made to 5.1.
 2006-09-28 15:18:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
d36444a9ec Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
 2006-09-28 14:32:30 -04:00
iggy@rolltop.ignatz42.dyndns.org
f063bee3b2 Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D) 2006-09-28 14:30:20 -04:00
iggy@rolltop.ignatz42.dyndns.org
8668dfc2f6 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my50-bug21449 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-28 14:12:11 -04:00
iggy@rolltop.ignatz42.dyndns.org
b7e1578264 Bug #21449 How to Resolve Stack Trace URL in MySQLD error log is incorrect. 2006-09-28 13:58:53 -04:00
cmiller@zippy.cornsilk.net
7c5c899976 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-28 10:11:26 -04:00
cmiller@zippy.cornsilk.net
733fa61ee3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-28 10:10:41 -04:00
cmiller@zippy.cornsilk.net
b2ee81a6ec Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-28 10:09:57 -04:00
cmiller@zippy.cornsilk.net
56d2406375 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-09-28 10:02:53 -04:00
cmiller@zippy.cornsilk.net
75a1d1d56f Additional patch to Bug#21476: Free newly-allocated memory in mysqltest. 2006-09-28 09:51:06 -04:00
cmiller@zippy.cornsilk.net
ca7ade8825 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-28 07:30:24 -04:00
msvensson@neptunus.(none)
8ee337a590 Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-28 11:05:28 +02:00
gkodinov@dl145s.mysql.com
de5542a0d9 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-28 10:37:21 +02:00
gkodinov@dl145s.mysql.com
b0167d265f Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-09-28 10:36:04 +02:00
gkodinov@dl145s.mysql.com
55cc4fd5c6 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-09-28 10:19:25 +02:00
msvensson@neptunus.(none)
3eb44cb137 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-28 09:32:49 +02:00
msvensson@neptunus.(none)
712a937e30 Increase test suite timeout to 3 hours 2006-09-28 09:30:24 +02:00
msvensson@neptunus.(none)
4a00ae2d02 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-28 08:55:44 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
47c2c590c8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/5.0-maint.b22227
 2006-09-28 10:41:09 +05:00
cmiller@zippy.cornsilk.net
33bf71e9d1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-27 20:08:44 -04:00
cmiller@zippy.cornsilk.net
78aea70393 Bug #20778: strange characters in warning message 1366 when called in SP 
The function receives an exactly-sized buffer (not a C NUL-terminated string)
and passes it into a printf function to be interpreted with "%s".

Instead, create an intermediate String object, and copy the data into it, 
and pass in a pointer to the String's NUL-terminated buffer.
 2006-09-27 19:26:25 -04:00
elliot/emurphy@mysql.com/lost.local
194f12ff0c Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint 
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca
 2006-09-27 17:28:31 -04:00
elliot/emurphy@mysql.com/lost.local
d1fb415ad4 Temporary fix for bug#22268 (official patch will come soon) 
Don't cap threads at 1000 on Windows any more.
 2006-09-27 17:13:58 -04:00
cmiller@zippy.cornsilk.net
c0ab40d390 Bug#21476: (Thread stack overrun not caught, causing SEGV) 
The STACK_MIN_SIZE is currently set to 8192, when we actually need 
(emperically discovered) 9236 bytes to raise an fatal error, on Ubuntu 
Dapper Drake, libc6 2.3.6-0ubuntu2, Linux kernel 2.6.15-27-686, on x86.

I'm taking that as a new lower bound, plus 100B of wiggle-room for sundry
word sizes and stack behaviors.

The added test verifies in a cross-platform way that there are no gaps 
between the space that we think we need and what we actually need to report 
an error.

DOCUMENTERS:  This also adds "let" to the mysqltest commands that evaluate
an argument to expand variables therein.  (Only right of the "=", of course.)
 2006-09-27 14:42:56 -04:00
msvensson@neptunus.(none)
841bcbe79e Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-27 18:39:01 +02:00
msvensson@neptunus.(none)
281b7ad19d Add suppressions seen on maint1, nothing new just a nother version of libc 2006-09-27 18:10:15 +02:00