tsmith@ramayana.hindu.god
c99d06a5f3
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 16:15:07 -07:00
mkindahl@dl145h.mysql.com
1e5fa89dde
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 17:57:22 +01:00
mkindahl@dl145h.mysql.com
e00096a1a7
Again blanking out some numbers in file names that is dependent
...
on the context.
2008-02-01 17:26:28 +01:00
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
15b74eb7bf
Changes to make tests pass on vanilla build.
2008-02-01 10:46:02 +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
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
b9b38cb576
Disabling rpl_transaction test for non-debug builds.
2008-01-30 18:24:28 +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
joerg@trift2.
5ffbbfcecc
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-01-28 15:16:40 +01: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
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
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.
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
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
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
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
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
pcrews@pcrews-mac-local.local
b9381f1041
New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
...
Added new tests and corrected existing tests
2008-01-21 13:49:03 -05: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.
58f76a036d
Merge ibm.:/home/alik/Documents/MySQL/devel/5.0-rt
...
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.0-rt
2008-01-20 00:39:14 +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