mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21798 commits 2784 branches 343 tags 1.6 GiB
Commit graph

21798 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith@siva.hindu.god
4579445b2a Merge siva.hindu.god:/home/tsmith/m/bk/41 
into  siva.hindu.god:/home/tsmith/m/bk/maint/41
 2007-02-08 16:01:13 -07:00
tomas@poseidon.mysql.com
097c8431e2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.mysql.com:/home/tomas/mysql-4.1-ndb
 2007-02-08 00:25:30 +07:00
msvensson@pilot.mysql.com
b6da082559 Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 23:01:01 +01:00
msvensson@neptunus.(none)
2fb664cb38 Bug#25344 Segmentation violation when try to run the perror utility 
- strerror might return NULL on some platforms
 2007-02-06 23:00:18 +01:00
msvensson@pilot.mysql.com
256cb08ba9 Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:44:05 +01:00
msvensson@neptunus.(none)
6502f4300b Merge neptunus.(none):/home/msvensson/mysql/my41-nmj 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:42:40 +01:00
msvensson@pilot.mysql.com
36207f8088 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:27:43 +01:00
msvensson@pilot.mysql.com
3f06339d7c Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:27:00 +01:00
msvensson@neptunus.(none)
8c37b28c0b Bug#8983 one place that isn't strict-aliasing-safe 
- Backport fix from 5.0
 2007-02-06 14:07:40 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d69e5063b2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
 2007-02-06 14:58:07 +04:00
jani@a88-113-38-195.elisa-laajakaista.fi
1dd93dda08 Test and bug fixes and removed unneccessary files. 2007-02-05 17:09:44 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
64a728ce0c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
 2007-02-05 10:20:47 +04:00
istruewing@chilla.local
972df14cc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-02 20:23:03 +01:00
istruewing@chilla.local
177a366e53 After merge fix 2007-02-02 20:19:13 +01:00
gluh@mysql.com/eagle.(none)
938de5eee4 another valgrind error fix for 4.1(backport from 5.0) 2007-02-02 17:18:42 +04:00
gluh@mysql.com/eagle.(none)
31c3059ae9 Valgrind errors 
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
 2007-02-02 15:01:11 +04:00
istruewing@chilla.local
3a664472de After merge fix 2007-02-02 10:01:44 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2c45e72e04 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/home/ram/work/b26012/b26012.4.1
 2007-02-01 19:56:14 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d710853fb8 Fix for bug #26012: missed Field_double::size_of() 
As we have Field_double::not_fixed we must have Field_double::size_of().
 2007-02-01 19:51:02 +04:00
lzhou/zhl@dev3-63.(none)
e208018f75 Merge dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb
 2007-02-01 15:48:23 +00:00
istruewing@chilla.local
33e1d1091a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 15:51:25 +01:00
gluh@mysql.com/eagle.(none)
010dc0b55c Valgrind error fixes 
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
 2007-02-01 18:00:24 +04:00
istruewing@chilla.local
73e61944f7 Merge chilla.local:/home/mydev/mysql-4.0-axmrg 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 08:09:36 +01:00
istruewing@chilla.local
97cf413d55 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 07:52:28 +01:00
cmiller@zippy.cornsilk.net
a795b7097f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-01-31 16:26:12 -05:00
cmiller@zippy.cornsilk.net
85896c0af5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-01-31 16:23:10 -05:00
mtaylor@qualinost.(none)
777c5de911 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
 2007-01-31 15:35:26 -05:00
svoj@mysql.com/june.mysql.com
a69107598e Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines
 2007-01-31 16:17:27 +04:00
svoj@mysql.com/june.mysql.com
a51aae601d WL#3567 - MERGE engine: a check for underlying table conformance 
When a merge table is opened compare column and key definition of
underlying tables against column and key definition of merge table.

If any of underlying tables have different column/key definition
refuse to open merge table.
 2007-01-31 16:15:20 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
10dda8e248 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/home/ram/work/b19690/b19690.4.1
 2007-01-31 14:47:06 +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
jani/jamppa@production.mysql.com
0e9a64684d Merge bk://localhost:5559 
into  production.mysql.com:/usersnfs/jamppa/mysql-4.0
 2007-01-30 17:52:27 +01:00
jani@ua141d10.elisa.omakaista.fi
b3523e398c Cleanup of thread-type (linuxthread or NTPL) detection code 
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
 2007-01-30 18:52:26 +02:00
mtaylor@qualinost.(none)
fe308d8d63 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
 2007-01-29 12:26:43 -05:00
istruewing@chilla.local
79e099e8a6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-01-29 17:20:18 +01:00
msvensson@pilot.mysql.com
180b0e0ab5 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-01-29 17:19:38 +01:00
msvensson@pilot.mysql.com
5c717b080f Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-01-29 16:19:59 +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)
58ae89cb76 User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0. 2007-01-26 12:00:38 -08:00
gluh@mysql.com/eagle.(none)
658777d808 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/4.1
 2007-01-26 16:28:32 +04:00
jani@ua141d10.elisa.omakaista.fi
0b4ee9e5b8 Cleanup of thread-type (linuxthread or NTPL) detection code 
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
 2007-01-25 20:10:31 +02:00
istruewing@chilla.local
06a8c16f6f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug24607
 2007-01-24 17:35:14 +01:00
istruewing@chilla.local
928d672c46 Bug#24607 - MyISAM pointer size determined incorrectly 
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
 2007-01-24 13:17:01 +01:00
df@kahlann.erinye.com
09add20d4c Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2007-01-24 09:26:08 +01:00
df@kahlann.erinye.com
9665651457 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2007-01-24 09:23:48 +01:00
svoj@mysql.com/june.mysql.com
02212e6ace Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
 2007-01-24 11:38:23 +04:00
tomas@poseidon.mysql.com
292ba83f40 Bug#25668 mysqld may core if cluster disconnected 
- recommit in 4.1
 2007-01-24 09:41:40 +07:00
istruewing@chilla.local
26153490ec Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug24607
 2007-01-23 22:27:03 +01:00
joerg@trift2.
021d31180c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  trift2.:/MySQL/M41/push-4.1
 2007-01-23 10:47:21 +01:00
tsmith@quadxeon.mysql.com
b3f2b36ac0 Merge bk://localhost:5556 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
 2007-01-23 02:45:59 +01:00