mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-26 08:44:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45907 commits 2779 branches 343 tags 1.6 GiB
Commit graph

45907 commits

This branch
This branch
All branches
Author SHA1 Message Date
serg@sergbook.mysql.com
10057bf4c3 compilation failure 2007-04-29 09:00:08 -07:00
serg@sergbook.mysql.com
b396d858b5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
 2007-04-29 08:52:29 -07:00
antony@ppcg5.local
b9cb8c9db9 fix windows build failure 
VC++ does not like compile_time_assert() macro
 2007-04-29 08:46:34 -07:00
antony@ppcg5.local
ad0f8fd1c9 fix pedantic compiler build failure - surplus ';' character 2007-04-29 08:37:24 -07:00
serg@sergbook.mysql.com
9ac2824145 compilation failure on nocona (gcc (GCC) 3.2.3 20030502) 2007-04-29 08:34:51 -07:00
serg@sergbook.mysql.com
28feb8937d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
 2007-04-29 08:29:18 -07:00
serg@sergbook.mysql.com
960f009a34 compilation error 2007-04-29 08:24:33 -07:00
antony@ppcg5.local
cfa3f9106e compile-dist failure 
fix compile error when DBUG_OFF
 2007-04-29 08:12:44 -07:00
istruewing@chilla.local
bb1c3722e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936 
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
 2007-04-28 14:16:12 +02:00
istruewing@chilla.local
4f8e86db40 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936 
into  chilla.local:/home/mydev/mysql-5.1-wl2936
 2007-04-28 14:12:29 +02:00
istruewing@chilla.local
352c273dfc WL#2936 - Falcon & MySQL plugin interface: server variables 
Changed back (type != OPT_SESSION) to (type == OPT_GLOBAL)
 2007-04-27 23:42:22 +02:00
istruewing@chilla.local
6a8844de6f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936 
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
 2007-04-27 23:38:05 +02:00
serg@sergbook.mysql.com
7dfd5e8d71 mysql-test/mysql-test-run.pl 
provide the writable datadir for mysqld --help (for lower_case test)
sql/log.h, sql/mysqld.cc
    make default binlog_format value to be 0 (for a hack of using
    GET_STR for enum to continue to work)
 2007-04-27 14:13:34 -07:00
istruewing@chilla.local
e327818c28 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
 2007-04-27 19:09:39 +02:00
svoj@april.(none)
21087b05d2 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-04-27 01:35:56 +05:00
svoj@april.(none)
640b3e4e74 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-04-27 01:33:16 +05:00
svoj@mysql.com/april.(none)
29d2d5dccb Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-04-27 00:58:59 +05:00
svoj@mysql.com/april.(none)
ce55046fbd Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-04-27 00:56:50 +05:00
svoj@mysql.com/april.(none)
f698977298 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2007-04-27 00:32:51 +05:00
serg@sergbook.mysql.com
31c1a1c9c3 fixed: memleak in --help, sigsegv on shutdown 
Ingo's patch:
WL#2936 - Falcon & MySQL plugin interface: server variables
Added initialization for plugin string variables with their
default values.
Added deallocation of string values before a plugin and its
variables is deleted.
Added examples to plugin_example
 2007-04-26 21:26:04 +02:00
joerg@trift-lap.fambruehe
044f2e110e Merge trift-lap.fambruehe:/MySQL/M50/push-5.0 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 17:11:33 +02:00
joerg@trift-lap.fambruehe
03f4492b5b Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:48:53 +02:00
joerg@trift-lap.fambruehe
f7bac607cf Merge trift-lap.fambruehe:/MySQL/M50/push-5.0 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 16:15:52 +02:00
joerg@trift-lap.fambruehe
5af470eef5 Merge trift-lap.fambruehe:/MySQL/M41/push-4.1 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:13:32 +02:00
joerg@trift-lap.fambruehe
69d39592b9 Merge trift-lap.fambruehe:/MySQL/M41/mysql-4.1 
into  trift-lap.fambruehe:/MySQL/M41/push-4.1
 2007-04-26 16:09:19 +02:00
joerg@trift-lap.fambruehe
2ed383302f Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:06:44 +02:00
joerg@trift-lap.fambruehe
f723388b18 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 16:03:02 +02:00
df@pippilotta.erinye.com
fcea1c66e2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-04-26 09:38:15 +02:00
df@pippilotta.erinye.com
d384d67af2 Two test cases didn't work without Blackhole compiled into the server. 2007-04-26 08:22:05 +02:00
tsmith@quadxeon.mysql.com
c6f625bdbc Add --symbolic-links=1 for partition_not_windows-master.opt. 2007-04-25 22:55:19 +02:00
df@pippilotta.erinye.com
69395833bc Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-04-25 21:48:28 +02:00
df@pippilotta.erinye.com
b353df7474 Fix test case that was broken for builds without InnoDB. 
---
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vanilla-building
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-vanilla-building
---
Fix test cases to pass for a plain ./configure && make build. This includes disabling two test cases when certain features are not present in the server. We're not losing coverage from this because these features are usually present, and disabling them here only serves the purpose to make the test cases work in the unlikely case that they aren't.
---
fixes
 2007-04-25 21:33:18 +02:00
tsmith@quadxeon.mysql.com
da7bda45d6 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-25 20:29:28 +02:00
df@pippilotta.erinye.com
e0f148d5f0 Fix test case that was broken for builds without InnoDB. 2007-04-25 20:23:19 +02:00
tsmith@quadxeon.mysql.com
9e4cc9e393 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-04-25 20:23:05 +02:00
tsmith@quadxeon.mysql.com
43b4b044f7 Fix for valgrind errors in test: require symlink support for partition_not_windows.test 2007-04-25 20:21:55 +02:00
mjorgensen@blade09.mysql.com
d343965fcd thread_registry.cc: 
Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed
 2007-04-25 12:08:12 +02:00
df@pippilotta.erinye.com
0f33daac60 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-04-24 22:45:21 +02:00
df@pippilotta.erinye.com
5ac0fc32b1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-04-24 22:37:33 +02:00
df@pippilotta.erinye.com
6992b90152 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-04-24 22:34:57 +02:00
df@pippilotta.erinye.com
adf575951b restrict recently added file to GPLv2 2007-04-24 22:33:25 +02:00
iggy@recycle.(none)
08ea692a7f - Resolved conflict between fixes for bugs 25141 and 26074. 
- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test
 2007-04-24 16:07:52 -04:00
iggy@recycle.(none)
0dfb49b0a6 - Removing mistake. 2007-04-24 14:26:49 -04:00
iggy@recycle.(none)
8e11fe899e Cset exclude: iggy@alf.|ChangeSet|20070330021852|19466 2007-04-24 13:51:59 -04:00
iggy@alf.
b2bf19354c Merge alf.:D:/src/mysql-5.1-maint 
into  alf.:D:/src/mysql-5.1-maint_pt
 2007-04-24 12:50:28 -04:00
iggy@alf.
0f43ac0d2a Minor fixes. 2007-04-24 12:41:08 -04:00
msvensson@pilot.blaudden
b841154e65 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-24 14:07:30 +02:00
msvensson@pilot.blaudden
9bd17ef189 Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 13:59:44 +02:00
msvensson@pilot.blaudden
8bbdc58bcd Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-24 13:08:01 +02:00
msvensson@pilot.blaudden
88ad41e256 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 13:06:58 +02:00