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

2830 commits

Author SHA1 Message Date
svoj@june.mysql.com
442969fd16 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-05-23 12:41:30 +05:00
tsmith@siva.hindu.god
4a4590cd49 Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-05-17 14:21:35 -06:00
svoj@june.mysql.com
7b4907e450 Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.1-engines
 2007-05-17 12:50:58 +05:00
svoj@mysql.com/june.mysql.com
cc9d6534e8 Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
 2007-05-17 12:48:10 +05:00
svoj@mysql.com/june.mysql.com
4f11124c48 Addition to fix for 
BUG#25712 - insert delayed and check table run together report
            crashed tables

Let MY_THREADSAFE have distinct value. Some functions call my_seek
passing MyFlags argument directly to it. This may cause unnecessary
locks, which may finally lead to a dead-lock (specifically see my_lock).
 2007-05-17 12:43:52 +05:00
istruewing@chilla.local
e2fa2becfc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug17332
 2007-05-10 17:30:50 +02:00
kaa@polly.local
722b690743 Merge polly.local:/home/kaa/src/maint/bug28240/my50-bug24240 
into  polly.local:/home/kaa/src/maint/bug28240/my51-bug24240
 2007-05-10 17:07:27 +04:00
kaa@polly.local
51af6a4077 Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototype 
Since isinf() portability across various platforms and compilers is a complicated question, we should not use it directly. Instead, the my_isinf() macro should be used, which is defined as an alias to the system-defined isinf() if it is safe to use, or a workaround implementation otherwise.
 2007-05-08 21:11:46 +04:00
acurtis/antony@ltamd64.xiphis.org
a4dbc0990c Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
 2007-05-04 23:35:14 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
9126286a6a WL#2936 
Fix compiler warnings,
  Fix help output - this fixes im test failures.
  Fix incomplete change of SET plugin vars to ulonglong.
  Allow ER() to work without crashing when errmsg.sys has not been loaded.
 2007-05-01 18:25:29 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
853fc26252 WL#2936 
Change SET variables to be ulonglong type (64bit)
 2007-04-30 16:42:15 -07:00
kaa@polly.local
4b5079fe99 Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-04-30 13:33:13 +04:00
serg@sergbook.mysql.com
1bd2953c02 compilation/test fixes 2007-04-29 17:46:18 -07:00
serg@sergbook.mysql.com
10057bf4c3 compilation failure 2007-04-29 09:00:08 -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
kaa@polly.local
3bed463963 If isinf() is not available on a target platform, use our own imlementation via finite() and isnan(). If either of the last two is not available as well, use simple replacements which are platform-neutral, but slower than compiler intrinsics. 2007-04-29 16:57:17 +04: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
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
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
4563137549 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-24 11:21:42 +02:00
msvensson@pilot.blaudden
f028e17ab7 Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 11:16:56 +02:00
msvensson@pilot.blaudden
b941ef8633 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 13:28:09 +02:00
msvensson@pilot.blaudden
d1de41c59a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 12:05:00 +02:00
msvensson@pilot.blaudden
a31fce0a6c Remove left over file abi_check 2007-04-23 11:46:47 +02:00
joerg@debian.(none)
6ef12bb111 Merge debian.(none):/M50/mysql-5.0 
into  debian.(none):/M50/push-5.0
 2007-04-20 12:31:03 +02:00
joerg@debian.(none)
4c00b6fd26 Merge debian.(none):/M51/mysql-5.1 
into  debian.(none):/M51/push-5.1
 2007-04-20 11:58:56 +02:00
tsmith@siva.hindu.god
9232def96b Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-04-18 14:55:42 -06:00
msvensson@pilot.blaudden
01133f8e6f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 14:18:55 +02:00
msvensson@pilot.blaudden
dd0d2146c3 Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3 Bug#25452 mysql_upgrade access denied 
- Improve mysql_upgrade and add comments describing it's logic
 - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
  was started from
 - Don't look for mysql_fix_privilege_tables.sql randomly, compile
  in the mysql_fix_privilege_tables.sql file and use that to upgrade
  the system tables of MySQL
 - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
 - Fix bug#26639, bug#24248 and bug#25405
 2007-04-18 13:21:39 +02:00
serg@sergbook.mysql.com
6bc9bc92df Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
 2007-04-16 10:37:50 +02:00
serg@sergbook.mysql.com
c53037af36 more wl#2936 fixes: removed implicit ha_thd() calls (too error-prone), 
fixed an assert crash
 2007-04-15 15:47:27 +02:00
serg@janus.mylan
3ecbb5a443 wl#2936 - fixing problems 2007-04-13 19:23:02 +02:00
joerg@trift2.
6aae2bfe9f Merge trift2.:/MySQL/M50/bug27456-5.0 
into  trift2.:/MySQL/M51/bug27456-5.1
 2007-04-13 10:53:35 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
c66f50fa68 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
 2007-04-13 09:04:34 +03:00
monty@mysql.com/narttu.mysql.fi
6e8b72a6bb Added more descriptive error message of why statement was automaticly dropped 
Print information if net_clear() skipped bytes (As this otherwise hides critical timeing bugs)
Added DBUG_ASSERT if we get packets out of order
mysql_change_user() could on error send multiple packets, which caused mysql_client_test to randomly fail
 2007-04-13 01:56:22 +03:00
joerg@trift2.
a3c70abb4e Header file "decimal.h" needs to be delivered with binary packages: 
Bug#27456    decimal.h is not installed with public include files
 2007-04-12 21:50:56 +02:00
jani@ua141d10.elisa.omakaista.fi
335153121b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-04-12 12:50:02 +03:00
msvensson@pilot.blaudden
c405f94cfb Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c 
- Rely only on HAVE_ISINF to determine if 'isinf' can be used.
 2007-04-12 10:29:22 +02:00
msvensson@pilot.blaudden
7563ebefca Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h 
- Move marcos for __attribute__ usage to my_attribute.h and
   include that file where needed
 2007-04-12 00:43:25 +02:00
msvensson@pilot.blaudden
2218fafa1f Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 09:34:02 +02:00
jani@ua141d10.elisa.omakaista.fi
b4ba815967 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-04-10 16:28:47 +03:00
joerg@trift2.
22f066e354 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-07 20:46:43 +02:00
holyfoot/hf@hfmain.(none)
ce426dd622 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-07 14:59:53 +05:00
tomas@whalegate.ndb.mysql.com
77a1d31fbc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-05 10:24:37 +02:00
tomas@whalegate.ndb.mysql.com
d04730c06d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-05 10:21:41 +02:00
mskold/marty@mysql.com/linux.site
3e8cf5958b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-04-05 08:39:12 +02:00