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

15004 commits

Author SHA1 Message Date
mskold@mysql.com
596f2ae03e 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-10 09:44:23 +01:00
cmiller@calliope.local
34a74d65ba Merge calliope.local:/Users/cmiller/work/src/mysql-5.1-new 
into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
 2006-03-09 22:23:35 -05:00
brian@zim.(none)
469893066b Fixed portability issue in 5.1 to include parsers from other applications. 2006-03-09 17:37:59 -08:00
brian@zim.(none)
e2ce8b2132 Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.1-new
 2006-03-09 17:06:04 -08:00
brian@zim.(none)
eefd1207bb This patch does 1) fix my build breakage 2) Complete the removal of all symbols which could clash with another parser. 2006-03-09 16:44:08 -08:00
cmiller@calliope.local
9747057fa9 Merge calliope.local:/Users/cmiller/work/src/mysql-5.1-new 
into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
 2006-03-09 15:22:11 -05:00
cmiller@calliope.local
d3c0dc0eed Added code to mysqldump to dump timed events when instructed to do so, with 
the '-E' or '--events' flag.  (Closes Bug#16853 and Bug#17714.)


WARNING:

At present, these tests fail due to b*g number 18078.
 2006-03-09 15:12:43 -05:00
brian@zim.(none)
e5161fb802 Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.1-new
 2006-03-09 10:39:40 -08:00
brian@zim.(none)
78abb2d117 Porting fix that allows others to include compiled code with different parsers. 
Makes you wonder what I am up to, doesn't?
 2006-03-09 10:09:52 -08:00
anozdrin@mysql.com
c5895a9686 After-merge fixes. 2006-03-09 21:00:45 +03:00
anozdrin@mysql.com
c1ef46fcc7 Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
 2006-03-09 20:41:21 +03:00
mskold@mysql.com
5c9500438e 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-09 17:45:51 +01:00
mskold@mysql.com
adb6c4debb bug#18040 - ndb online index build 2006-03-09 17:42:35 +01:00
tomas@poseidon.ndb.mysql.com
6c1b0b37b6 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-09 15:51:54 +01:00
tomas@poseidon.ndb.mysql.com
280e2bf440 Bug #18106 Ndb: Online add index together with replication may cause mysqld core 2006-03-09 15:50:26 +01:00
mskold@mysql.com
9dc829eb9b 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-09 13:42:16 +01:00
mskold@mysql.com
f2ad519ed3 bug#18040: Create unique index cause error 4243 2006-03-09 13:41:11 +01:00
evgen@moonbone.local
3d37ec6b8b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/17726-bug-5.0-mysql
 2006-03-09 14:07:34 +03:00
tomas@poseidon.ndb.mysql.com
dc08a83735 missing DBUG_RETURN added 2006-03-09 09:30:32 +01:00
bar@mysql.com
8c2fb88a8f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new/ 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16318
 2006-03-09 11:53:56 +04:00
holyfoot@mysql.com
597fe4b178 Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-03-09 10:38:41 +04:00
holyfoot@mysql.com
481dc5b7e5 Merge bk@192.168.21.1:mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.mrg
 2006-03-09 10:21:58 +04:00
anozdrin@mysql.com
be527f3070 Fix for multiple test failures on some platforms. 2006-03-09 03:10:39 +03:00
tomas@poseidon.ndb.mysql.com
610aa1e07c Bug #17838 binlog not setup on seconday master after rename 
-added setting up of binlogging after receiving rename table
+cleanup
 2006-03-09 01:04:13 +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
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)
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)
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
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
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
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
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
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
reggie@big_geek.
57f56eb4bf Bug #17720 
Minor cleanup from Mikael's review
 2006-03-06 23:18:48 -06:00
serg@serg.mylan
84ff8192ff merged 2006-03-06 23:20:19 +01:00