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
42202 commits 2778 branches 343 tags 1.6 GiB
Commit graph

2653 commits

Author SHA1 Message Date
tsmith@siva.hindu.god
1fbf01baf0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 10:34:51 -07:00
tsmith@siva.hindu.god
6b729ff2cd Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 10:30:39 -07:00
iggy@recycle.(none)
e6d1953c8d Merge recycle.(none):/src/bug22807/my50-bug22807 
into  recycle.(none):/src/bug22807/my51-bug22807
 2007-01-18 11:40:22 -05:00
iggy@recycle.(none)
ef5f757ac2 Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces 
- Create space safe strings for system() calls in mysql_upgrade.exe
 2007-01-18 11:38:05 -05:00
tsmith@siva.hindu.god
cc7afe2494 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 08:30:35 -07:00
lars/lthalmann@dl145j.mysql.com
1e356251a0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-01-12 12:31:44 +01:00
cmiller@zippy.cornsilk.net
a16eaf3301 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
 2007-01-07 09:31:49 -05:00
mmj@tiger.mmj.dk
e36b282f1f Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
 2007-01-04 22:24:07 +01:00
mmj@tiger.mmj.dk
37ae5bbbbe my_global.h: 
Add patch from Alfredo for TARGET_FAT_BINARY
 2007-01-04 22:22:25 +01:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files: 
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
 2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +01:00
kent@kent-amd64.(none)
895e442dbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:04:59 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s: 
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
 2006-12-31 01:02:27 +01:00
tomas@poseidon.
044c410968 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2006-12-27 11:01:54 +01:00
kent@kent-amd64.(none)
2a10b99907 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-27 02:24:40 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files: 
Changed header to GPL version 2 only
 2006-12-27 02:23:51 +01:00
tsmith/tim@siva.hindu.god
0cb9cee7f4 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
 2006-12-26 16:49:10 -07:00
acurtis/antony@ltamd64.xiphis.org
54133c7e38 Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
 2006-12-26 12:33:21 -08:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
patg@radha.patg.net
efefea6a5e WL #3031 
* Various windows errors fixed
* Increased max key length for federated
 2006-12-21 22:38:54 -05:00
mskold/marty@mysql.com/linux.site
3587ee8e4e bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTER TABLE must specify STORAGE explicitely to change it, + post review changes 2006-12-19 23:20:43 +01:00
svoj@april.(none)
d29f865d3b Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23255/mysql-5.1-engines
 2006-12-19 19:56:47 +04:00
kaa@polly.local
d3f5fff400 Merge polly.local:/tmp/maint/bug24117/my51-bug24117 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-12-19 12:28:30 +03:00
kaa@polly.local
c637ffec56 Merge polly.local:/tmp/maint/bug24117/my50-bug24117 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-12-19 12:24:44 +03:00
kaa@polly.local
221be0084e Added copy_typelib() declaration to make ABI compatibility test happy 2006-12-19 12:21:41 +03:00
kaa@polly.local
6a304f3fc1 Added copy_typelib() declaration to make ABI compatibility test happy 2006-12-19 11:21:14 +03:00
kaa@polly.local
d7777d14c6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-12-18 18:04:26 +03:00
kaa@polly.local
c4dd267700 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-12-18 17:47:48 +03:00
msvensson@maint1.mysql.com
8c3dab2f5d Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-new-maint
 2006-12-18 14:27:51 +01:00
msvensson@shellback.
c3fb91b782 Change windows pthread_cond_timedwait to use an absolute time value 2006-12-18 11:09:47 +01:00
kaa@polly.local
f4d09fa4a0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-12-16 03:17:50 +03:00
kaa@polly.local
61507a3f93 Merge polly.local:/tmp/maint/bug24117/my51-bug24117 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-12-15 13:23:05 +03:00
kaa@polly.local
0af09f10fb Merge polly.local:/tmp/maint/bug24117/my50-bug24117 
into  polly.local:/tmp/maint/bug24117/my51-bug24117
 2006-12-15 13:10:59 +03:00
msvensson@shellback.
fe341ad904 Add macro for retrieving sec part of "struct timespec" 
Use macros for working with "struct timespec" in event_queue.cc
Fix merge problem
 2006-12-15 10:41:24 +01:00
tsmith/tim@siva.hindu.god
1feb188721 include/my_pthread.h: Fix botched merge - add struct timespec and set_timespec(), etc. 2006-12-14 15:36:45 -07:00
tsmith/tim@siva.hindu.god
126f004a7f Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 12:56:57 -07:00
kaa@polly.local
feb0e3a0f2 Merge polly.local:/tmp/maint/bug24117/my50-bug24117 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-12-14 21:24:52 +03:00
kaa@polly.local
4162e009cb Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache" 
Problem:
When creating a temporary field for a temporary table in create_tmp_field_from_field(), a resulting field is created as an exact copy of an original one (in Field::new_field()). However, Field_enum and Field_set contain a pointer (typelib) to memory allocated in the parent table's MEM_ROOT, which under some circumstances may be deallocated later by the time a temporary table is used.

Solution:
Override the new_field() method for Field_enum and Field_set and create a separate copy of the typelib structure in there.
 2006-12-14 20:58:07 +03:00
msvensson@shellback.
c41e307d85 BUG#24687 func_misc test fails on win64 
- Use same precision (milliseconds) for all time functions
   used  when calculating time for pthread_cond_timedwait
 - Use 'GetSystemTimeAsFileTime' for both start and curr time
 2006-12-14 15:23:44 +01:00
pgalbraith@bk-internal.mysql.com
23f0c6d765 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-09 02:34:42 +01:00
tsmith/tim@siva.hindu.god
50e372d608 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51
 2006-12-08 16:39:58 -07:00
lars@black.(none)
4d25b1e1c2 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-12-08 23:54:45 +01:00
lars@black.(none)
d85ca0dc1d Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-12-08 23:41:29 +01:00
lars@mysql.com/black.(none)
e2e3f0e5c3 Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-12-08 23:33:39 +01:00
rafal@quant.(none)
c82cd4a46e Minor fix 2006-12-08 19:23:12 +01:00
rafal@quant.(none)
5d7af856f7 BUG#24507 (rpl_log.test crash slave): 
The problem was located to lie inside current NPTL pthread_exit() 
implementation. Race conditions in this code can lead to segmentation
fault. Hovewer, this can happen only in a race between first thread 
calling pthread_exit() and other threads. 

Workaround implemented in this patch spawns a dummy thread, which
exits immediately, during thread lib initialization. This will exclude
segment violations when further threads exit.
 2006-12-08 11:41:12 +01:00
cmiller@zippy.cornsilk.net
38346fa9da Having MYSQL_VERSION_ID defined correctly made this KILL_QUERY enum item visible. This is a 
forwards-incompatible change.
 2006-12-07 12:53:32 -05:00
cbell/Chuck@suse.vabb.com
9f36c1c286 WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code. 
Please see worklog for details on files changed.
 2006-12-07 09:18:35 -05:00
jpipes@shakedown.(none)
421533e156 Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246 
into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
 2006-12-07 08:49:53 -05:00