mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34701 commits 2784 branches 343 tags 1.6 GiB
Commit graph

34701 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
rburnett@bk-internal.mysql.com
179d483355 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-22 17:25:46 +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
knielsen@mysql.com
21c6f52024 Fix BUILD/compile-pentium-gcov 2006-05-22 17:15:49 +02:00
gkodinov@mysql.com
b2494b8174 Merge mysql.com:/home/kgeorge/mysql/5.0/B18745 
into  mysql.com:/home/kgeorge/mysql/5.1/B18745
 2006-05-22 18:15:47 +03:00
igor@rurik.mysql.com
a6aaca7d6a Post-review fixes for bug #19089 2006-05-22 07:57:46 -07:00
tomas@poseidon.ndb.mysql.com
2668a3f905 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-22 16:42:48 +02:00
tomas@poseidon.ndb.mysql.com
868f7df757 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-05-22 16:30:43 +02:00
tomas@poseidon.ndb.mysql.com
6aeebf5c59 ndb: corrected option handeling to give correct help in ndbd 2006-05-22 16:27:37 +02:00
tomas@poseidon.ndb.mysql.com
06845f5385 Merge jonas@perch:src/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-05-22 16:27:13 +02:00
msvensson@shellback.(none)
5006f87178 Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2006-05-22 15:55:29 +02:00
msvensson@shellback.(none)
a401734c07 Import from yaSSL 
Fixes for HPUX etc. 
Don't define exceptions operator new on hpux as the linker will look for the function
 2006-05-22 15:49:57 +02:00
mskold@mysql.com
cdccc77244 Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-05-22 15:16:37 +02:00
stewart@mysql.com
3a20e8c1c7 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
 2006-05-22 23:14:58 +10:00
stewart@mysql.com
e7ab063979 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug13987 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2006-05-22 23:12:01 +10:00
gkodinov@mysql.com
b357c232fc Bug#18745: Test case 'func_group' fails if "classic" 5.0 configuration 
Moved the InnoDB related test from func_group.test to innodb_mysql.test
 2006-05-22 16:10:53 +03:00
anozdrin@mysql.com
e3d0c1a7f1 Merged. 2006-05-22 15:20:40 +04:00
anozdrin@mysql.com
4a43bd1a3a 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-22 14:22:58 +04:00
ramil@mysql.com
71c035fafb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b18536
 2006-05-22 11:49:35 +05:00
pekka@mysql.com
641c92dd62 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-05-21 21:58:00 +02:00
kent@mysql.com
bc6bdd8ead Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-05-21 19:48:50 +02:00
holyfoot@mysql.com
b9cd71e622 Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-21 18:22:13 +05:00
holyfoot@mysql.com
00f3ca8d27 Merge bk@192.168.21.1:mysql-4.1 
into mysql.com:/home/hf/work/mysql-4.1.clean
 2006-05-21 18:19:51 +05:00
holyfoot@mysql.com
9184321fd6 Merge mysql.com:/home/hf/work/mysql-5.0.mrg 
into mysql.com:/home/hf/work/mysql-5.1.mrge
 2006-05-21 18:17:50 +05:00
pekka@mysql.com
1a519e2971 ndb - bug#19956 (occurs only in v5.0) 2006-05-21 11:04:57 +02:00
kent@mysql.com
49a8f9ee29 Merge 2006-05-21 10:38:59 +02:00
igor@rurik.mysql.com
4a27cbfd02 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-05-20 19:10:43 -07:00
igor@rurik.mysql.com
12e53358f0 Fixed bug #19089. 
When a CREATE TABLE command created a table from a materialized
view id does not inherit default values from the underlying table.
Moreover the temporary table used for the view materialization
does not inherit those default values.
In the case when the underlying table contained ENUM fields it caused
misleading error messages. In other cases the created table contained
wrong default values.
The code was modified to ensure inheritance of default values for
materialized views.
 2006-05-20 18:54:43 -07:00
kent@mysql.com
0a778b4ce0 Merge 2006-05-21 00:47:08 +02:00
kent@mysql.com
c6d14073dd Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-05-20 23:46:44 +02:00
kent@mysql.com
2419732379 Merge 2006-05-20 23:36:17 +02:00
kent@mysql.com
e09910f91f mysql.spec.sh: 
Always compile position independent
 2006-05-20 22:47:20 +02:00