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

8859 commits

Author SHA1 Message Date
mats@mysql.com
95b9e51cd3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/mkindahl/bk/merge-mysql-5.1-new-wl3023
 2006-03-08 22:08:06 +01:00
mats@mysql.com
53f9de6c00 WL#3023 (Use locking in a statement-like manner): 
Print a warning instead of error on failure to open non-existing table.
This is a temporary patch to prevent a bug in NDB from stopping the slave.
 2006-03-08 20:42:09 +01:00
jimw@mysql.com
b2fb280ba4 Bug #14673: Wrong InnoDB default row format 
Make partitioned tables report the row format of the underlying
  tables (when they are all the same).
 2006-03-08 11:06:01 -08:00
jimw@mysql.com
45cfa42004 Bug #17497: Partitions: crash if add partition on temporary table 
Temporary tables are no longer allowed to be partitioned.
 2006-03-08 09:48:40 -08:00
tomas@poseidon.ndb.mysql.com
696c76778a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-08 15:33:15 +01:00
tomas@poseidon.ndb.mysql.com
ed1f9a3402 Bug #17812 Previous lock table for write causes "stray" lock although table is recreated 
- only set table share version to 0 (zero) on global invalidation
 2006-03-08 14:45:09 +01:00
mats@mysql.com
9fb1e542fb Merge mysql.com:/home/bkroot/mysql-5.1-wl3023 
into  mysql.com:/home/bk/w3023-mysql-5.1-new
 2006-03-08 14:22:04 +01:00
holyfoot@mysql.com
b5fc0db76d Merge mysql.com:/home/hf/work/mysql-5.0.mrg 
into mysql.com:/home/hf/work/mysql-5.1.mrg
 2006-03-08 17:16:43 +04:00
msvensson@neptunus.(none)
59f505f01d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137
 2006-03-08 13:33:00 +01:00
msvensson@neptunus.(none)
7f0eba7081 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
 2006-03-08 13:31:05 +01:00
msvensson@neptunus.(none)
72f509e228 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137
 2006-03-08 11:20:12 +01:00
msvensson@neptunus.(none)
fed1479d27 Merge neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137
 2006-03-08 10:44:43 +01:00
msvensson@neptunus.(none)
8c3be395f7 After merge 2006-03-08 10:40:29 +01:00
msvensson@neptunus.(none)
8a977e4b38 Merge neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
 2006-03-08 10:17:12 +01:00
msvensson@neptunus.(none)
8162610a39 Bug#17137 Running "truncate table" on temporary table leaves the table open on a slave 
- Decrease "slave_open_temp_tables" during reopen of truncated table.
 - Add test "rpl_trunc_temp"
 2006-03-08 10:15:48 +01:00
mats@mysql.com
db4316a948 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/w3171-mysql-5.1-new
 2006-03-08 06:58:57 +01:00
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
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
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
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
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)
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)
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
serg@serg.mylan
d190e08e4e merged 2006-03-06 20:53:14 +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