mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52540 commits 2791 branches 343 tags 1.7 GiB
Commit graph

16486 commits

Author SHA1 Message Date
mkindahl@dl145h.mysql.com
20a5cc259b Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-02-01 15:38:14 +01:00
mkindahl@dl145h.mysql.com
4f7ad14be0 Fixes to make tests pass in pushbuild. 2008-02-01 15:34:34 +01:00
mkindahl@dl145h.mysql.com
294571f083 Various fixes to make tests pass on Windows. 2008-02-01 13:18:27 +01:00
mkindahl@bk-internal.mysql.com
8b0091ff53 Deleting Berkeley DB test files since BDB is not distributed with 5.1. 
.del-bdb_notembedded.test:
  Delete: mysql-test/t/bdb_notembedded.test
.del-strict_autoinc_4bdb.result:
  Delete: mysql-test/r/strict_autoinc_4bdb.result
.del-bdb_notembedded.result:
  Delete: mysql-test/r/bdb_notembedded.result
 2008-02-01 11:47:56 +01:00
mkindahl@dl145h.mysql.com
4c95b29614 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-01-31 17:46:50 +01:00
mkindahl@dl145h.mysql.com
7cfdd60045 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-01-31 16:15:46 +01:00
mkindahl@dl145h.mysql.com
2d9c3b715d Fixes to make tests pass on pushbuild. 2008-01-31 15:53:47 +01:00
mkindahl@dl145h.mysql.com
6aacc6415a Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-01-31 12:32:48 +01:00
mkindahl@dl145h.mysql.com
10b194d272 Changes to fix tests in pushbuild. 2008-01-31 12:17:40 +01:00
mkindahl@dl145h.mysql.com
5367b13823 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-01-30 20:29:17 +01:00
mkindahl@dl145h.mysql.com
a440007ca4 Changes to make tests pass in pushbuild. 2008-01-30 15:58:35 +01:00
mkindahl@dl145h.mysql.com
018cb16b3a Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-01-30 12:53:33 +01:00
mkindahl@dl145h.mysql.com
3bcab5899d Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2008-01-30 12:14:14 +01:00
mkindahl@dl145h.mysql.com
716c63ebaa Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-01-30 11:25:54 +01:00
hezx@mail.hezx.com
7572a9e391 update test result 2008-01-29 19:21:21 +08:00
tsmith@ramayana.hindu.god
1bf737a152 Fix test case for Bug #25347 so that it actually tests the code fix, 
and so that it works correctly on Windows.
 2008-01-27 14:28:50 -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
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
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
malff@lambda.hsd1.co.comcast.net.
e685e7e354 Manual merge 2008-01-23 16:21:09 -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
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
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
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
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
kaa@kaamos.(none)
fa20bb5afe Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-20 13:50:26 +03:00
kaa@kaamos.(none)
6619db580d Fixed a PushBuild failure of the system_mysql_db test caused by the lack 
of cleanups in the test case for bug33794.
 2008-01-20 13:46:55 +03:00
anozdrin/alik@ibm.
e5ed653e16 Fix merge. 2008-01-20 00:59:24 +03:00
anozdrin/alik@ibm.
baf5f73853 Merge ibm.:/home/alik/Documents/MySQL/devel/5.1 
into  ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.1
 2008-01-19 22:32:48 +03:00
kaa@kaamos.(none)
6f451bf228 Post-merge fixes. 2008-01-19 22:13:42 +03:00
anozdrin/alik@ibm.
3cd05f003e Merge ibm.:/home/alik/Documents/MySQL/devel/5.0 
into  ibm.:/home/alik/Documents/MySQL/devel/5.0-rt-merged-5.0
 2008-01-19 21:28:21 +03:00
kaa@kaamos.(none)
e91bf15d5c Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-19 21:09:22 +03:00
mhansson@lamia.dupka
e3e370dd9d Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  lamia.dupka:/home/mhansson/my50-bug33143-again-pushee
 2008-01-18 22:45:14 +02:00
sergefp@mysql.com
d56ac2f37b BUG#33794 "MySQL crashes executing specific query": 
The problem occurred when one had a subquery that had an equality X=Y where 
Y referred to a named select list expression from the parent select. MySQL 
crashed when trying to use the X=Y equality for ref-based access. 

Fixed by allowing non-Item_field items in the described case.
 2008-01-18 22:50:36 +03:00
mhansson/martin@linux-st28.site
f8fb6e930a Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt 
into  linux-st28.site:/home/martin/mysql/src/bug33143/my51-bug33143-pushee
 2008-01-17 18:36:04 +01:00
mhansson/martin@linux-st28.site
2067dfe474 Merge linux-st28.site:/home/martin/mysql/src/bug33143/my50-bug33143-again 
into  linux-st28.site:/home/martin/mysql/src/bug33143/my51-bug33143
 2008-01-17 18:22:55 +01:00
mhansson/martin@linux-st28.site
7207d3ce21 Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt 
into  linux-st28.site:/home/martin/mysql/src/bug33143/my50-bug33143-again-pushee
 2008-01-17 18:15:53 +01:00
mhansson/martin@linux-st28.site
effe27e350 Bug#33143: Incorrect ORDER BY for ROUND()/TRUNCATE() result 
The ROUND(X, D) function would change the Item::decimals field during
execution to achieve the effect of a dynamic number of decimal digits.
This caused a series of bugs:
Bug #30617:Round() function not working under some circumstances in InnoDB
Bug #33402:ROUND with decimal and non-constant cannot round to 0 decimal places
Bug #30889:filesort and order by with float/numeric crashes server
Fixed by never changing the number of shown digits for DECIMAL when
used with a nonconstant number of decimal digits.
 2008-01-14 16:16:36 +01:00
mhansson@lamia.dupka
8eb74b1f5f Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  lamia.dupka:/home/mhansson/my50-bug31797-pushee
 2008-01-12 18:59:05 +02:00
mhansson@lamia.dupka
deacf8b37f Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  lamia.dupka:/home/mhansson/my51-bug31797-pushee
 2008-01-11 23:09:34 +02:00
mhansson/martin@linux-st28.site
481a96930c Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt 
into  linux-st28.site:/home/martin/mysql/src/bug31797/my51-bug31797-pushee
 2008-01-11 19:39:28 +01:00
mhansson/martin@linux-st28.site
afc6a369f3 Merge linux-st28.site:/home/martin/mysql/src/bug31797/my50-bug31797 
into  linux-st28.site:/home/martin/mysql/src/bug31797/my51-bug31797
 2008-01-11 19:13:07 +01:00
igor@olga.mysql.com
947715c228 Merge olga.mysql.com:/home/igor/mysql-5.1-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug33697
 2008-01-11 10:12:29 -08:00
igor@olga.mysql.com
b85ffdb5d5 Fixed bug #33697. 
When the function test_if_skip_sort_order prefers index backward scan 
to ref access the corresponding access functions must be set accordingly.
 2008-01-11 10:05:34 -08:00
mhansson/martin@linux-st28.site
e24109c6d1 Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt 
into  linux-st28.site:/home/martin/mysql/src/bug31797/my50-bug31797-pushee
 2008-01-11 19:00:26 +01:00