mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-04 18:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35274 commits 2856 branches 349 tags 1.7 GiB
Commit graph

35274 commits

Author SHA1 Message Date
tnurnberg@mysql.com/sin.mysql.com
b5aeef5dea Bug#21103: DATE column not compared as DATE 
When comparing a DATE field with a DATETIME constant, we now compare
as DATETIMEs, not as DATEs.  Fix BDB queries to still work.
 2007-03-05 14:02:29 +01:00
msvensson@pilot.blaudden
a30867bc65 Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-05 11:50:59 +01:00
msvensson@pilot.blaudden
b271a3364d Remove ssl_des.test and ssl_des.result 2007-03-05 11:42:03 +01:00
msvensson@pilot.blaudden
d9a1208d15 Bug#21781 Replication slave io thread hangs 
- Add test case that shows how slave server hangs in "STOP SLAVE"
   when run on MySQL version 5.0.33 compiled with OpenSSL.
   Works fine with latest version of MySQL since that problem
   has been fixed by patch for bug#24148. The fix has been noted in
   the changelog for MySQL 5.0.36
 2007-03-05 10:07:22 +01:00
msvensson@pilot.blaudden
9a2eea4019 Add "have_ssl" as synonym for "have_openssl" 2007-03-05 10:03:42 +01:00
msvensson@pilot.blaudden
94c616d186 Bug Add DBX debugger support to mysql-test-run.pl 
- Add --debugger=dbx
 - Fix --debugger=devenv, --debugger=DevEnv and --debugger=/path/devenv
 2007-03-05 09:52:40 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
3a5b7e63e2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/home/ram/work/b23616/b23616.4.1
 2007-03-05 12:07:59 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9900d2f213 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b23616/b23616.5.0
 2007-03-05 12:04:37 +04:00
msvensson@pilot.blaudden
be1e948543 Merge 192.168.0.10:mysql/my50-m-bug18431 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-03 12:14:36 +01:00
tnurnberg@mysql.com/sin.intern.azundris.com
7217d20725 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/tnurnberg/21103/50-21103
 2007-03-03 01:00:30 +01:00
kent@mysql.com/kent-amd64.(none)
4889fdfafd Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-02 19:59:36 +01:00
kent@mysql.com/kent-amd64.(none)
47c692ec02 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-03-02 19:22:53 +01:00
kent@mysql.com/kent-amd64.(none)
b30a4df3f5 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.0
 2007-03-02 19:21:11 +01:00
joerg@trift2.
7d0ec0bee3 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-03-02 19:09:14 +01:00
joerg@trift2.
9cdd21515b Merge trift2.:/MySQL/M41/manpages-4.1 
into  trift2.:/MySQL/M50/manpages-5.0
 2007-03-02 17:01:24 +01:00
joerg@trift2.
57bc6066e3 Merge trift2.:/MySQL/M40/manpages-4.0 
into  trift2.:/MySQL/M41/manpages-4.1
 2007-03-02 16:34:29 +01:00
joerg@trift2.
6158657090 More man pages for the RPMs. 2007-03-02 16:32:27 +01:00
joerg@trift2.
c1c22df202 Another man page in the RPMs. 2007-03-02 16:30:22 +01:00
tnurnberg@mysql.com/sin.intern.azundris.com
f37267bb3c Bug : DATE column not compared as DATE 
If we compare two items A and B, with B being (a constant) of a
larger type, then A gets promoted to B's type for comparison if
it's a constant, function, or CAST() column, but B gets demoted
to A's type if A is a (not explicitly CAST()) column. This is
counter-intuitive and not mandated by the standard.
 
Disabling optimisation where it would be lossy so field value
will properly get promoted and compared as binary string (rather
than as integers).
 2007-03-02 15:23:13 +01:00
msvensson@pilot.blaudden
1c5c12ac5e Add hint about using --help to see what options are available 2007-03-02 15:21:01 +01:00
joerg@trift2.
942822321c Merge trift2.:/MySQL/M41/manpages-4.1 
into  trift2.:/MySQL/M50/manpages-5.0
 2007-03-02 14:20:43 +01:00
joerg@trift2.
783e907f59 Merge trift2.:/MySQL/M40/manpages-4.0 
into  trift2.:/MySQL/M41/manpages-4.1
 2007-03-02 14:17:04 +01:00
