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

38918 commits

This branch
This branch
All branches
Author SHA1 Message Date
kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
712c4cdbe3 mysql.spec.sh: 
Corrected path to mysql-test directory
  Removed man1/mysql_explain_log.1
 2006-10-12 18:26:17 +02:00
joerg@trift2.
2f0689e254 Override "read-only" permissions when doing "make distcheck". 2006-10-11 15:32:32 +02:00
ted@ted.mysql.internal
8e794f458b BUG#21524 ps.test updated to meet recent changes in SQL parser 2006-10-11 15:53:56 +04:00
msvensson@neptunus.(none)
43f994c40b Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-10-11 10:21:49 +02:00
msvensson@neptunus.(none)
5b24780877 Merge bk-internal:/home/bk/mysql-5.1-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-10-11 10:16:46 +02:00
msvensson@neptunus.(none)
2c7ef3ebac Merge bk-internal:/home/bk/mysql-5.0-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-10-11 10:13:56 +02:00
msvensson@neptunus.(none)
ed250c1763 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-10-11 10:01:43 +02:00
lars@black.(none)
0b4e65e12b Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-10-10 21:59:23 +02:00
lars@mysql.com/black.(none)
f28e9eb64b Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-10-10 21:58:46 +02:00
jonas@perch.ndb.mysql.com
84e4df338d Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 15:27:47 +02:00
jonas@perch.ndb.mysql.com
94b8e56144 ndb - 
ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)
 2006-10-10 15:26:39 +02:00
mats@romeo.(none)
1023aecb1c Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b21474-mysql-5.1-new-rpl
 2006-10-10 15:26:02 +02:00
mats@romeo.(none)
6c3b1f6eb0 BUG#21474 (There is a rotation before the last table map): 
Removing code to step the group log position and just stepping
the event log position.  If the group log position were stepped
one time too many, it might be that the group starts at a position
that is not possible, e.g., at a Rows_log_event, or between an
Intvar_log_event and the following associated Query_log_event.
 2006-10-10 15:18:21 +02:00
mats@romeo.(none)
799585c5ac Fixes to make replication team tree build on Windows. 2006-10-10 14:58:40 +02:00
joerg@trift2.
c1e351abdf Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-10-10 13:25:55 +02:00
mats@romeo.(none)
0b6ff112b2 Fix to make it build on all platforms. 
Replacing C++ code with C code in a C file.
 2006-10-10 12:29:24 +02:00
jonas@perch.ndb.mysql.com
e600a3d394 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 11:25:24 +02:00
jonas@perch.ndb.mysql.com
fe61968dc8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 11:08:23 +02:00
jonas@perch.ndb.mysql.com
5590e99d2e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-10 11:06:51 +02:00
jonas@perch.ndb.mysql.com
c301735962 ndb - bug#23107 
fix bug in test prg
 2006-10-10 09:47:30 +02:00
jonas@perch.ndb.mysql.com
d25765d116 ndb - bug#23107 
fix bug in handling of inactive timeout for scan, when all is delivered
 2006-10-10 09:37:54 +02:00
mats@romeo.(none)
b8941bbc8f Post-merge fixes. 2006-10-09 13:47:06 +02:00
svoj@mysql.com/april.(none)
7683b297cf Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
 2006-10-08 22:40:25 +05:00
svoj@april.(none)
cab855cac1 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
 2006-10-08 22:35:27 +05:00
svoj@mysql.com/april.(none)
0830486836 After merge fix. 2006-10-08 22:34:32 +05:00
svoj@may.pils.ru
0ea6959d78 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines
 2006-10-08 15:32:00 +05:00
svoj@may.pils.ru
8cfef42f72 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.0-engines
 2006-10-08 15:14:53 +05:00
mats@romeo.(none)
d4d26ba7d5 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b19459-mysql-5.1-new
 2006-10-06 15:31:05 +02:00
