1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Commit Graph

13579 Commits

Author SHA1 Message Date
mats@mysql.com
6a1d4bac6e WL#3171: Dynamic logging format
Removed error on seeing table map event when slave is in SBR mode
  and switching temporarily to RBR mode to replicate the rows.
2006-03-08 06:55:21 +01:00
kent@mysql.com
64ed7f1481 mysql-test-run.pl:
Allow space in base directory path, bug#15736
2006-03-08 03:51:59 +01:00
anozdrin@mysql.com
615357b96c After-merge fix: fix the test case for BUG#16266 to query
only its own tables to prevent getting tables from others.
2006-03-08 00:13:27 +03:00
kent@mysql.com
05f3d1710a Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-07 21:52:50 +01:00
jimw@mysql.com
fbbb797dc8 Bug #17139: Partitions: unprivileged user can effectively drop table
Now the DROP privilege is also required on a table in order to be able
to drop a partition from the table using ALTER TABLE.
2006-03-07 12:42:23 -08:00
serg@serg.mylan
bd4bfdd4dc Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-03-07 21:27:05 +01:00
msvensson@shellback.(none)
64e9d98f4d Merge bk-internal:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574
2006-03-07 20:45:44 +01:00
msvensson@shellback.(none)
78edd3788f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
2006-03-07 20:41:04 +01:00
msvensson@shellback.(none)
773e6ddec5 Bug#17574 Detect cluster start failure and "fail" ndb_* tests
- Update for 5.1
2006-03-07 20:35:59 +01:00
msvensson@shellback.(none)
a3d9bb416d Merge shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574
2006-03-07 20:03:01 +01:00
serg@serg.mylan
7166facb71 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-03-07 20:01:03 +01:00
msvensson@shellback.(none)
87209d560c Bug#17574 Detect cluster start failure and "fail" ndb_* tests 2006-03-07 19:44:58 +01:00
kent@mysql.com
0aaded3707 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-07 18:21:38 +01:00
mats@mysql.com
907a11e828 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-03-07 15:21:39 +01:00
mats@mysql.com
67a99df970 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b16228-mysql-5.1-new
2006-03-07 13:34:31 +01:00
mats@mysql.com
ec4b9f8edc Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b16228-mysql-5.1-new
2006-03-07 13:31:38 +01:00
mats@mysql.com
e824e61618 Bug#16228 (RBR: Slave SQL thread retries infinitely):
Transaction aborted on slave should be retries. The OPTION_BEGIN
  bit was cleared prematurely. Removed dependence of code on value
  of OPTION_BEGIN bit when executing retries.
2006-03-07 13:29:53 +01:00
anozdrin@mysql.com
d9d4dc5ef8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
2006-03-07 14:28:09 +03:00
gluh@mysql.com
8271f58942 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-03-07 15:27:02 +04:00
gluh@eagle.intranet.mysql.r18.ru
bcf710e97c Fix for bug#15447 Partitions: NULL is treated as zero
NULL value handling
2006-03-07 15:25:08 +04:00
bar@mysql.com
23332d0d95 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17142
2006-03-07 13:07:23 +04:00
bar@mysql.com
02023859bf Bug#17142 Crash if create with encoded name
upgrade.result, upgrade.test:
  Adding test case.
table.cc:
  Don't try to open a table with old-formatted name,
  if the table name contains "@" character.
  This is to avoid mixing two different names to each other.
  Thanks Monty for suggesting this fix.
2006-03-07 13:05:24 +04:00
mats@mysql.com
8d10f7b7a1 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/w3023-mysql-5.1-new
2006-03-07 10:00:13 +01:00
msvensson@neptunus.(none)
456b2d6b14 Improve error message for faulty usage of "inc" and "dec" 2006-03-07 07:50:04 +01:00
msvensson@neptunus.(none)
f063ce8e31 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-07 07:42:51 +01:00
serg@serg.mylan
6d6d11787f after merge 2006-03-06 23:43:47 +01:00
serg@serg.mylan
84ff8192ff merged 2006-03-06 23:20:19 +01:00
msvensson@neptunus.(none)
67f6576de8 Revert 2006-03-06 22:14:06 +01:00
msvensson@neptunus.(none)
a336f48552 Win fixes
- Use tmp sh file both in system and popen
2006-03-06 22:05:39 +01:00
msvensson@neptunus.(none)
dfe158fc15 Use grep instead of egrep
Use system inestad of exec
2006-03-06 21:45:13 +01:00
pem@mysql.com
1e0289041c Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-06 21:15:43 +01:00
serg@serg.mylan
d190e08e4e merged 2006-03-06 20:53:14 +01:00
msvensson@neptunus.(none)
6634aec877 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 20:24:21 +01:00
msvensson@neptunus.(none)
0acda1463d Update test result 2006-03-06 20:12:48 +01:00
msvensson@neptunus.(none)
aa3c00b5df Update test result 2006-03-06 20:09:16 +01:00
msvensson@neptunus.(none)
3ae351931d Update test result 2006-03-06 20:06:56 +01:00
pem@mysql.com
a065843799 Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-06 19:46:17 +01:00
petr@mysql.com
0e853c79b7 Fix Bug#17600: Invalid data logged into mysql.slow_log
Recommit with post-review fixes.
2006-03-06 21:03:17 +03:00
serg@serg.mylan
e7504b3468 merged 2006-03-06 18:34:38 +01:00
serg@serg.mylan
0b2f4ac3be kill (subquery) - three years old bugfix that never worked 2006-03-06 18:26:39 +01:00
mskold@mysql.com
6feaef7517 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-06 18:08:42 +01:00
mskold@mysql.com
48cc86db83 Tables are now removed remotely by binlog_thread 2006-03-06 18:06:21 +01:00
msvensson@neptunus.(none)
77214de820 Disable rpl_ndb_multt_update2 2006-03-06 17:09:23 +01:00
holyfoot@mysql.com
8707e3356d Merge mysql.com:/home/hf/work/mysql-5.0.15745
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-06 19:57:20 +04:00
msvensson@neptunus.(none)
6457050df6 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 14:52:49 +01:00
msvensson@neptunus.(none)
c9d14a0329 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 14:03:16 +01:00
msvensson@neptunus.(none)
30071e9783 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 14:01:15 +01:00
pekka@mysql.com
5d026c1d11 ndb - close non-bug rpl_ndb_charset Bug#17246 2006-03-06 13:51:57 +01:00
msvensson@neptunus.(none)
108fc10143 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 13:45:53 +01:00
ramil@mysql.com
78adb4bc15 Fix for bug #17896: MIN of CASE WHEN returns non-minimum value! 2006-03-06 16:38:35 +04:00