mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35221 commits 2774 branches 343 tags 1.6 GiB
Commit graph

35221 commits

This branch
This branch
All branches
Author SHA1 Message Date
anozdrin@mysql.com
d5dca744cd Additional fix for BUG#20294: Instance manager test 
im_instance_conf fails randomly.
 2006-06-22 18:56:22 +04:00
anozdrin@mysql.com
6ed2ec688d Merge mysql.com:/mnt/raid/alik/MySQL/devel/5.1-tree 
into  mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294
 2006-06-21 16:17:51 +04:00
anozdrin@mysql.com
ce8734699b Fix for BUG#20294: Instance manager test im_instance_conf 
fails randomly.

The problem is that the test was affected by other running
test-suites on the same box. The fix affects the test only,
no code touched.
 2006-06-21 16:02:51 +04: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
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
andrey@lmy004.
cf16c8ec3c add event_timed.h also to the distribution 2006-06-21 08:58:56 +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
anozdrin@mysql.com
ddaebd13dc Fix merge 5.0 -> 5.1. 2006-06-21 02:16:38 +04:00
anozdrin@booka.site
3a6ad23f43 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
 2006-06-21 02:00:49 +04:00
evgen@moonbone.local
6b694bcd58 rpl_ndb_log.result: 
Corrected test case result
 2006-06-21 00:45:01 +04:00
tomas@poseidon.ndb.mysql.com
0865a5da9b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-20 19:33:25 +02:00
tomas@poseidon.ndb.mysql.com
7be42667f0 Bug #17297 Fix error messages 2006-06-20 19:17:07 +02:00
tomas@poseidon.ndb.mysql.com
f5f9f471d1 Bug #17297 Fix error messages 2006-06-20 19:13:46 +02:00
evgen@moonbone.local
66371d22e2 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
 2006-06-20 20:13:37 +04:00
evgen@moonbone.local
75164ffc2f rpl_ndb_log.result: 
Fixed failing test case
 2006-06-20 20:11:08 +04:00
andrey@lmy004.
45598df7d4 manual merge 2006-06-20 17:14:36 +02:00
andrey@lmy004.
40fe2b9a45 forgot to event_timed.h 
STRING_WITH_LEN -> C_STRING_WITH_LEN
 2006-06-20 17:05:41 +02:00
anozdrin@mysql.com
42ef881906 Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged 
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
 2006-06-20 18:28:28 +04:00
tomas@poseidon.ndb.mysql.com
0f55e30fa8 Bug #19543 Out REDO log on subscription creation during startup, missing error message 
- add error message
 2006-06-20 15:45:17 +02:00
svoj@may.pils.ru
1c42c9730d Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-20 16:45:51 +05:00
kent@mysql.com
34d82f0bc6 make_win_src_distribution.sh: 
Removed reference to missing "tools" directory
mysql.spec.sh:
  Changed flag --with-yassl => --with-ssl
  Reverted accidental removal of the "make" call :-)
  Configure --with-embedded-server
  Corrected path to "libtool" command
  Corrected path to "libmysqld.a"
  Removed references to "safe_mysqld"
 2006-06-20 12:24:12 +02:00
kent@mysql.com
8f0aa436ed Merge 2006-06-20 11:11:18 +02:00
stewart@mysql.com
9edd7b3766 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
 2006-06-20 17:33:14 +10:00
stewart@mysql.com
9e05d61a48 BUG#20333 valgrind: mgmd event reporting dep on uninit value 2006-06-20 17:29:02 +10:00
stewart@mysql.com
0d7ea0acd4 fix test result after BUG#20073 fix 2006-06-20 14:24:52 +10:00
anozdrin@booka.site
f237fa7840 Merge mysql.com:/home/alik/MySQL/devel/5.1-tree 
into  mysql.com:/home/alik/MySQL/devel/5.1-rt
 2006-06-20 00:54:51 +04:00
serg@serg.mylan
d4bdf2f447 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-19 21:12:31 +02:00
evgen@sunlight.local
6e80c3ec42 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-06-19 22:23:41 +04:00
serg@serg.mylan
829772b49d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-19 19:14:14 +02:00
epotemkin@sunlight.local
b1ca33dbdb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-06-19 20:32:07 +04:00
evgen@moonbone.local
9c324f32e7 rpl_row_log.result, rpl_row_log_innodb.result: 
Fixed failing test case
 2006-06-19 20:21:00 +04:00
svoj@may.pils.ru
23a4a85908 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-19 20:01:24 +05:00
svoj@may.pils.ru
098c1a0303 Merge april:devel/BitKeeper/mysql-5.0-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-19 19:58:55 +05:00
svoj@may.pils.ru
6124539b0f Merge april:devel/BitKeeper/mysql-5.1-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-19 19:57:42 +05:00
stewart@mysql.com
917203ddd7 BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS, 2006-06-20 00:30:19 +10:00
anozdrin@mysql.com
e420873370 Merge mysql.com:/home/alik/MySQL/devel/5.0-rt 
into  mysql.com:/home/alik/MySQL/devel/5.0-tree-merged
 2006-06-19 18:10:04 +04:00
anozdrin@mysql.com
4afffb40a8 Merge mysql.com:/home/alik/MySQL/devel/5.0-tree 
into  mysql.com:/home/alik/MySQL/devel/5.0-rt
 2006-06-19 16:57:46 +04:00
svoj@may.pils.ru
2c28b3cbf1 Addition to fix for 
BUG#18036 - update of table joined to self reports table as crashed

Set exclude_from_table_unique_test value back to FALSE. It is needed for
further check in multi_update::prepare whether to use record cache.
 2006-06-19 17:50:52 +05:00
serg@serg.mylan
6554329434 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-19 13:49:00 +02:00
anozdrin@mysql.com
7ecfadbcf2 Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN(). 2006-06-19 15:17:15 +04:00
svoj@may.pils.ru
8d802218fb Merge april:devel/BitKeeper/mysql-5.0-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
 2006-06-19 16:11:23 +05:00
svoj@may.pils.ru
6a90aede13 Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
 2006-06-19 16:06:29 +05:00
anozdrin@mysql.com
3b6397b1d2 WL#3298: IM: make command-line option names consistent 
1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.
 2006-06-19 14:41:29 +04:00
anozdrin@mysql.com
a992833d83 The second fix for BUG#19391: IM fails to start after two executions. 2006-06-19 14:16:10 +04:00