mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35306 commits 2790 branches 343 tags 1.7 GiB
Commit graph

35306 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 #26038) 
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
evgen@sunlight.local
629aa8071d sql_base.cc: 
Post fix for bug#25122.
 2007-03-02 13:25:41 +03:00
gkodinov/kgeorge@magare.gmz
4a6efcd664 Bug #26537: item_unhex() was not expected 
to return NULL for non-NULL arguments.
This is not the case as it can return NULL
for invalid hexidecimal strings.
Fixed by setting the maybe_null flag.
 2007-03-02 12:14:50 +02: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 #25275 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 #26720 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
evgen@moonbone.local
44f97f3f50 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/25122-bug-5.0-opt-mysql
 2007-03-02 00:10:25 +03:00
evgen@moonbone.local
11588e5e4a Bug#25122: Views based on a self-joined table aren't insertable. 
When INSERT is done over a view the table being inserted into is 
checked to be unique among all views tables. But if the view contains
self-joined table an error will be thrown even if all tables are used under
different aliases.

The unique_table() function now also checks tables' aliases when needed.
 2007-03-02 00:09:22 +03: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
gkodinov/kgeorge@magare.gmz
360b063d3f Correctly recognize Intel Core2Duo Extreme 
in build.
 2007-03-01 15:28:10 +02: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
jamppa@bk-internal.mysql.com
87e7afe541 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
 2007-03-01 10:47:30 +01:00
rafal@quant.(none)
536d857d95 Removing two more compilation warnings. 2007-03-01 10:40:48 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
a934e46ebd Fixed compiler warnings. 2007-03-01 11:28:33 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
ff5376986f Disabled compiler warnings. 2007-03-01 10:52:25 +02:00
bar@mysql.com
c75a0d6a17 Fix for wrong replace command. 2007-03-01 12:26:07 +04:00
rafal@quant.(none)
7825a45e1c Merge quant.(none):/ext/mysql/bk/mysql-5.0-bug25463 
into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
 2007-03-01 09:23:26 +01:00
rafal@quant.(none)
d127882641 Merge quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings 
into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
 2007-03-01 09:21:32 +01:00
bar@mysql.com
272446dfcd Renaming recenly added test case, because of name conflict 
when merging into 5.1.
 2007-03-01 11:52:25 +04:00
rafal@quant.(none)
dc6e9d7fc3 Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl 
into  quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings
 2007-03-01 08:47:49 +01:00
rafal@quant.(none)
8aee1f6e89 Fixes of compilation warnings and errors. 2007-03-01 08:41:13 +01:00
bar@mysql.com
08d2203077 Additional fix for bug N 15126 
Replacing local directory.
 2007-03-01 11:23:12 +04:00
tomas@poseidon.mysql.com
3cd7b7da7f Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-01 08:37:16 +07:00
tomas@poseidon.mysql.com
6dd7294dfb ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer 
ndb - 5.1.16 uint64 align for ndb_restore
(backport)
 2007-03-01 08:34:59 +07:00
tomas@poseidon.mysql.com
7fae701374 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-01 08:20:43 +07:00
tsmith@quadxeon.mysql.com
380e2de10a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
 2007-03-01 01:59:31 +01:00
tsmith@quadxeon.mysql.com
b99c49421b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/40
 2007-03-01 01:58:31 +01:00
kent@mysql.com/kent-amd64.(none)
47efc7527d Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-02-28 22:33:29 +01:00
kent@mysql.com/kent-amd64.(none)
904972ceee Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-02-28 22:31:58 +01:00