mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34395 commits 2778 branches 343 tags 1.6 GiB
Commit graph

34395 commits

This branch
This branch
All branches
Author SHA1 Message Date
evgen@moonbone.local
516b8f0aca Manually merged 2006-05-24 20:52:57 +04:00
svoj@april.(none)
13ae6420fd Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
 2006-05-24 12:34:24 +05:00
svoj@april.(none)
578743cd7d Merge april.(none):/home/svoj/devel/BitKeeper/mysql-5.1-new 
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
 2006-05-24 12:31:39 +05:00
knielsen@mysql.com
b03168eb2f Fix missing source file. 2006-05-24 09:28:37 +02:00
knielsen@mysql.com
fb1e5cee46 Merge mysql.com:/usr/local/mysql/mysql-5.0-gcov 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-05-24 09:23:45 +02:00
brian@zim.(none)
5d9ec1ee82 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-23 19:08:28 -07:00
jimw@mysql.com
dd81642594 Fix events_logs_tests so it won't fail on Windows due to appearance 
of hostname in query results.
 2006-05-23 17:51:17 -07:00
brian@zim.(none)
9368ab52f3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-23 17:33:12 -07:00
brian@zim.(none)
ca63edc88b Removing mysql_explain_log from 5.1 2006-05-23 17:26:56 -07:00
jimw@mysql.com
e7c78a04eb Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-23 15:13:30 -07:00
jimw@mysql.com
9df9098e63 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-23 13:03:33 -07:00
brian@zim.(none)
b514d3a89c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-23 11:25:11 -07:00
jimw@mysql.com
d2132bc04a Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-23 09:49:04 -07:00
kent@mysql.com
ade3de74d7 event_scheduler.h, event_scheduler.cc: 
Rename load_event() to load_named_event(), to avoid name clash on HP-UX
 2006-05-23 17:47:17 +02:00
jani@ua141d10.elisa.omakaista.fi
8dabbe3441 Removed wrong ascii codes from source code. 
Fixed core dump in --help
 2006-05-23 18:27:54 +03:00
andrey@lmy004.
046e77a2e5 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release
 2006-05-23 16:51:37 +02:00
andrey@lmy004.
a1c30e4877 __FUNCTION__ is not available everywhere. 
make us see at least with gcc the function proto. this can be extended
probably for windows too.
Fix build on intelxeon3 (sun compiler and others)
 2006-05-23 16:50:01 +02:00
msvensson@neptunus.(none)
e1b8982e19 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
 2006-05-23 16:07:23 +02:00
andrey@lmy004.
fd2792cbe4 Merge lmy004.:/work/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release-17619-try3
 2006-05-23 15:07:08 +02:00
andrey@lmy004.
fb42ce5fd7 update log_tables.test so it is less fragile 2006-05-23 15:01:23 +02:00
msvensson@neptunus.(none)
4b51242460 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
 2006-05-23 14:39:30 +02:00
andrey@lmy004.
9670bb6ae4 Merge lmy004.:/work/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release-17619-try3
 2006-05-23 13:49:24 +02:00
andrey@lmy004.
86052a9567 various fixes after push of fix for bug#17619 2006-05-23 13:32:22 +02:00
andrey@lmy004.
c04a800f3d Merge lmy004.:/work/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release-17619-try3
 2006-05-23 12:13:02 +02:00
andrey@lmy004.
f234eef13b update result 
drop users at the end of events_stress
 2006-05-23 12:10:07 +02:00
andrey@lmy004.
60b75a3a02 make it less stressful. some pushbuild boxes cannot cope with it 2006-05-23 10:49:09 +02:00
anozdrin@mysql.com
f0a01456e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
 2006-05-23 12:08:47 +04:00
msvensson@neptunus.(none)
5df9964651 Bug#20002 Old --with-openssl and --with-yassl options just silently ignored 
- Terminate configure with error(and message) if --with-yassl or --with-openssl is used.
 2006-05-23 10:07:07 +02:00
msvensson@neptunus.(none)
6571f513f4 Bug#20018 Class declared inside of function causes problem with gcc 2.95.3 
- Move class MY_HOOKS out of function
 2006-05-23 09:25:07 +02:00
stewart@mysql.com
147df8bf4d BUG#20015 mgmsrv and mgmapi: get statport is dead code 
Remove unused and obsolete mgmapi functionality (that did nothing anyway).
 2006-05-23 14:35:18 +10:00
andrey@lmy004.
11423e8405 Merge lmy004.:/work/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release-17619-try3
 2006-05-23 01:28:47 +02:00
andrey@lmy004.
30be755575 fix endianess on ppc. seems for sys_var_long_ptr we have to fetch 
var->save_result.ulonglong_value and not var->save_result.ulong_value
 2006-05-23 01:10:32 +02:00
andrey@lmy004.
1372a7a946 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-release
 2006-05-23 00:25:23 +02:00
andrey@lmy004.
ec0e9d5977 fix win32 build after push for bug#17619 2006-05-23 00:19:02 +02:00
joerg@trift-lap.fambruehe
4b5b65b666 Bump up the version number, 5.1.11 has been cloned. 2006-05-22 22:58:01 +02:00
jimw@mysql.com
26d6e5651d Merge mysql.com:/home/jimw/my/mysql-5.1-20004 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-22 13:21:50 -07:00
msvensson@shellback.(none)
644049120d Merge bk-internal:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-22 22:12:48 +02:00
andrey@lmy004.
3ced49d2f6 manual merged 2006-05-22 21:57:23 +02:00
igor@rurik.mysql.com
4a673444f7 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-05-22 12:55:28 -07:00
msvensson@shellback.(none)
5ad86bf40f Change = to == in ndbrequire 2006-05-22 21:51:28 +02:00
msvensson@shellback.(none)
2f6bc89d53 Merge shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-22 21:35:23 +02:00
msvensson@shellback.(none)
4abd9c5673 Add m4.cpp to CMakeLists.txt for taocrypt 2006-05-22 21:30:34 +02:00
andrey@lmy004.
b429d73d62 fix for bug #17619 Scheduler race conditions 
- Scheduler is either initialized at server start or never.
  Starting & stopping is now suspending & resuming.
- The scheduler has clear OO interface
- Now all calls to the scheduler are synchronous
- GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc)
- External API is encapsulated into class Events
- Includes fixes for all comments of Kostja's review of 19.05.2005

Starting to merge into 5.1-release (5.1.10) and push
 2006-05-22 20:46:13 +02:00
tomas@poseidon.ndb.mysql.com
46bb6f6579 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-05-22 20:45:19 +02:00
brian@zim.(none)
f99ce7ad62 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-22 11:40:29 -07:00
msvensson@shellback.(none)
18d5a74a71 Merge bk-internal:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-22 20:40:28 +02:00
tomas@poseidon.ndb.mysql.com
16be20d78b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-22 20:40:27 +02:00
jimw@mysql.com
a995439b12 Bug #20004: log_tables fails on Windows due to output differences 
This test included hostname information in the output, which varies
  between platforms.
 2006-05-22 11:34:41 -07:00
msvensson@shellback.(none)
ed44d815e3 Merge bk-internal:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-22 18:03:11 +02:00
gkodinov@mysql.com
5e978cc048 Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B18745
 2006-05-22 18:22:10 +03:00