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

19327 commits

Author SHA1 Message Date
mtaylor@qualinost.(none)
13b35c4323 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-31 15:39:03 -05:00
ramil/ram@ramil.myoffice.izhnet.ru
ee56d2be9f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b19690/b19690.5.1
 2007-01-31 14:28:52 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
30f904eb2d Merge mysql.com:/home/ram/work/b19690/b19690.5.0 
into  mysql.com:/home/ram/work/b19690/b19690.5.1
 2007-01-31 12:53:36 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
0bd1c03e7e after-merge fix. 2007-01-31 11:14:32 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f0f83a36bc Merge mysql.com:/home/ram/work/b19690/b19690.4.1 
into  mysql.com:/home/ram/work/b19690/b19690.5.0
 2007-01-31 10:07:56 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
eb415e4920 fix for bug #19690: ORDER BY eliminates rows from the result 
Depending on the queries we use different data processing methods
and can lose some data in case of double (and decimal in 4.1) fields.

The fix consists of two parts:
1. double comparison changed, now double a is equal to double b 
if (a-b) is less than 5*0.1^(1 + max(a->decimals, b->decimals)). 
For example, if a->decimals==1, b->decimals==2, a==b if (a-b)<0.005
2. if we use a temporary table, store double values there as is 
to avoid any data conversion (rounding).
 2007-01-31 09:51:05 +04:00
mtaylor@qualinost.(none)
c4db290104 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-29 12:30:48 -05:00
msvensson@pilot.mysql.com
719a8f5896 Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943 
into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943
 2007-01-29 14:35:09 +01:00
msvensson@pilot.mysql.com
007d170ad2 Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943 
into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
 2007-01-29 14:33:53 +01:00
msvensson@pilot.mysql.com
7eaa82ea38 Bug#22943 syscall pruning in libmysql 
- Set the timeout values only where needed
 2007-01-29 14:31:48 +01:00
mtaylor@qualinost.(none)
b7a7d3f7c6 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-26 13:11:10 -08:00
cmiller@zippy.cornsilk.net
f74992258a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-26 14:47:35 -05:00
cmiller@zippy.cornsilk.net
41179e6a8f Bug #25879: THD::options isn't set with ulonglong values and \ 
variables

Bits higher than 2**31 were impossible to set on THD::options.  It's
probably a remnant from a time when options was a 32-bit integer.

Now, use unsigned long-long constants and variables to set and clear
THD::options.
---
Pulled comments back to column 49.
 2007-01-26 14:47:12 -05:00
tsmith@quadxeon.mysql.com
28e8847ccd Merge bk://localhost:5556 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-01-23 02:43:57 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
1d9c8c8a3d Merge mysql.com:/home/ram/work/b22026/b22026.5.0 
into  mysql.com:/home/ram/work/b22026/b22026.5.1
 2007-01-22 14:58:36 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a079f20aa8 Fix for bug #22026: Warning when using IF statement and large unsigned bigint 
We use INT_RESULT type if all arguments are of type INT for 'if', 'case', 
'coalesce' functions regardless of arguments' unsigned flag, so sometimes we can
exceed the INT bounds.
 2007-01-22 14:52:23 +04:00
tsmith@siva.hindu.god
7ce6170cf9 Applied innodb-5.0-ss1230 snapshot 
Fixes:
- Bug #25596:
 2007-01-21 17:58:02 -07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
86322e269f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
 2007-01-19 08:56:03 +04:00
ramil/ram@myoffice.izhnet.ru
1b488c7fbe Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
 2007-01-19 08:54:10 +04:00
cmiller@zippy.cornsilk.net
d0a2f4d9b8 Fix merge problem. 2007-01-18 18:02:58 -05:00
tsmith@siva.hindu.god
1d72994246 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 10:38:49 -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
tsmith@siva.hindu.god
244b2004ee Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
 2007-01-18 10:06:36 -07:00
tsmith@siva.hindu.god
6fd02a439f Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
 2007-01-18 09:53:30 -07: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
ramil/ram@mysql.com/myoffice.izhnet.ru
6eba677517 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
 2007-01-18 17:10:00 +04:00
ramil/ram@myoffice.izhnet.ru
3760672ead Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
 2007-01-18 16:40:49 +04:00
ramil/ram@myoffice.izhnet.ru
9d86d7e97b Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533 
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
 2007-01-18 15:59:40 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c57442d6d8 after merge fix. 2007-01-18 15:28:45 +04:00
ramil/ram@myoffice.izhnet.ru
a2303ea3fe Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533 
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
 2007-01-18 11:13:13 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5c42e68388 after merge fix. 2007-01-18 10:51:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
e8968822dc Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533 
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
 2007-01-18 09:39:47 +04:00
cmiller@zippy.cornsilk.net
abd057be56 errmsg update from Stefan. 2007-01-17 15:01:28 -05:00
lars/lthalmann@dl145k.mysql.com
74f748999b Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-01-17 19:48:35 +01:00
lars/lthalmann@dl145j.mysql.com
5810ca92c9 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-01-17 19:32:14 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b25079d61a Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-01-17 19:30:05 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bbaf32754f Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-01-17 19:28:55 +01:00
kostja@bodhi.local
1480f9f48c Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-17 20:47:50 +03:00
kostja@bodhi.local
15c9d8a6c9 Disable symlinks under valgrind builds (again), with a comment. 2007-01-17 20:46:09 +03:00
kostja@bodhi.local
a9590803fc Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max
 2007-01-17 16:00:33 +03:00
kostja@bodhi.local
6399db740e Fix a failure of lowercase_tables2 test on powermacg5, introduced 
by the patch for Bug#4968
 2007-01-17 15:46:30 +03:00
kostja@bodhi.local
feb9098a03 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-17 14:28:10 +03:00
kostja@bodhi.local
175438819a Fix a ps.test failure in 5.0-runtime tree. 2007-01-17 14:24:54 +03:00
msvensson@pilot.mysql.com
51292deb36 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-01-17 11:53:00 +01:00
msvensson@pilot.mysql.com
8154355a07 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-01-17 11:13:03 +01:00
kostja@bodhi.local
717452fec9 Merge bodhi.local:/opt/local/work/mysql-5.1-root 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-16 14:54:43 +03:00
mats@romeo.(none)
1135806991 Post-merge fixes. 2007-01-16 11:58:48 +01:00
dlenev@mockturtle.local
693bc6a233 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
 2007-01-16 07:25:23 +03:00
dlenev@mockturtle.local
33b8690570 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
 2007-01-16 07:19:39 +03:00
kostja@bodhi.local
df18e193a2 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-root
 2007-01-15 23:51:52 +03:00