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

49765 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
5b0e532db3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-09-12 14:03:21 +02:00
tomas@whalegate.ndb.mysql.com
59e502dc2b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-09-12 14:02:27 +02:00
tomas@whalegate.ndb.mysql.com
df552c310d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-09-12 14:01:51 +02:00
tomas@whalegate.ndb.mysql.com
f0f025f91b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
 2007-09-12 13:58:03 +02:00
tomas@whalegate.ndb.mysql.com
63648db422 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
 2007-09-12 13:55:45 +02:00
tomas@whalegate.ndb.mysql.com
83eed4d876 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
 2007-09-12 13:55:22 +02:00
tomas@whalegate.ndb.mysql.com
461a3dccac BUG#23354 revert 2007-09-12 13:53:32 +02:00
tomas@whalegate.ndb.mysql.com
c484d9c5ef Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-09-12 07:37:27 +02:00
tomas@whalegate.ndb.mysql.com
f1674d1b66 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-09-12 07:34:42 +02:00
tomas@whalegate.ndb.mysql.com
0c0f6dfa03 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-09-11 19:56:26 +02:00
tomas@whalegate.ndb.mysql.com
9620892508 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-09-11 19:52:05 +02:00
jonas@perch.ndb.mysql.com
cf17cd229b Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2007-09-11 16:55:37 +02:00
jonas@perch.ndb.mysql.com
0b2c8fa3c4 ndb - bug#30914 
Dont add insert+delete tuple(s) to lcp-keep-list
 2007-09-11 16:45:22 +02:00
tomas@whalegate.ndb.mysql.com
9e37aaf433 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-09-11 16:17:28 +02:00
tomas@whalegate.ndb.mysql.com
35bddfecf7 Bug #11313 confusing/erroneous 4006 message 2007-09-07 11:15:07 +02:00
malff@omega.weblab
1a13d76941 Test cleanup in rpl_binlog_grant: XID values are unpredictable 2007-09-06 12:06:22 -06:00
davi@moksha.local
0187e78f40 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
 2007-09-06 13:28:00 -03:00
davi@moksha.local
4aaab47ea9 The test case for bug 28587 doesn't work with the embedded version, 
the first query is not running while we are doing wait queries on
a second connection.
 2007-09-06 13:22:34 -03:00
dlenev@mockturtle.local
175c1ab740 Make events.test more robust against timing issues. 2007-09-06 15:57:36 +04:00
tomas@whalegate.ndb.mysql.com
0e18338ae0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-09-06 10:23:14 +02:00
jonas@perch.ndb.mysql.com
13298bd821 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2007-09-06 07:40:54 +02:00
malff@omega.weblab
d55b2bd13b Merge omega.weblab:/home/malff/TREE/mysql-5.1-base 
into  omega.weblab:/home/malff/TREE/mysql-5.1-rt-merge
 2007-09-05 14:52:40 -06:00
malff@omega.weblab
0a10782f75 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  omega.weblab:/home/malff/TREE/mysql-5.1-cleanup
 2007-09-05 12:15:24 -06:00
malff@omega.weblab
43e5ab75ca Test events_logs_tests cleanup 
Fixed test failure under heavy load, in case truncate table is slow.
 2007-09-05 12:14:43 -06:00
davi@moksha.local
2e3ded3ec9 The test case for Bug#29936 doesn't work with the embedded version, 
the first query is not running while we are doing wait queries on
a second connection.
 2007-09-05 15:03:02 -03:00
tomas@whalegate.ndb.mysql.com
b5e7c8dbd3 change printout to be a warning 2007-09-05 19:39:13 +02:00
tomas@whalegate.ndb.mysql.com
78fb6b274b moving these tests to suite ndb_team 2007-09-05 19:13:36 +02:00
tomas@whalegate.ndb.mysql.com
e8c2807aac tests actually work in statement based 2007-09-05 18:44:47 +02:00
tomas@whalegate.ndb.mysql.com
06b267cbb7 correct include file 2007-09-05 18:02:46 +02:00
lzhou/zhl@dev3-63.(none)
c0f5b574f4 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug27543
 2007-09-05 15:37:30 +00:00
tomas@whalegate.ndb.mysql.com
173a9473be correct include file 2007-09-05 17:31:26 +02:00
lzhou/zhl@dev3-63.(none)
b2b22e93a2 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30024
 2007-09-05 15:03:11 +00:00
lzhou/zhl@dev3-63.(none)
53c2c7fa3f BUG#27543 Backup and restore can compatible with different endians for blob attribute 2007-09-05 13:01:30 +00:00
tomas@whalegate.ndb.mysql.com
1657c2d88a getting rid of flush altogether, fix with post_epoch hendeling and/or changes in Rows_log_event 
- problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
- point to table map instead?
- or copy it?
- or make sure that anything interacting with the share happens _after_ the epoch

Problem with flush is that STMT_END_F may not be included as it shoudld...
 2007-09-05 11:43:42 +02:00
tomas@whalegate.ndb.mysql.com
39edaf9f8d this flush with flag TRUE causes spurious errors in the binlog... as it will insert a STMT_END_F... and hence an invalid binlog (missing table mappings) 2007-09-05 09:22:58 +02:00
brian@zim.(none)
e235ccd13a Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it. 2007-09-04 20:03:12 -07:00
malff/marcsql@weblab.(none)
5cd66ca65f Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-09-04 16:50:09 -06:00
malff/marcsql@weblab.(none)
f4b671d8bc Fixed whitespace 2007-09-04 16:40:27 -06:00
malff/marcsql@weblab.(none)
3a7bcd72f3 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-09-04 14:38:26 -06:00
tomas@whalegate.ndb.mysql.com
29af14afa2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-09-04 22:25:23 +02:00
malff/marcsql@weblab.(none)
0f58ed7e74 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-09-04 12:25:54 -06:00
thek@adventure.(none)
11c97a2646 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-09-04 17:46:01 +02:00
thek@adventure.(none)
e480b31794 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-09-04 17:43:29 +02:00
anozdrin/alik@station.
7dee4ac78c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  station.:/mnt/raid/alik/MySQL/5.1-rt-build
 2007-09-03 17:24:59 +04:00
thek@adventure.(none)
b1d1204576 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-09-03 13:46:10 +02:00
thek@adventure.(none)
530d6fd983 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074 
into  adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074
 2007-09-03 13:44:02 +02:00
thek@adventure.(none)
a8b9bd9f67 - Fix cross compatibility issues by exchanging pthread_yield with my_sleep(0) 2007-09-03 13:42:32 +02:00
anozdrin/alik@station.
c39d032da2 Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTS 
statement.
 2007-09-03 15:13:34 +04:00
anozdrin/alik@station.
c7de965215 Make mysql compilable on gcc-4.2.1. 
c++config.h now has the following code:
// For example, <windows.h> is known to #define min and max as macros...
#undef min
#undef max

So, our defines in my_global.h are undefined when <new> header
is included.

Move definitions of min()/max() to the end of my_global.h.
 2007-09-03 15:12:28 +04:00
jonas@perch.ndb.mysql.com
9529e06c9a ndb - merge error code 
forgot to update next TC no
 2007-09-03 11:32:48 +02:00