mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46219 commits 2781 branches 343 tags 1.6 GiB
Commit graph

2820 commits

Author SHA1 Message Date
cmiller@zippy.cornsilk.net
c34f3219b3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-11-02 17:27:42 -05:00
stewart@willster.(none)
8d05d38992 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending
 2006-11-02 17:25:53 +11:00
kostja@bodhi.local
965669d1f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:24:11 +03:00
monty@nosik.monty.fi
d745fe49fe Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-01 19:46:23 +02:00
monty@mysql.com/nosik.monty.fi
ca99516cc7 Fixed a lot of compiler warnings (Mainly in mysqld and instance manager) 
Fixed some possible fatal wrong arguments to printf() style functions
Initialized some not initialized variables
Fixed bug in stored procedure and continue handlers
(Fixes Bug#22150)
 2006-11-01 19:41:09 +02:00
petr/cps@owlet.local
3df8165cf9 Merge mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191 
into  mysql.com:/home/cps/mysql/trees/5.1-runtime-bug9191
 2006-11-01 18:18:01 +03:00
msvensson@neptunus.(none)
a2e38573bd Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-01 16:11:56 +01:00
petr/cps@mysql.com/owlet.local
7974bf90aa Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191 
into  mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191
 2006-11-01 17:35:35 +03:00
petr/cps@mysql.com/owlet.local
3ec542dfbd Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1" 
(4.1 version, with post-review fixes)
  
  The fix for another Bug (6439) limited FROM_UNIXTIME() to
  TIMESTAMP_MAX_VALUE which is 2145916799 or 2037-12-01 23:59:59 GMT,
  however unix timestamp in general is not considered to be limited 
  by this value. All dates up to power(2,31)-1 are valid.
  
  This patch extends allowed TIMESTAMP range so, that max
  TIMESTAMP value is power(2,31)-1. It also corrects
  FROM_UNIXTIME() and UNIX_TIMESTAMP() functions, so that
  max allowed UNIX_TIMESTAMP() is power(2,31)-1. FROM_UNIXTIME()
  is fixed accordingly to allow conversion of dates up to
  2038-01-19 03:14:07 UTC. The patch also fixes CONVERT_TZ()
  function to allow extended range of dates.
  
  The main problem solved in the patch is possible overflows
  of variables, used in broken-time representation to time_t
  conversion (required for UNIX_TIMESTAMP).
 2006-11-01 16:47:40 +03:00
dlenev@mockturtle.local
5961d4721f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2
 2006-11-01 16:20:15 +03:00
dlenev@mockturtle.local
9ac5ed6784 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
 2006-11-01 15:46:40 +03:00
dlenev@mockturtle.local
bd1b57f930 Small cleanup in code handling stored routines/table prelocking. 
Use lazy initialization for Query_tables_list::sroutines hash.
This step should significantly decrease amount of memory consumed
by stored routines as we no longer will allocate chunk of memory
required for this HASH for each statement in routine.
 2006-11-01 15:41:48 +03:00
joerg@trift2.
0d27df6f1a Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-01 13:26:03 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
d18fcb3a0f Bug#20404: SHOW CREATE TABLE fails with Turkish I 
Problem: SHOW CREATE TABLE printed garbage in table
  name for tables having TURKISH I
  (i.e. LATIN CAPITABLE LETTER I WITH DOT ABOVE)
  when lower-case-table-name=1.
  
  Reason: In some cases during lower/upper conversion in utf8,
  the result string can be shorter the original string
  (including the above letter). Old implementation of caseup_str()
  and casedn_str() didn't handle the result length properly,
  assuming that length cannot change.
  
  This fix changes the result type of cs->cset->casedn_str()
  and cs->cset->caseup_str() from VOID to UINT, to return
  the result length, as well as put '\0' terminator on a 
  proper place.
  
  Also, my_caseup_str_utf8() and my_casedn_str_utf8() were 
  rewritten not to use strlen() for performance purposes.
  It was done with help of adding of new functions - my_utf8_uni_no_range()
  and my_uni_utf8_no_range() - for null terminated strings.
 2006-10-30 14:40:15 +04:00
msvensson@shellback.(none)
f11aa15c4a Disable abi_check in 5.1 for the moment 2006-10-27 16:36:08 +02:00
msvensson@neptunus.(none)
abc1c05449 Update the rules for abi_check 2006-10-27 15:57:00 +02:00
msvensson@neptunus.(none)
65ab78fe3c Update for 5.1 2006-10-26 23:59:00 +02:00
msvensson@neptunus.(none)
6e70b126ed Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-26 22:54:25 +02:00
msvensson@neptunus.(none)
00fbaf07d1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-26 22:25:45 +02:00
msvensson@neptunus.(none)
b5b39a4afb Bug#23427 incompatible ABI change in 5.0.26? 
- Improve icheck rules in Makefile.am
 2006-10-26 22:20:43 +02:00
stewart@willster.(none)
8f3ac043e8 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20839
 2006-10-26 21:29:27 +10:00
tsmith/tim@siva.hindu.god
514fd098f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-10-25 16:28:42 -06:00
msvensson@neptunus.(none)
f186d913fa Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-25 02:27:22 +02:00
tsmith/tim@siva.hindu.god
3af2089b13 Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-10-24 14:42:08 -06:00
msvensson@neptunus.(none)
74d8113c2e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 22:02:33 +02:00
msvensson@neptunus.(none)
23700ab32b Update the reference file for mysql API/ABI for 5.0 2006-10-24 22:00:08 +02:00
msvensson@neptunus.(none)
e0985bef96 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
1a7676fa65 WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks 
BUG#23427 incompatible ABI change in 5.0.26?
   - Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file
 2006-10-24 20:32:07 +02:00
tsmith@maint1.mysql.com
8f75d0913b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/51
 2006-10-24 20:01:01 +02:00
mmj@tiger.local[mmj]
da721fe7aa Bug #23427: incompatible ABI change in 5.0.26? 
Revert 1 June change enough to restore ABI compatibility with previous
versions.
 2006-10-24 19:05:11 +02:00
holyfoot/hf@deer.(none)
e203abf0a1 Merge mysql.com:/home/hf/work/current_stmt/my50-current_stmt 
into  mysql.com:/home/hf/work/current_stmt/my51-current_stmt
 2006-10-24 17:53:15 +05:00
holyfoot/hf@mysql.com/deer.(none)
887e6af60c Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmt 
into  mysql.com:/home/hf/work/current_stmt/my50-current_stmt
 2006-10-24 17:50:46 +05:00
holyfoot/hf@mysql.com/deer.(none)
d0ef58b6a4 Bug #23427 (incompatible ABI change) 
the incompatibility was caused by current_stmt member added to the MYSQL
structure.
It's possible to move it to THD structure instead which saves ABI
 2006-10-24 17:19:02 +05:00
msvensson@neptunus.(none)
33a200d73d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 12:53:47 +02:00
tsmith/tim@siva.hindu.god
aeced431e3 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-10-23 23:41:07 -06:00
kostja@bodhi.local
4cb57ac048 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-10-23 12:06:59 +04:00
gkodinov@dl145s.mysql.com
b1bd09cbfa Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-21 09:33:53 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f97fe50dbb Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-10-21 01:13:50 +02:00
cmiller@zippy.cornsilk.net
482712bf83 Merge zippy.cornsilk.net:/home/cmiller/emergency/mysql-5.0.26a-release 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-10-20 17:30:28 -04:00
cmiller@zippy.cornsilk.net
b96ab282ea Bug #23427: incompatible ABI change in 5.0.26? 
Revert 1 June change enough to restore ABI compatibility with previous
versions.
 2006-10-20 17:17:24 -04:00
stewart@willster.(none)
910e4d974c BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11 
post-review fixups - magnus suggested creating dynstr_trunc instead of doing
it manually.
 2006-10-20 22:47:28 +10:00
gkodinov@dl145s.mysql.com
bb0422a0b0 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-20 11:12:35 +02:00
gkodinov@dl145s.mysql.com
a93cc1b70b Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-20 11:02:56 +02:00
gkodinov@dl145s.mysql.com
aaed398254 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-19 16:43:46 +02:00
gkodinov@dl145s.mysql.com
892495acaf Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-19 14:37:49 +02:00
istruewing@chilla.local
5af9dfa6ba Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-merge
 2006-10-19 10:15:08 +02:00
istruewing@chilla.local
11d453cc33 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-merge
 2006-10-19 09:59:01 +02:00
cmiller@zippy.cornsilk.net
91c4edfbfb Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-10-17 12:00:36 -04:00
cmiller@zippy.cornsilk.net
184467a2cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-10-17 11:23:07 -04:00
gkodinov/kgeorge@macbook.gmz
660d724f25 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B22367-5.0-opt-merge
 2006-10-17 10:58:01 +03:00