database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Code Activity
54,780 Commits 3,268 Branches 1,096 Tags
bbf344b646005c6fadeb718bc60f811cf8a42cb5
Commit Graph

2426 Commits

Author SHA1 Message Date
monty@mysql.com/narttu.mysql.fi
26aa385bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-02-21 14:07:08 +02:00
kaa@polly.local
41eccda1df Merge polly.local:/tmp/maint/bug25137/my51-bug25137 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-02-20 23:16:18 +03:00
kaa@polly.local
b7e6df7cc9 Merge polly.local:/tmp/maint/bug25137/my50-bug25137 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-02-20 22:23:51 +03:00
msvensson@pilot.blaudden
0af1b19568 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Fixes for 5.1
 2007-02-20 16:29:56 +01:00
msvensson@pilot.blaudden
0cc2e14040 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
 2007-02-20 16:26:30 +01:00
msvensson@pilot.blaudden
6caa0a232e Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Part 2, add @@hostname system variable
 2007-02-20 16:24:38 +01:00
kaa@polly.local
52100678bd Merge polly.local:/tmp/maint/bug25137/my50-bug25137 
into  polly.local:/tmp/maint/bug25137/my51-bug25137
 2007-02-19 14:04:38 +03:00
kaa@polly.local
315819fed0 Bug#18743: Several test cases fails if "classic" configuration in 5.0 
The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are:
- some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
- some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test"
 2007-02-19 13:57:06 +03:00
guilhem@gbichot3.local
03dfe4ab3f Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-25507 
into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-25507
 2007-02-15 16:05:22 +01:00
guilhem@gbichot3.local
2f75c9cd69 Backport from the Falcon tree. 
When opening/creating the transaction coordinator's log, if binlog is
used, the tc log is the binlog so we use the binlog's name; otherwise
we use the mmap-based log, named after the mandatory argument of the
--log-tc option (meant for that).
 2007-02-15 15:50:56 +01:00
msvensson@pilot.mysql.com
b6f78aa153 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-14 14:51:49 +01:00
msvensson@pilot.mysql.com
24a242bee1 Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 14:45:15 +01:00
msvensson@pilot.mysql.com
45fe5879f4 Bug#18628 mysql-test-run: security problem(part1) 
- Implement --secure-file-priv=<dir> option that limits
  "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
  with files in specified dir.
 - Use above option for mysqld in mysql-test-run.pl
 2007-02-14 14:44:34 +01:00
tomas@poseidon.mysql.com
18d227b1b0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-14 10:18:02 +07:00
mskold/marty@mysql.com/linux.site
113a84bd33 Enabled engine_condition_pushdown (on) as default 2007-02-09 21:04:43 +01:00
tsmith@siva.hindu.god
498756195a Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-02-08 16:02:58 -07:00
svoj@mysql.com/april.(none)
db8a7b513c Excluded wrongly merged changeset. 2007-02-07 01:37:21 +04:00
msvensson@neptunus.(none)
e4001b3b5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 15:46:17 +01:00
msvensson@neptunus.(none)
ede3afe470 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:45:08 +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
svoj@june.mysql.com
4a6770e06e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-02-05 15:31:20 +04:00
istruewing@chilla.local
dde4f421f1 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-03 09:44:40 +01:00
istruewing@chilla.local
bdf18a85f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-03 09:43:38 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
 2007-02-03 00:58:09 +02:00
istruewing@chilla.local
77e99fe2ce Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-02 23:05:46 +01:00
istruewing@chilla.local
177a366e53 After merge fix 2007-02-02 20:19:13 +01:00
istruewing@chilla.local
ed09987083 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-01 19:41:04 +01: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
1c34270464 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-01 10:19:22 +01: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
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
522d6fb0cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-01-31 16:24:28 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-31 16:23:05 -05:00
bar@mysql.com
b81d6b8f66 Merge mysql.com:/home/bar/mysql-5.0.b25815 
into  mysql.com:/home/bar/mysql-5.1.b25815
 2007-01-31 17:01:28 +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
8da5745858 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b19690/b19690.5.0
 2007-01-31 14:31:11 +04: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
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
istruewing@chilla.local
42bd03e254 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-01-29 18:47:46 +01: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
holyfoot/hf@mysql.com/hfmain.(none)
6679490dc6 bug #25890 (mysqltest_embedded crashes on start) 
binlog_filter and rpl_filter are initialized in server's 'main' function
which doesn't work in the embedded server. So this code moved to
function working in both cases.
 2007-01-29 15:26:27 +04:00
monty@narttu.mysql.fi
bb464613ce Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-01-29 01:57:07 +02:00
monty@mysql.com/narttu.mysql.fi
410fc81a72 After merge fixes 
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
 2007-01-29 01:47:35 +02:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
 2007-01-27 03:46:45 +02:00
gluh@eagle.(none)
67db27537b Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1
 2007-01-26 16:46:01 +04:00