mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38855 commits 2784 branches 343 tags 1.6 GiB
Commit graph

38855 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
svoj@mysql.com/april.(none)
ad7da7f1de Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
 2006-09-29 00:00:27 +05:00
iggy@rolltop.ignatz42.dyndns.org
70dcbe3e6c Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305
 2006-09-28 14:33:39 -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
brian@zim.(none)
bb09a2a940 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-28 11:25:02 -07: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
e58341f53b Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my50-bug21449 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my51-bug21449
 2006-09-28 14:01:12 -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
brian@zim.(none)
542cf080a4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-28 10:51:56 -07:00
svoj@mysql.com/april.(none)
2de51adffa Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
 2006-09-28 22:14:31 +05:00
svoj@mysql.com/april.(none)
b271d7653b BUG#21617 - crash when selecting from merge table with inconsistent indexes 
Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.

If number of keys in merge table is not bigger than requested key number,
return error.
 2006-09-28 22:10:06 +05:00
svoj@april.(none)
f1b3b1628f Merge mysql.com:/home/svoj/devel/mysql/BUG21675/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21675/mysql-5.1-engines
 2006-09-28 20:50:39 +05:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
a8c9d45dfc Result of a binlog_statement_insert_delayed was affected by recent fixing of 
binlog_row_binlog.test failure in team tree.
  Fixing the result that gets wrong with --binlog-format=mixed
(so that skipped on pushbuild currently)
 2006-09-28 18:42:41 +03:00
svoj@mysql.com/april.(none)
19d9bdcecb Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21675/mysql-5.0-engines
 2006-09-28 20:33:59 +05:00
svoj@mysql.com/april.(none)
3336ecf896 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21675/mysql-5.0-engines
 2006-09-28 20:32:40 +05:00
svoj@mysql.com/april.(none)
efb75811bf BUG#21675 - engine=archive 2GB file limit, when reached mysqld restarts on any query 
If mysqld is linked against system installed zlib (which is likely compiled w/o
LFS) and archive table exceedes 2G, mysqld will likely be terminated with SIGXFSZ.

Prior to actual write perform a check if there is space in data file. This fixes
abnormal process termination with SIGXFSZ.

No test case for this bugfix.
 2006-09-28 20:30:15 +05:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
9f75ff2c28 the results of binlog_statement_insert_delayed in STATEMENT - non-recommended mode i.e not checked 
by make test - got changed due to show binlog events relocation to deterministic
position at extra/binlog_tests/binlog_insert_delayed.test.
 2006-09-28 17:55:45 +03:00
cmiller@zippy.cornsilk.net
43bdd2c2ed Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 10:32:37 -04:00
msvensson@neptunus.(none)
e3bb892f59 Merge neptunus.(none):/home/msvensson/mysql/work/my51-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-28 16:29:08 +02:00
msvensson@neptunus.(none)
275e4b6d47 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
 2006-09-28 16:22:54 +02:00
msvensson@neptunus.(none)
3135940c25 Reduce code for SSL_connect and SSL_accept 
There is no need to call SSL_set_accept_state + SSL_do_handshake when we know that SSL_accept should be done.
 2006-09-28 16:21:21 +02:00
cmiller@zippy.cornsilk.net
e72bc63906 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 10:15:32 -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
2deb2bfc6e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
 2006-09-28 09:52:46 -04:00
cmiller@zippy.cornsilk.net
ce24cb2d98 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
 2006-09-28 09:51:46 -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
gluh@gluh.(none)
12b3672a69 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1
 2006-09-28 18:03:00 +05:00
gluh@mysql.com/gluh.(none)
353c5bd154 after merge fix 2006-09-28 18:00:44 +05:00
gkodinov@dl145s.mysql.com
41a2631cb3 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-28 14:53:31 +02:00
dli@dev3-76.dev.cn.tlan
273de17cce Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19651
 2006-09-28 20:52:28 +08:00
gkodinov@dl145s.mysql.com
7a84e12442 Merge bk-internal:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-28 14:52:09 +02:00
dli@dev3-76.dev.cn.tlan
cdf20b96f5 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651
 2006-09-28 20:06:18 +08:00
ramil/ram@mysql.com/myoffice.izhnet.ru
326a56dc3f Fix for bug #22271: data casting may affect data stored in the next column(s?) 
Using wrong filling value may cause unneeded extra bit rewriting.

Fix: use proper value to fill uneven bits.
 2006-09-28 17:00:29 +05:00
msvensson@neptunus.(none)
5f099df3be Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-28 13:54:48 +02:00
evgen@moonbone.local
16f59a5e56 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  moonbone.local:/work/18360-bug-5.1-opt-mysql
 2006-09-28 15:53:22 +04:00
anozdrin/alik@alik.
107d6ca01d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-09-28 15:41:49 +04:00
anozdrin/alik@alik.
ba96c5aed6 5.0-rt -> 5.1-rt after-merge fixes. 2006-09-28 15:40:23 +04:00
cmiller@zippy.cornsilk.net
6042eebda6 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-09-28 07:35:04 -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
cmiller@zippy.cornsilk.net
290bb8ec14 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-09-28 07:26:45 -04:00
dli@dev3-76.dev.cn.tlan
cb3b878aaa Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-ndb-bj 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651
 2006-09-28 19:26:29 +08:00
gbichot@dl145h.mysql.com
7493331fa4 Merge gbichot@bk-internal:/home/bk/mysql-5.1-arch 
into  dl145h.mysql.com:/users/gbichot/mysql-5.1-arch
 2006-09-28 13:22:56 +02:00
cmiller@zippy.cornsilk.net
a627b52843 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-09-28 07:20:50 -04:00
gbichot@dl145h.mysql.com
041dedfcfb In the handlerton, cursor creation function don't have an argument 
and so the engine calls current_thd to derive transaction information;
instead we now pass THD to those functions, it looks more logical
(it makes the implicit current_thd parameter more visible).
Approved by Brian and Monty.
 2006-09-28 13:19:43 +02:00
anozdrin/alik@alik.
2c73dbfaac Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-09-28 15:10:18 +04:00
istruewing@chilla.local
52758d8615 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug20719-m
 2006-09-28 12:20:17 +02:00