mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35361 commits 2784 branches 343 tags 1.6 GiB
Commit graph

35361 commits

This branch
This branch
All branches
Author SHA1 Message Date
elliot@mysql.com
d4796d9df6 Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
 2006-06-23 17:27:54 -04:00
monty@hasky.mysql.fi
ebe57fc707 Merge monty@192.168.0.9:/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-23 11:01:00 +03:00
monty@mysql.com
059c45d016 Suppress memory leak from 'kill_server' 
(Happens if main thread exists before kill_server thread, which is ok)
 2006-06-23 10:46:16 +03:00
monty@mysql.com
7ec5a7ecc5 Fixed memory leak (found by rpl_row_inexist_tbl) 2006-06-23 10:35:45 +03:00
monty@hasky.mysql.fi
a4f6871dbc Merge monty@192.168.0.9:/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-23 03:36:16 +03:00
monty@mysql.com
fba475cc47 Fixed problem when compiling libmysqld (without replication) 
This change allows us to use the stmt_binlog function in the code without ifdefs
(We should avoid having ifdefs in the .cc and .c files)
 2006-06-23 03:21:12 +03:00
monty@hasky.mysql.fi
14e05051f1 Merge monty@192.168.0.9:/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-23 03:04:13 +03:00
monty@narttu.mysql.fi
a168d1396c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-23 03:03:03 +03:00
monty@mysql.com
4697deb436 Remove compiler warnings 
Fixed wrong table flags type in ndbcluster that caused previous commit to fail
 2006-06-23 02:49:19 +03:00
monty@hasky.mysql.fi
9305db78f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-22 23:01:01 +03:00
monty@hasky.mysql.fi
2b55a2880e Merge monty@192.168.0.9:/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-22 22:59:47 +03:00
monty@mysql.com
649157954b Fixed failure with rpl_truncate_7ndb.test when using statement based replication. 
is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
(Faster and easier to understand)
Allow cluster_binlogging also in mixed replication mode.
 2006-06-22 22:44:21 +03:00
pekka@orca.ndb.mysql.com
7524881b50 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug14935
 2006-06-22 21:22:46 +02:00
pekka@orca.ndb.mysql.com
09e8039aa4 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781
 2006-06-22 19:48:04 +02:00
pekka@clam.ndb.mysql.com
ac622fee7f ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come) 
have to push this to be able to push 5.0
 2006-06-22 19:26:15 +02:00
mats@romeo.(none)
1b6a017155 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/bk/fix-mysql-5.1
 2006-06-22 15:26:08 +02:00
mats@mysql.com
3b830e4b9f Patch to handle some bad situations resulting from the fix for BUG#19995. 2006-06-22 13:28:04 +02:00
joerg@trift2.
5eea972046 Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1 2006-06-22 12:22:52 +02:00
monty@hasky.mysql.fi
729ee03648 Merge monty@192.168.0.9:/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-22 12:37:49 +03:00
monty@mysql.com
b8ab496057 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-22 12:21:41 +03:00
rburnett@bk-internal.mysql.com
d9fb74e40e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-22 01:25:57 +02:00
mikael@dator5.(none)
9543cae6cf Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19281
 2006-06-21 19:25:56 -04:00
mikael@dator5.(none)
cb5043199b mmanual merge 2006-06-21 19:08:30 -04:00
rburnett@bk-internal.mysql.com
8472ce9ff8 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-21 17:51:54 +02:00
mikael@dator5.(none)
eab0cfbc25 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19281
 2006-06-21 11:41:06 -04:00
monty@hasky.mysql.fi
202ddd20be Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-21 18:29:17 +03:00
monty@mysql.com
bb02e07777 Change table_id's to # to make tests portable 2006-06-21 18:27:45 +03:00
pekka@orca.ndb.mysql.com
43409d98fe Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18102
 2006-06-21 17:19:59 +02:00
pekka@clam.ndb.mysql.com
7f9bfc2058 ndb - add test_event_merge to daily-devel-tests.txt 2006-06-21 17:17:12 +02:00
mikael@dator5.(none)
de9eb496af BUG#19309: Problem with calling proecdures twice 
Need to flag when a copy is needed to not overwrite a create_info
object connected to the lex structure
 2006-06-21 10:57:30 -04:00
pekka@clam.ndb.mysql.com
6ba2b1845c ndb - bug#18102: fixes on NDB API level 2006-06-21 16:15:04 +02:00
ramil@myoffice.izhnet.ru
3228ce7f9e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/usr/home/ram/work/mysql-5.1
 2006-06-21 19:14:59 +05:00
rburnett@bk-internal.mysql.com
5a558eaf89 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-21 15:33:22 +02:00
lars@mysql.com
207c0baf45 After merge fix 2006-06-21 15:30:26 +02:00
ramil@mysql.com
db2acfc926 Fix for bug #20601: rpl_ndb_log.test failure 2006-06-21 18:16:07 +05:00
lars@mysql.com
6b8c196584 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-21 14:14:37 +02:00
lars@dl145j.mysql.com
ed0e98529c Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-21 13:51:28 +02:00
lars@mysql.com
6839e64298 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-21 13:42:02 +02:00
monty@narttu.mysql.fi
20c00662eb Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-21 13:24:56 +03:00
monty@mysql.com
f93d85ea22 Fixed typo that was forgot in last changeset. 2006-06-21 13:24:06 +03:00
mskold@linux.site
a2fad11caa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-21 12:02:03 +02:00
tomas@poseidon.ndb.mysql.com
c360810ddb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-21 12:02:02 +02:00
gluh@eagle.intranet.mysql.r18.ru
8097ba2046 after merge fixes 2006-06-21 14:53:40 +05:00
mskold@linux.site
7704d973d4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-21 10:10:01 +02:00
mskold@mysql.com
7fdf6f1633 Fixed failed automerge 2006-06-21 09:51:08 +02:00
anozdrin@mysql.com
5ce56c1cdc Disable IM tests. 2006-06-21 11:44:54 +04:00
mskold@mysql.com
bd3f9cc0a5 Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-21 09:42:15 +02:00
mskold@mysql.com
e77850e573 Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly 2006-06-21 09:36:50 +02:00
tomas@poseidon.ndb.mysql.com
f072f7cbb5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-21 08:49:40 +02:00
anozdrin@mysql.com
bb94cb24c5 Re-enable IM tests. 2006-06-21 02:17:39 +04:00