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

52771 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith@ramayana.hindu.god
41f288f1b9 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-25 16:02:41 -07:00
tsmith@ramayana.hindu.god
218627aa33 Un-break test case on Windows, for bug #25347 2008-01-25 16:00:15 -07:00
tsmith@ramayana.hindu.god
b92a9a6142 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-25 13:25:34 -07:00
tsmith@ramayana.hindu.god
3906cc27d7 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-25 10:37:29 -07:00
tsmith@ramayana.hindu.god
f522912d20 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2008-01-25 10:03:15 -07:00
cmiller@zippy.cornsilk.net
b040a97c2a Bug#33841: mysql client crashes when returning results for long-\ 
running queries

Bug#33976: buffer overflow of variable time_buff in function com_go()

An internal buffer was too short.  Overextending could smash the 
stack on some architectures and cause SEGVs.  This is not a problem
that could be exploited to run arbitrary code.

To fix, I expanded one buffer to cover all the size that could be
written to (we know the abolute max).
 2008-01-25 10:53:21 -05:00
hezx@mail.hezx.com
750c4022f2 BUG#33862 completely failed DROP USER statement gets replicated 
The problem is when create/rename/drop users, the statement was logged regardless of error, even if no data has been changed, the statement was logged.

After this patch, create/rename/drop users don't write the binlog if the statement makes no changes, if the statement does make any changes, log the statement with possible error code.

This patch is based on the patch for BUG#29749, which is not pushed
 2008-01-25 15:02:26 +08:00
joerg@trift2.
fff106cdd2 Merge trift2.:/MySQL/M51/bug33536-5.1 
into  trift2.:/MySQL/M51/clone-5.1
 2008-01-24 15:58:23 +01:00
anozdrin/alik@quad.
21630ab91f Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt
 2008-01-24 17:45:09 +03:00
anozdrin/alik@quad.
5ff7860f69 Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
 2008-01-24 17:40:16 +03:00
anozdrin/alik@quad.
1c1401bbb2 Merge quad.:/mnt/raid/alik/MySQL/devel/5.0 
into  quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged-5.0
 2008-01-24 17:37:16 +03:00
kaa@kaamos.(none)
de3f89096d Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-24 14:58:38 +03:00
tsmith@ramayana.hindu.god
b83b02876b Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-01-24 00:32:39 -07:00
tsmith@ramayana.hindu.god
3ba8a94bd0 Fix bug in BK trigger for sending changes to InnoDB devs. 2008-01-24 00:31:47 -07:00
tsmith@ramayana.hindu.god
0a5ff57a9b Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-01-23 23:58:21 -07:00
tsmith@ramayana.hindu.god
525028794d Merge ramayana.hindu.god:/home/tsmith/m/inno/jan23/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-01-23 18:20:39 -07:00
tsmith@ramayana.hindu.god
fa257c031c Applied innodb-5.0-ss2223 snapshot 
Fixes:

Bug #32083: server crashes on show status when InnoDB is not initialized
  innodb_export_status(): Check that InnoDB has been initialized
  before invoking srv_export_innodb_status().  (Bug #32083)
  This bug does not exist in MySQL/InnoDB 5.1.
 2008-01-23 18:20:04 -07:00
tsmith@ramayana.hindu.god
e75e8d6321 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/done/b32679/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-01-23 16:59:44 -07:00
tsmith@ramayana.hindu.god
1803b4ca86 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-01-23 16:41:31 -07:00
tsmith@ramayana.hindu.god
adf800c8e4 Merge ramayana.hindu.god:/home/tsmith/m/inno/51-triggers 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-01-23 16:34:31 -07:00
tsmith@ramayana.hindu.god
6dabb0d48d Merge ramayana.hindu.god:/home/tsmith/m/inno/50-triggers 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-01-23 16:33:10 -07:00
tsmith@ramayana.hindu.god
a2a682f636 Update triggers lib for version MySQL 5.1 2008-01-23 16:32:19 -07:00
tsmith@ramayana.hindu.god
f405fefcf4 Merge ramayana.hindu.god:/home/tsmith/m/inno/50-triggers 
into  ramayana.hindu.god:/home/tsmith/m/inno/51-triggers
 2008-01-23 16:22:35 -07:00
malff@lambda.hsd1.co.comcast.net.
e685e7e354 Manual merge 2008-01-23 16:21:09 -07:00
tsmith@ramayana.hindu.god
c40e1ab171 Add triggers to notify InnoDB developers when MySQL developers change files 
that they control.
 2008-01-23 16:18:23 -07:00
tsmith@ramayana.hindu.god
38bbdf2bc3 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-01-23 15:46:11 -07:00
malff@lambda.hsd1.co.comcast.net.
ec6c4fad89 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-33618
 2008-01-23 15:36:57 -07:00
malff@lambda.hsd1.co.comcast.net.
7bd56cfa79 manual merge 2008-01-23 14:52:40 -07:00
malff@lambda.hsd1.co.comcast.net.
1eecc24a21 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618
 2008-01-23 14:04:46 -07:00
tsmith@ramayana.hindu.god
5f6429b01a Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-23 13:27:11 -07:00
malff@lambda.hsd1.co.comcast.net.
c3ad0cac75 Bug#33618 (Crash in sp_rcontext) 
Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)

