Commits · 3a235fbe54984f61ca7a6c325c9c778c681865dd · nexedi / MariaDB

06 Jul, 2005 5 commits
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3a235fbe
  unknown authored Jul 06, 2005
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
```
  3a235fbe
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 70f19272
  unknown authored Jul 06, 2005
```
into mysql.com:/space/my/mysql-4.1
```
  70f19272
- Fixed handling of failed primary key update in INSERT .. ON DUPLICATE KEY UPDATE .. · 72e3ff30
  unknown authored Jul 06, 2005
  
  72e3ff30
- a fix (bug #11544: Use of missing rint() function on QNX). · c86f168e
  unknown authored Jul 06, 2005
```
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
```
  c86f168e
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 32f539f1
  unknown authored Jul 06, 2005
```
into mysql.com:/space/my/mysql-4.1
```
  32f539f1
05 Jul, 2005 14 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 644d1dbe
unknown authored Jul 06, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
```
644d1dbe

unknown authored Jul 05, 2005


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

e04a61fd

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 993d0ae2
unknown authored Jul 06, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
```
993d0ae2

Makefile.am: · fc8f1426

unknown authored Jul 05, 2005

  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

fc8f1426

Merge mysql.com:/home/jimw/my/mysql-4.1-10986 · 04a3b7cc
unknown authored Jul 05, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
04a3b7cc
Merge mysql.com:/home/jimw/my/mysql-4.1-11440 · 7b4dd108
unknown authored Jul 05, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
```
7b4dd108
Merge mysql.com:/home/jimw/my/mysql-4.1-11330 · 5defaa78
unknown authored Jul 05, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
5defaa78
Merge mysql.com:/space/my/mysql-4.0-build · 119a985b
unknown authored Jul 05, 2005
```
into mysql.com:/space/my/mysql-4.1-build


BitKeeper/etc/config:
  Auto merged
```
119a985b

lowercase_table2.test, lowercase_table2.result: · 8fb47d8e

unknown authored Jul 05, 2005

  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

8fb47d8e

- disabled openlogging to satisfy BK when using a commercial license key · 7a120203
unknown authored Jul 05, 2005

7a120203
Merge mysql.com:/home/bkroot/mysql-4.1 · 5c04c97d
unknown authored Jul 05, 2005
```
into mysql.com:/home/bk/b11401-mysql-4.1
```
5c04c97d

Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes · baf7fe1f

unknown authored Jul 05, 2005

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.

baf7fe1f

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4dd9391b
unknown authored Jul 05, 2005
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
```
4dd9391b
- removed Docs/README.1st (it's obsolete) · a967b759
unknown authored Jul 05, 2005
```
BitKeeper/deleted/.del-README.1st~918382b11c609069:
  Delete: Docs/README.1st
```
a967b759

04 Jul, 2005 8 commits
- Merge mysql.com:/space/my/mysql-4.1 · fa928dbf
  unknown authored Jul 04, 2005
```
into mysql.com:/space/my/mysql-4.1-build
```
  fa928dbf
- - The Max package should Require a matching MySQL-server package. Automatically replace · c070a2b5
  unknown authored Jul 04, 2005
```
  the version string with the base version of the current build
```
  c070a2b5
- Fixed indentation · cc55b8c6
  unknown authored Jul 04, 2005
  
  cc55b8c6
- Merge mysql.com:/space/my/mysql-4.1 · 7c448a5d
  unknown authored Jul 04, 2005
```
into mysql.com:/space/my/mysql-4.1-merge
```
  7c448a5d
- - manual merge · abc20094
  unknown authored Jul 04, 2005
```
sql/sql_udf.cc:
  Auto merged
configure.in:
  - merge: keep local version number
```
  abc20094
- Merge mysql.com:/space/my/mysql-4.0.25-clone · 7368d656
  unknown authored Jul 04, 2005
```
into mysql.com:/space/my/mysql-4.0-build
```
  7368d656
- - bumped up version number in configure.in to 4.0.26 · 0f370aa2
  unknown authored Jul 04, 2005
```
configure.in:
  - bumped up version number to 4.0.26
```
  0f370aa2
- Merge mysql.com:/home/bkroot/mysql-4.1 · 7a7b7a77
  unknown authored Jul 04, 2005
```
into mysql.com:/home/bk/b11678-mysql-4.1
```
  7a7b7a77
03 Jul, 2005 2 commits
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · a559967d
  unknown authored Jul 04, 2005
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug_qc-4.1
```
  a559967d
- merge · aee13470
  unknown authored Jul 04, 2005
  
  aee13470
02 Jul, 2005 4 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a69ba9cd
  unknown authored Jul 02, 2005
```
into mysql.com:/home/my/mysql-4.1
```
  a69ba9cd
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9abd2aeb
  unknown authored Jul 02, 2005
```
into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
```
  9abd2aeb
- Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · fa673e78
  unknown authored Jul 02, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
```
  fa673e78
- configure.in: · 8c4d2838
  unknown authored Jul 02, 2005
```
  Enable build with CXX=gcc and gcc version 4


configure.in:
  Enable build with CXX=gcc and gcc version 4
```
  8c4d2838
01 Jul, 2005 7 commits
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · a4a0c8e9
  unknown authored Jul 02, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
```
  a4a0c8e9
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 3155e1d8
  unknown authored Jul 01, 2005
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-4.1
```
  3155e1d8
- fixed create_distinct_group() to make references via ref_pointer_array · bd710add
  unknown authored Jul 01, 2005
  
  bd710add
- Merge mysql.com:/home/bkroot/mysql-4.1 · 7e331c6b
  unknown authored Jul 01, 2005
```
into mysql.com:/home/bk/b11678-mysql-4.1
```
  7e331c6b
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2 · 98eb2e04
  unknown authored Jul 01, 2005
```
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


client/mysqltest.c:
  Auto merged
```
  98eb2e04
- Win port fixes · dc2a35de
  unknown authored Jul 01, 2005
```
client/mysqltest.c:
  Check for HAVE_SYS_WAIT_H
  Define WEXITSTATUS if not defined
```
  dc2a35de
- BUG#11678: mysqldump --master-data should fail if master binlog disabled · df80725a
  unknown authored Jul 01, 2005
```
client/mysqldump.c:
  Add error message in case master does not have binlogging enabled
```
  df80725a