svoj@april.(none)
1b5c111cf8 Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.1-engines
 2006-10-06 15:31:11 +05:00
svoj@mysql.com/april.(none)
8f4b0d946a Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines
 2006-10-06 15:29:30 +05:00
svoj@mysql.com/april.(none)
09b2a2a056 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines
 2006-10-06 15:18:25 +05:00
svoj@mysql.com/april.(none)
1e82044cd6 BUG#22937 - Valgrind failure in 'merge' test (ha_myisammrg.cc:329) 
This is addition to fix for bug21617. Valgrind reports an error when
opening merge table that has underlying tables with less indexes than
in a merge table itself.

Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
This fixes problems when merge table and subtables have different number of keys.
 2006-10-06 15:17:42 +05:00
svoj@april.(none)
c2f1876816 Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines
 2006-10-06 14:55:57 +05:00
svoj@mysql.com/april.(none)
60ba9f2b63 Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
 2006-10-06 14:49:21 +05:00
svoj@mysql.com/april.(none)
6a1a765b5d Per discussion with pekka removed non-deterministic test case for bug#21381. 2006-10-06 14:47:58 +05:00
mats@romeo.(none)
e762328b54 BUG#19459 (BINLOG RBR command does not lock tables correctly causing 
crash for, e.g., NDB):

Before, mysqlbinlog printed table map events as a separate statement, so
when executing the event, the opened table was subsequently closed
when the statement ended. Instead, the row-based events that make up
a statement are now printed as *one* BINLOG statement, which means
that the table maps and the following *_rows_log_event events are
executed fully before the statement ends.

Changing implementation of BINLOG statement to be able to read the 
emitted format, which now consists of several chunks of BASE64-encoded
data.
 2006-10-06 10:17:02 +02:00
mats@romeo.(none)
cb1fdf5165 Fix to build on 64-bit systems where sizeof(unsigned long long) 
> sizeof(unsigned long).
 2006-10-06 08:41:34 +02:00
svoj@mysql.com/april.(none)
dad1283cc8 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 11:11:47 +05:00
svoj@april.(none)
ad85dccae4 Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.1-engines
 2006-10-06 11:09:58 +05:00
svoj@mysql.com/april.(none)
ee4080f9f9 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 11:03:14 +05:00
svoj@mysql.com/april.(none)
94040c54b3 Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines
 2006-10-06 11:01:39 +05:00
svoj@mysql.com/april.(none)
c67aa031d6 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 10:54:47 +05:00
mats@romeo.(none)
93ea3261eb Post-merge fixes. 2006-10-05 22:16:19 +02:00
svoj@mysql.com/april.(none)
5d096b89f2 After merge fix. 2006-10-06 00:22:41 +05:00
svoj@april.(none)
77cb275b70 Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines
 2006-10-05 21:15:12 +05:00
svoj@mysql.com/april.(none)
d41340516f Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
 2006-10-05 19:02:29 +05:00
svoj@mysql.com/april.(none)
16c13a588f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
 2006-10-05 18:56:10 +05:00
svoj@mysql.com/april.(none)
b141a7c1b9 BUG#21381 - Engine not notified about multi-table UPDATE IGNORE 
Though this is not storage engine specific problem, I was able to
repeat this problem with BDB and NDB engines only. That was the
reason to add a test case into ndb_update.test. As a result
different bad things could happen.

BDB has removed duplicate rows which is not expected.
NDB returns an error.

For multi table update notify storage engine about UPDATE IGNORE
as it is done in single table UPDATE.
 2006-10-05 18:23:53 +05:00
mats@romeo.(none)
fe97fd4bdb Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b20265-mysql-5.1-new-rpl
 2006-10-05 15:22:41 +02:00
stewart@willster.(none)
3da31030d6 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug13987-5.0_bugfixonly 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Manually merge smaller 5.0 fix with fix-with-test and list sessions for 5.1
 2006-10-05 23:19:14 +10:00