The server used to crash when REPEAT or another control instruction
was used in conjunction with labels and a LEAVE instruction.

The crash was caused by a missing "pop" of handlers or cursors in the
code representing the stored program. When executing the code in a loop,
this missing "pop" would result in a stack overflow, corrupting memory.

Code generation has been fixed to produce the missing h_pop/c_pop
instructions.

Also, the logic checking that labels at the beginning and the end of a
statement are matched was incorrect, causing Bug 33983.
End labels, when used, must match the label used at the beginning of a block.
 2008-01-23 13:26:41 -07:00
cmiller@zippy.cornsilk.net
fdb423e8de Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2008-01-23 13:50:27 -05:00
tsmith@ramayana.hindu.god
ff4835385a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2008-01-23 11:48:29 -07:00
cmiller@zippy.cornsilk.net
2d259302ea Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2008-01-23 11:53:06 -05:00
df@pippilotta.erinye.com
84efc3cc67 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2008-01-23 17:43:46 +01:00
df@pippilotta.erinye.com
c5706d8532 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2008-01-23 17:39:03 +01:00
cmiller@zippy.cornsilk.net
71316696a1 Patch contributed by Jocelyn Fournier. CLA received 2007-02-27. 
Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed

mysqlcheck tests nullness of the engine type to know whether the
"table" is a view or not.  That also falsely catches tables that 
are severly damaged.

Instead, use SHOW FULL TABLES to test whether a "table" is a view
or not.

(Don't add new function.  Instead, get original data a smarter way.)

Make it safe for use against databases before when views appeared.
 2008-01-23 11:37:46 -05:00
cmiller@zippy.cornsilk.net
c13d726f5d Bug#27427: resolveip fails on hostnames with a leading digit 
Patch by Kasper Dupont.  No CLA required for this size of patch.

"resolveip" program produces incorrect result if given a hostname
starting with a digit.  Someone seems to have thought that names 
can not have digits at the beginning.

Instead, use the resolver library to work out the rules of hostnames, 
as it will undoubtedly be better at it than we are.
 2008-01-23 11:34:08 -05:00
df@pippilotta.erinye.com
96d62f43d3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2008-01-23 17:12:07 +01:00
df@pippilotta.erinye.com
022639a18f Merge dev:/data0/mysqldev/my/build-200801111340-5.0.54a/mysql-5.0-release 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2008-01-23 17:03:59 +01:00
cmiller@zippy.cornsilk.net
9777809b33 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2008-01-23 10:03:58 -05:00
tsmith@ramayana.hindu.god
79df4c5acd Merge ramayana.hindu.god:/home/tsmith/m/inno/jan09/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-01-22 18:17:24 -07:00
tsmith@ramayana.hindu.god
6022704723 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-22 16:59:41 -07:00
tsmith@ramayana.hindu.god
91449543cc Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2008-01-22 16:44:44 -07:00
tsmith@ramayana.hindu.god
6668554a8d Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-22 15:56:15 -07:00
tsmith@ramayana.hindu.god
8287a4f27b Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2008-01-22 15:44:18 -07:00
tsmith@ramayana.hindu.god
289d3e824d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2008-01-22 15:43:06 -07:00
pcrews@pcrews-mac-local.local
a55b4dd4fb Fix of .test and .result file for Bug#33558 - stress.ddl_csv requires nullable columns which CSV does not support 2008-01-21 22:28:43 -05:00
hezx@mail.hezx.com
1cb0eae20a fix test failure 2008-01-22 09:55:23 +08:00
pcrews@pcrews-mac-local.local
e3ae6031e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/work/mysql-5.1-build-csv-bug
 2008-01-21 19:16:07 -05:00