Commit graph

31656 commits

Author SHA1 Message Date
mats@mysql.com
cf5589a831 Merge mysql.com:/users/mkindahl/bk/mysql-5.1-new-wl3023
into  mysql.com:/users/mkindahl/bk/merge-mysql-5.1-new-wl3023
2006-03-09 04:08:30 +01:00
mats@mysql.com
90215eb387 WL#3023 (Use locks in statement-like manner):
Post-merge patches.
2006-03-09 03:56:14 +01:00
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
9dace13548 WL#3023 (Use locks in a statement-like manner):
Changes according to review comments.
2006-03-08 21:49:49 +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
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
0eb12cafe1 cleanup of ndb invalidate dictionary cache
fixed test case from previous commit
2006-03-08 15:29:57 +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
mats@mysql.com
2b2691e975 WL#3023 (Use locks in a statement-based manner):
Minor changes to make it work with NDB.
2006-03-08 14:12:26 +01:00
msvensson@shellback.(none)
3c1f4e3cd5 Merge bk-internal:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574
2006-03-08 10:43:55 +01:00
mskold@mysql.com
a111db403f 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-08 09:21:27 +01:00
mskold@mysql.com
25243c9a9f 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-08 08:41:50 +01:00
mskold@mysql.com
ced966f215 Post fix review of patch for bug#17891 Partitions: NDB, crash on select .. where col is null or col 2006-03-08 08:35:34 +01:00
msvensson@shellback.(none)
84fd30b4dd Merge bk-internal:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574
2006-03-08 07:57:26 +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
reggie@linux.site
980434bf4b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-03-07 14:52:51 -06: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
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)
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
b1dfda9b7f mysql.spec.sh:
Changed product name from "Community Edition" to "Community Server", bug#17970
2006-03-07 18:53:26 +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
kent@mysql.com
349d13dae3 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-07 16:47:17 +01:00
mskold@mysql.com
672c50e4f0 Fix for bug#17891 Partitions: NDB, crash on select .. where col is null or col = value 2006-03-07 16:36:36 +01:00
tomas@poseidon.ndb.mysql.com
ce9676a474 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-07 16:19:32 +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
tomas@poseidon.ndb.mysql.com
f6f267ed0c Bug #18016 Some debug output in non-debug build 2006-03-07 14:44:33 +01:00
msvensson@neptunus.(none)
48bef14042 Fix missing call to init_tmp_sh_file 2006-03-07 14:34:20 +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
kent@mysql.com
b4d193c760 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-07 13:21:41 +01: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
tomas@poseidon.ndb.mysql.com
5e77d28789 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-07 12:21:06 +01:00
tomas@poseidon.ndb.mysql.com
a0f82c18ef Bug #16874 memory leaks in rpl_row_basic_7ndb.test
- free ndb shares at server shutdown
- free_table_share at free of ndb_share
2006-03-07 12:19:27 +01: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)
647a940649 Enable ifdef for windows specific functions 2006-03-07 08:57:57 +01:00
mats@mysql.com
3f7b8cfb6e Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/fix-mysql-5.1-new
2006-03-07 08:40:09 +01:00
mats@mysql.com
0713aa597a Bug#17874 (Test failure: rpl_row_basic_3innodb):
Some storage engines does not set the filler bits, so we set them
  before calling the record-reading functions.
2006-03-07 08:33:20 +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
reggie@big_geek.
57f56eb4bf Bug #17720
Minor cleanup from Mikael's review
2006-03-06 23:18:48 -06:00