joerg@trift2.
dfce4c8ffd Add the man pages for NDB to the RPMs. 2007-03-02 14:08:32 +01:00
joerg@trift2.
3e2e58d60e Add the man pages for NDB to the RPMs. 2007-03-02 14:05:43 +01:00
joerg@trift2.
1775f82d58 Add missing man pages to the RPMs. 2007-03-02 14:03:28 +01:00
kostja@bodhi.local
3f8c35d94b Freeze the number of conflicts. We should not introduce any more 
conflicts without proper analysis and documentation of the nature of
the conflict.
 2007-03-02 15:05:16 +03:00
kostja@bodhi.local
89bd002cc8 Rename a macro to better reflect the action taken. 2007-03-02 14:29:51 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f165316cfc after merge fix (bug ) 
Item_func_geometry_from_text::val_str() should set null_value
in case of wrong data.
 2007-03-02 15:09:44 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4a5dd6956d Merge mysql.com:/home/ram/work/b23616/b23616.4.1 
into  mysql.com:/home/ram/work/b23616/b23616.5.0
 2007-03-02 15:09:20 +04:00
malff/marcsql@weblab.(none)
2b1a04e7b9 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-26093
 2007-03-01 20:08:58 -07:00
tomas@poseidon.mysql.com
65a0ee5f8c Merge poseidon.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-02 09:38:03 +07:00
malff/marcsql@weblab.(none)
ad45f0168d Bug#26093 (SELECT BENCHMARK() for SELECT statements does not produce valid 
results)

Before this fix, the function BENCHMARK() would fail to evaluate expressions
like "(select avg(a) from t1)" in debug builds (with an assert),
or would report a time of zero in non debug builds.

The root cause is that evaluation of DECIMAL_RESULT expressions was not
supported in Item_func_benchmark::val_int().

This has been fixed by this change.
 2007-03-01 19:20:47 -07:00
tomas@poseidon.mysql.com
4fed7eb88e Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-02 09:10:17 +07:00
tomas@poseidon.mysql.com
f106c25765 Bug SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes 
(part 1)
- add signal data
- add ref in dict on create/drop table/index
 2007-03-02 09:06:05 +07:00
tomas@poseidon.mysql.com
fa47c63b91 Bug Infinite loop on unknown signal in logging function 
- terminate printing
 2007-03-02 08:56:22 +07:00
kent@mysql.com/kent-amd64.(none)
7062e5cc75 mysql.sln: 
Correction of embedded build types
 2007-03-02 00:54:02 +01:00
kent@mysql.com/kent-amd64.(none)
1a6c9f9767 mysql.sln: 
Disabled build of all embedded server libraries, "libmysqld.ldd"
  "mysqldemb.lib" and "mysqlserver.lib"
 2007-03-01 23:48:22 +01:00
malff/marcsql@weblab.(none)
0e0655a792 Manual merge of 5.0 into 5.0-runtime 2007-03-01 15:10:14 -07:00
malff/marcsql@weblab.(none)
df5c5aea23 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-03-01 14:06:57 -07:00
msvensson@pilot.blaudden
75ab386731 After merge fixes 2007-03-01 20:59:08 +01:00
msvensson@pilot.blaudden
d1d64ba50f Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-01 19:10:07 +01:00
msvensson@pilot.blaudden
c0fdf1792a Add two more USE_CYGWIN ifdefs to mysqltest 2007-03-01 19:09:43 +01:00
msvensson@pilot.blaudden
86625d711f Fix bug in mtr.pl where slave wes using same query log file as master 2007-03-01 18:31:09 +01:00
msvensson@pilot.blaudden
c58b2bd757 Don't set the "is_windows" flag if using cygwin 2007-03-01 18:30:29 +01:00
msvensson@pilot.blaudden
f5778fc73e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-01 18:12:56 +01:00
malff/marcsql@weblab.(none)
14e1ed367e Merge weblab.(none):/home/marcsql/TREE/mysql-4.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-4.1-runtime
 2007-03-01 05:59:16 -07:00
msvensson@pilot.blaudden
c506169c06 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-03-01 11:41:53 +01:00
msvensson@pilot.blaudden
c1f8e7f913 MySQL versions before 5.0 still use cygwin, no need 
to convert path
 2007-03-01 11:41:29 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2f5a2b2476 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-01 11:37:28 +01:00
rafal@quant.(none)
c0e985cd58 Merge quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings 
into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
 2007-03-01 10:58:13 +01:00