database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Code Activity
61,660 Commits 3,253 Branches 1,092 Tags
fd64b18545d8e6dd9f4493162df068d174ffb24c
Commit Graph

116 Commits

Author SHA1 Message Date
kent@kent-amd64.(none)
65183d54d2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 14:28:05 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 20:59:57 +01:00
kent@kent-amd64.(none)
2264dc7da0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-28 18:31:53 +01:00
gkodinov@dl145s.mysql.com
32c9e11df9 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-28 17:14:16 +01:00
kent@kent-amd64.(none)
e99c548bcd Merge mysql.com:/home/kent/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mysql-5.1
 2006-11-27 23:12:05 +01:00
kent@mysql.com/kent-amd64.(none)
029dbbc2b2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mysql-5.0-merge
 2006-11-27 21:45:16 +01:00
gkodinov@dl145s.mysql.com
e74c9add47 Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-11-27 16:25:52 +01:00
msvensson@neptunus.(none)
86f0d1bb03 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-24 12:12:25 +01:00
msvensson@neptunus.(none)
8e6cf24d3b Fix my_system_gmt_sec function declaration to be same as definition 2006-11-23 09:56:50 +01:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-22 14:11:36 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
8512b7e5bd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
 2006-11-22 14:06:37 +04:00
ramil/ram@myoffice.izhnet.ru
abfd0285d2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789
 2006-11-22 13:41:33 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
802f7fc366 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
 2006-11-22 12:40:15 +04:00
ramil/ram@myoffice.izhnet.ru
d40abd8738 Merge mysql.com:/usr/home/ram/work/bug21789/my50-bug21789 
into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789
 2006-11-22 12:13:09 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b11dba2f0b Merge mysql.com:/usr/home/ram/work/bug21789/my41-bug21789 
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
 2006-11-22 12:10:18 +04:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
 2006-11-20 22:42:06 +02:00
holyfoot/hf@deer.(none)
7d190dd6b1 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/mysql-5.1-mrg
 2006-11-17 19:01:35 +04:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
 2006-11-17 10:30:16 +04:00
msvensson@neptunus.(none)
683d189897 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 13:54:19 +01:00
msvensson@neptunus.(none)
68a7d45a0a Use same type for function declaration and definition 2006-11-13 13:45:40 +01:00
petr/cps@outpost.site
e06f74f9f9 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
 2006-11-10 15:05:38 +03:00
holyfoot/hf@deer.(none)
938ba3e11e Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into  mysql.com:/home/hf/work/mysql-5.1.clean
 2006-11-08 19:09:39 +04:00
anozdrin/alik@alik.
ee15c11b7c Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
 2006-11-07 16:24:35 +03:00
anozdrin/alik@alik.
7cf65fd309 Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  alik.:/mnt/raid/alik/MySQL/devel/5.0-merged-5.0-rt
 2006-11-07 13:45:56 +03:00
holyfoot/hf@mysql.com/deer.(none)
7ddb8b68fa bug #19491 (5.0-related additional fixes) 2006-11-06 22:33:18 +04: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
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
kaa@polly.local
2667443173 Merge polly.local:/tmp/maint/bug11655/my50-bug11655 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-10-12 11:28:44 +04:00
kaa@polly.local
29b5e2955e Merge polly.local:/tmp/maint/bug11655/my50-bug11655 
into  polly.local:/tmp/maint/bug11655/my51-bug11655
 2006-10-11 14:22:17 +04:00
kaa@polly.local
02ac635027 Merge polly.local:/tmp/maint/bug11655/my41-bug11655 
into  polly.local:/tmp/maint/bug11655/my50-bug11655
 2006-10-11 14:16:30 +04:00
kaa@polly.local
609a3cd295 Fixes a number of problems with time/datetime <-> string conversion functions: 
- bug #11655 "Wrong time is returning from nested selects - maximum time exists
- input and output TIME values were not validated properly in several conversion functions
- bug #20927 "sec_to_time treats big unsigned as signed"
- integer overflows were not checked in several functions. As a result, input values like 2^32 or 3600*2^32 were treated as 0
- BIGINT UNSIGNED values were treated as SIGNED in several functions
- in cases where both input string truncation and out-of-range TIME value occur, only 'truncated incorrect time value' warning was produced
 2006-10-04 17:13:32 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ce433e9e44 Fix for bug #21789: DATETIME with 0000-00-00 11:22:33 should be invalid, but is accepted 
Reject '0000-00-00 01:01:01' dates.
 2006-10-04 16:00:44 +05:00
brian@zim.(none)
41f920b013 Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-14 21:26:33 -07:00
brian@zim.(none)
4d7f7fb878 Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB. 2006-08-14 14:45:48 -07:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-12 21:06:51 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
794fe3435c Fix for bug #19370: DateTime datatype in MySQL has two bugs in it 2006-07-12 11:38:11 +05:00
tnurnberg@mysql.com
d1311e1ac7 Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value 
if input year for date_add() / date_sub() with INTERVAL is low enough for
calc_daynr() to possibly return incorrect results (calc_daynr() has no information
on whether the year is low because it was a two-digit year ('77) or because it
was a really low four-digit year (0077) and will indiscriminately try to turn the
value into a four-digit year by adding 1900 or 2000 respectively), the functions
will now throw NULL.
 2006-05-16 03:32:24 +02:00
aivanov@mysql.com
e6b08a5ea9 Merge mysql.com:/home/alexi/dev/mysql-4.1-12440 
into  mysql.com:/home/alexi/dev/mysql-5.0-12440
 2005-12-15 18:59:40 +03:00
aivanov@mysql.com
ea4c3481f2 Fixed BUG #12440: "Incorrect processing of time values containing 
long fraction and/or large exponent part".
 2005-12-15 18:48:08 +03:00
acurtis@xiphis.org
b9476f7d50 Merge xiphis.org:/usr/home/antony/work2/mysql-4.1 
into  xiphis.org:/usr/home/antony/work2/merge-5.0
 2005-08-11 12:18:53 +01:00
monty@mysql.com
99cb083549 Review of new pushed code 
- Fixed some error condtion when handling dates with 'T'
- Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed
- Safety fixes and cleanups
 2005-08-09 00:13:49 +03:00
jimw@mysql.com
fa94e5389a Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-04 12:49:23 -07:00
jimw@mysql.com
4340fa114e Fix parsing of dates with 'T' between date and time, as in ISO-8601 
date format. (Bug #7308)
 2005-08-02 11:31:01 -07:00
monty@mishka.local
8437e9c1be Fixes during review of new pushed code 
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
 2005-07-31 12:49:55 +03:00
jimw@mysql.com
dd2f631ec4 Fix number to date conversion so it always honors the NO_ZERO_DATE, 
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906)
 2005-07-18 16:12:44 -07:00
joerg@mysql.com
f5e0cf8e51 Changed C++ style comments to C style, bug#7665. 2005-01-04 17:21:55 +01:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
dlenev@brandersnatch.localdomain
cd98fcf4e9 Merged fixes for bug #7297 "Two digit year should be interpreted 
correctly even with zero month and day" and bug #7515 "from_unixtime(0)
now returns NULL instead of the Epoch" into 4.1 tree.
 2004-12-30 23:44:42 +03:00
konstantin@mysql.com
7216594f4f Data truncation reporting implementation (libmysql) + post review 
fixes. Still to do: 
-  deploy my_strtoll10 in limbysql.c
- add mysql_options option to switch MYSQL_DATA_TRUNCATED on and off.
 2004-12-16 03:15:06 +03:00