mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 17:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33400 commits 2783 branches 343 tags 1.7 GiB
Commit graph

33400 commits

This branch
This branch
All branches
Author SHA1 Message Date
aivanov@mysql.com
1c98f3e262 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 12:48:12 +04:00
aivanov@mysql.com
88e7e55bb5 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 11:27:15 +04:00
aivanov@mysql.com
b34ec32b5b Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
 2006-04-26 11:23:43 +04:00
aivanov@mysql.com
11687d2f84 Make innodb_mysql produce a non-empty output. 2006-04-26 11:15:09 +04:00
aivanov@mysql.com
c66893cd54 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
 2006-04-26 09:59:05 +04:00
aivanov@mysql.com
b748835897 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
 2006-04-26 09:56:06 +04:00
aivanov@mysql.com
7b8c526078 Files innodb.[test|result] are to be used by Innobase only. 
Use files innodb_mysql.[test|result] instead.
 2006-04-26 09:51:57 +04:00
aivanov@mysql.com
0eb36757a8 Applied innodb-5.1-ss492 snapshot. 
* Fix BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
 * Remove obsolete and unused variables from srv0srv.c.
 * Remove srv_sys->operational since it is unused.
 * Make thread_id parameter in os_thread_create() optional.
 * Add platform-specific os_thread_ret_t and OS_THREAD_DUMMY_RETURN,
   and convert thread start functions to use them.
 2006-04-26 08:30:37 +04:00
aivanov@mysql.com
be7adcccbf Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
 Null-merge.
 2006-04-26 07:53:49 +04:00
aivanov@mysql.com
422071a83e Applied innodb-5.0-ss492 snapshot. 
Fixed BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
 2006-04-26 07:50:29 +04:00
kent@mysql.com
e6b3de1260 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-26 00:28:54 +02:00
kent@mysql.com
3e2cc998a6 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-25 22:40:04 +02:00
andrey@lmy004.
e0c68bffb4 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-new-clean
 2006-04-25 23:14:49 +03:00
aelkin@mysql.com
61e41ac212 BUG#17263: incorrect DROP query in temporary tables replication 
the fix from 5.0 with necessary modifications applied.
 2006-04-25 22:53:50 +03:00
aelkin@mysql.com
3363effa52 Merge mysql.com:/home/elkin/MySQL/BARE/5.0 
into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new
 2006-04-25 20:05:15 +03:00
stewart@mysql.com
ebbff7ee3f BUG#19340 small leak in ndbd 
small cleanup fixes in kernel/vm/Configuration
 2006-04-25 10:04:46 -07:00
pem@mysql.com
f1374951c9 Post-merge fixes from 5.0. 2006-04-25 17:44:35 +02:00
pem@mysql.com
0e2d20b1cb Merge mysql.com:/extern/mysql/5.1/generic/mysql-5.0-merge 
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
 2006-04-25 16:20:49 +02:00
mskold@mysql.com
8d04fd256d 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-04-25 14:07:41 +02:00
mskold@mysql.com
051e6ac994 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-25 12:46:40 +02:00
mskold@mysql.com
b7ce4c94b4 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-25 12:42:22 +02:00
mskold@mysql.com
435c1028fc Fixed memleak detected by valgrind 2006-04-25 12:40:31 +02:00
evgen@moonbone.local
6ea27b1013 Manually merged 2006-04-25 13:04:39 +04:00
mskold@mysql.com
5eb07ec747 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-04-25 08:48:10 +02:00
knielsen@mysql.com
eb53a5b02c Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0-mtr-fix 
into  mysql.com:/data0/knielsen/mysql-5.0-mtr-fix
 2006-04-24 23:56:36 +02:00
knielsen@mysql.com
854cbe88b6 Merge mysql.com:/usr/local/mysql/mysql-4.1 
into  mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix
 2006-04-24 23:51:47 +02:00
cmiller@zippy.(none)
9ae7dd9e35 Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-04-24 16:17:50 -04:00
cmiller@zippy.(none)
693695850b Manual merge fix. 2006-04-24 16:05:57 -04:00
andrey@lmy004.
7a314abaa9 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-new-clean
 2006-04-24 23:04:15 +03:00
cmiller@zippy.(none)
81d3a4fb05 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

Merge by hand.  This may not be right.
 2006-04-24 14:49:05 -04:00
svoj@april.(none)
afdb3faae1 after merge fix 2006-04-24 20:19:32 +05:00
svoj@april.(none)
a83c4b6841 Merge april.(none):/home/svoj/devel/mysql/merge/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-new
 2006-04-24 19:53:38 +05:00
mskold@mysql.com
61ba824174 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-04-24 16:03:28 +02:00
mskold@mysql.com
e95e6ddcb4 Fix for Bug #17840 mysqldump should not dump tables in database cluster, reuse existing define 2006-04-24 15:50:05 +02:00
mskold@mysql.com
14d8fdb295 Fix for Bug #17840 mysqldump should not dump tables in database cluster, skip cluster internal database 2006-04-24 15:39:49 +02:00
knielsen@mysql.com
17a80c9da4 Fix typo in mysql-test-run.pl (not caught by aotupush since it uses mysql-test-run.sh). 2006-04-24 15:34:01 +02:00
bell@sanja.is.com.ua
b2c810e847 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
 2006-04-24 13:32:07 +03:00
andrey@lmy004.
6b3fe492ed enable logs_tests 2006-04-24 12:30:17 +03:00
andrey@lmy004.
82c8ef7be1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-new-clean
 2006-04-24 12:21:38 +03:00
andrey@lmy004.
bfe997f56f enable events_scheduling 2006-04-24 12:17:28 +03:00
andrey@lmy004.
b7adc19900 test case for bug 19170 2006-04-24 12:12:15 +03:00
knielsen@mysql.com
afeb3c06f7 Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-4.1-mtr-fix 
into  mysql.com:/data0/knielsen/mysql-4.1-mtr-fix
 2006-04-24 10:28:31 +02:00
joerg@mysql.com
5ec0af4acb Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2006-04-24 09:39:28 +02:00
ramil@production.mysql.com
f7394c26f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b17896
 2006-04-24 08:01:10 +02:00
paul@polar.kitebird.com
497b91d60d Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2006-04-23 19:52:01 -05:00
paul@polar.kitebird.com
dfbdef876a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2006-04-23 19:50:03 -05:00
paul@polar.kitebird.com
5907ce40e8 Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2006-04-23 19:49:05 -05:00
paul@polar.kitebird.com
3cd7e135d4 myisam_ftdump.c: 
myisam_ftdump options: --help first, then rest in
  lexical order.
 2006-04-23 19:26:56 -05:00
aelkin@mysql.com
ac47502164 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-04-23 21:30:04 +03:00
aelkin@mysql.com
a8368fde52 Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/5.0-bug17263-temp_drop 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-04-23 20:06:30 +03:00