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

19046 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
2a04d15596 - backported a change for make_binary_distribution.sh from 5.0 for easier building of 
all versions: added an option "--machine" that allows to override the autodetected
  architecture string (e.g. "i386") that becomes part of the binary package name with 
  a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
  script


scripts/make_binary_distribution.sh:
  - backported and fixed a change from 5.0 for easier building of all versions: added an
    option "--machine" that allows to override the autodetected architecture string 
    (e.g. "i386") that becomes part of the binary package name with a different one
  - moved the removal of the BASE directory to the end of the script
 2005-07-06 13:58:29 +02:00
unknown
13331c740b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
 2005-07-06 13:23:21 +03:00
unknown
e0df26b1fe Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-07-06 11:50:05 +02:00
unknown
2aaca01c46 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-07-06 11:29:22 +02:00
unknown
6ef62738fe Fixed handling of failed primary key update in INSERT .. ON DUPLICATE KEY UPDATE .. 2005-07-06 11:23:36 +02:00
unknown
502aa66c5c a fix (bug #11544: Use of missing rint() function on QNX). 
include/my_global.h:
  a fix (bug #11544: Use of missing rint() function on QNX).
  We have to explicitly specify std:: namespace to use 
  rint() and isnan() functions in C++ scope on QNX due 
  to an error in the /usr/include/math.h
 2005-07-06 13:51:53 +05:00
unknown
8165560074 Merge 
mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  SCCS merged
 2005-07-06 11:36:27 +03:00
unknown
9d706f8dc9 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-07-06 08:42:45 +02:00
unknown
7dbf02354a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-07-06 00:19:26 +02:00
unknown
8218398c6a Fix test cases 
mysql-test/r/query_cache.result:
  Remove stray empty line
mysql-test/r/grant.result:
  Update results
mysql-test/t/grant.test:
  Fix test case to
 2005-07-05 15:19:04 -07:00
unknown
97b4cf0edb Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-07-06 00:15:55 +02:00
unknown
b0a6a8e137 Makefile.am: 
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir


client/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
cmd-line-utils/libedit/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
dbug/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
extra/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
heap/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
isam/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysql/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysql_r/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysqld/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysqld/examples/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
merge/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
myisam/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
myisammrg/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
mysql-test/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
mysys/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
netware/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
regex/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
sql/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
strings/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
tests/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
vio/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
tools/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
 2005-07-05 23:24:48 +02:00
unknown
a27b5b31fc Merge mysql.com:/home/jimw/my/mysql-4.1-10986 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-05 12:56:47 -07:00
unknown
128712c04a Merge mysql.com:/home/jimw/my/mysql-4.1-11440 
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
 2005-07-05 12:54:12 -07:00
unknown
83d9aa1441 Merge mysql.com:/home/jimw/my/mysql-4.1-11330 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-05 12:51:16 -07:00
unknown
a74abb5bec Merge mysql.com:/space/my/mysql-4.0-build 
into mysql.com:/space/my/mysql-4.1-build


BitKeeper/etc/config:
  Auto merged
 2005-07-05 19:53:35 +02:00
unknown
d211910984 lowercase_table2.test, lowercase_table2.result: 
Use IF EXISTS in initiation section


mysql-test/r/lowercase_table2.result:
  Use IF EXISTS in initiation section
mysql-test/t/lowercase_table2.test:
  Use IF EXISTS in initiation section
 2005-07-05 17:27:37 +02:00
unknown
74c0d194be - disabled openlogging to satisfy BK when using a commercial license key 2005-07-05 17:09:56 +02:00
unknown
5842bccf6d Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b11401-mysql-4.1
 2005-07-05 14:08:22 +02:00
unknown
28f554af12 Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes 
this as a LOAD DATA ... REPLACE INTO .. statement.


sql/log_event.cc:
  Setting thd->lex so that engines (i.e., InnoDB) recognizes this 
  as a LOAD DATA ... REPLACE INTO .. statement.
 2005-07-05 13:55:54 +02:00
unknown
cd42770548 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-07-05 12:24:03 +02:00
unknown
73bbed107c - removed Docs/README.1st (it's obsolete) 
BitKeeper/deleted/.del-README.1st~918382b11c609069:
  Delete: Docs/README.1st
 2005-07-05 09:15:37 +02:00
unknown
0362dcf543 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-07-04 22:20:11 +02:00
unknown
175f12fdc0 - The Max package should Require a matching MySQL-server package. Automatically replace 
the version string with the base version of the current build
 2005-07-04 22:11:38 +02:00
unknown
e9ac18c204 Fixed indentation 2005-07-04 20:36:38 +02:00
unknown
8d6bf38e64 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-merge
 2005-07-04 17:45:56 +02:00
unknown
fd67efb6c2 - manual merge 
sql/sql_udf.cc:
  Auto merged
configure.in:
  - merge: keep local version number
 2005-07-04 16:05:20 +02:00
unknown
df846c4ae5 Merge mysql.com:/space/my/mysql-4.0.25-clone 
into mysql.com:/space/my/mysql-4.0-build
 2005-07-04 12:59:20 +02:00
unknown
ece95b3d4b - bumped up version number in configure.in to 4.0.26 
configure.in:
  - bumped up version number to 4.0.26
 2005-07-04 12:58:53 +02:00
unknown
c588e9f1ce Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b11678-mysql-4.1
 2005-07-04 11:09:15 +02:00
unknown
6913d8058e ndb - 
fix bug in MemoryChannel


ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Don't signal when reporting to NDBFS
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  1) add new method which don't signal
  2) remove wait(0) from tryReadChannel
 2005-07-04 10:18:36 +02:00
unknown
fbdfcae6a9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug_qc-4.1
 2005-07-04 01:36:55 +03:00
unknown
b17793f5b5 merge 2005-07-04 01:36:06 +03:00
unknown
c7ab92c28a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-07-02 20:18:43 +03:00
unknown
2e16838c42 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
 2005-07-02 16:13:35 +03:00
unknown
e9cb2fb35b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
 2005-07-02 02:07:26 +02:00
unknown
2fec2ba4c9 configure.in: 
Enable build with CXX=gcc and gcc version 4


configure.in:
  Enable build with CXX=gcc and gcc version 4
 2005-07-02 02:00:56 +02:00
unknown
18266bedb4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-07-02 01:49:22 +02:00
unknown
f831ab6561 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-4.1
 2005-07-01 20:14:55 +03:00
unknown
534ab53c17 fixed create_distinct_group() to make references via ref_pointer_array 2005-07-01 20:13:07 +03:00
unknown
b539202e65 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-07-01 07:47:39 -07:00
unknown
607030266f olap.result, olap.test: 
Added a test case for bug #11543.
sql_select.cc:
  Fixed bug #11543.
  A ROLLUP query could return a wrong result set when
  its GROUP BY clause contained references to the same
  column.


sql/sql_select.cc:
  Fixed bug #11543.
  A ROLLUP query could return a wrong result set when
  its GROUP BY clause contained references to the same
  column.
mysql-test/t/olap.test:
  Added a test case for bug #11543.
mysql-test/r/olap.result:
  Added a test case for bug #11543.
 2005-07-01 07:40:22 -07:00
unknown
799ea10e24 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b11678-mysql-4.1
 2005-07-01 16:13:05 +02:00
unknown
012f6be809 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


client/mysqltest.c:
  Auto merged
 2005-07-01 15:40:29 +02:00
unknown
d305f6d3ce Win port fixes 
client/mysqltest.c:
  Check for HAVE_SYS_WAIT_H
  Define WEXITSTATUS if not defined
 2005-07-01 15:39:36 +02:00
unknown
f20c899892 BUG#11678: mysqldump --master-data should fail if master binlog disabled 
client/mysqldump.c:
  Add error message in case master does not have binlogging enabled
 2005-07-01 12:01:00 +02:00
unknown
5285b53042 bug#11133 - ndb write handling 
fix handling of write's in lock queue
  add test case
  add support for pkWrite+async exec in HugoOperations


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Handle operation type wrt ZWRITE when restarting operations
ndb/test/include/HugoOperations.hpp:
  Add support for 
  1) pkWriteRecord 
  2) async execute
ndb/test/ndbapi/testNdbApi.cpp:
  Extend test case for bug#11133 with multi transaction tests aswell...
ndb/test/src/HugoOperations.cpp:
  Add support for 
  1) pkWriteRecord 
  2) async execute
 2005-07-01 09:57:48 +02:00
unknown
b7e409a583 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-07-01 10:07:01 +03:00
unknown
df7852f20d Optimization during review 
Add extra check to delete [] to ensure we are not deleting not allocated data


sql/sql_select.cc:
  Optimization
  Add extra check to delete [] to ensure we are not deleting not allocated data
 2005-07-01 09:40:05 +03:00
unknown
9d5a45c2f3 - backport of a compile fix from 4.1 (ChangeSet@1.2260.23.2 2005/05/19 from reggie) 
"changed dl_name to udf->dl in mysql_create_function"
 2005-06-30 17:33:23 +02:00