Commits · d26969764ee0c261acf9eb2862c7ea037ac843f0 · nexedi / MariaDB

14 May, 2004 12 commits

unknown authored May 15, 2004


sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

d2696976

CXX linker specified for client_test with libmysqld · 2edbe2e7
unknown authored May 14, 2004
```
libmysqld/examples/Makefile.am:
  CXXLINK specified for client_test with libmysqld
```
2edbe2e7
Merge marko@build.mysql.com:/home/bk/mysql-4.1 · 5f190f4b
unknown authored May 14, 2004
```
into hundin.mysql.fi:/home/marko/j/mysql-4.1
```
5f190f4b

InnoDB cleanup: eliminate IB__FILE__ · 334e76ab

unknown authored May 14, 2004


innobase/btr/btr0cur.c:
  Replace IB__FILE__ with __FILE__
innobase/btr/btr0sea.c:
  Replace IB__FILE__ with __FILE__
innobase/buf/buf0buf.c:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/ibuf/ibuf0ibuf.c:
  Replace IB__FILE__ with __FILE__
innobase/include/buf0buf.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/buf0buf.ic:
  Replace IB__FILE__ with __FILE__
innobase/include/mem0mem.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/mem0mem.ic:
  Add const qualifiers
innobase/include/mtr0mtr.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/mtr0mtr.ic:
  Add const qualifiers
innobase/include/pars0pars.h:
  Add const qualifiers
innobase/include/sync0arr.h:
  Add const qualifiers
innobase/include/sync0ipm.ic:
  Replace IB__FILE__ with __FILE__
innobase/include/sync0rw.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/sync0rw.ic:
  Add const qualifiers
innobase/include/sync0sync.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/sync0sync.ic:
  Add const qualifiers
innobase/include/univ.i:
  Remove IB__FILE__
innobase/include/ut0dbg.h:
  Replace IB__FILE__ with __FILE__
innobase/lock/lock0lock.c:
  Replace IB__FILE__ with __FILE__
innobase/log/log0recv.c:
  Replace IB__FILE__ with __FILE__
innobase/mem/mem0mem.c:
  Add const qualifiers
innobase/pars/pars0pars.c:
  Add const qualifiers
innobase/sync/sync0arr.c:
  Add const qualifiers
innobase/sync/sync0rw.c:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/sync/sync0sync.c:
  Add const qualifiers
innobase/trx/trx0rec.c:
  Replace IB__FILE__ with __FILE__

334e76ab

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · dbf14cb7

unknown authored May 14, 2004

into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

dbf14cb7

InnoDB: ut0mem: Remove ut_str_catenate(), add const qualifiers · dc10bbda

unknown authored May 14, 2004


innobase/include/ut0mem.h:
  Add const qualifiers and remove unused function ut_str_catenate()
innobase/include/ut0mem.ic:
  Add const qualifiers
innobase/ut/ut0mem.c:
  Remove unused function ut_str_catenate()

dc10bbda

InnoDB: Disable file locking on FreeBSD · 39abf394
unknown authored May 14, 2004
```
innobase/os/os0file.c:
  Disable os_file_lock() on FreeBSD
```
39abf394
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3e7249e0
unknown authored May 14, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
```
3e7249e0
fixed flags of printed query · 85c5b521
unknown authored May 14, 2004

85c5b521
Bug #3403 Wrong encoding in EXPLAIN SELECT output · bddb1bf3
unknown authored May 14, 2004

bddb1bf3
Bug #3403 Wrong encoding in SHOW GRANTS, EPLAIN SELECT output · 4b2aa6b3
unknown authored May 14, 2004
```
This change fixes SHOW GRANTS problem, while EXPLAIN will be fixed
in a separate patch.
```
4b2aa6b3

sql_table.cc: · 4f107f6b

unknown authored May 14, 2004

Fix bug #3749: if there were several indexs that made an automatically generated FOREIGN KEY index redundant, then MySQL miscalculated the number of keys, and the AUTO_INCREMENT flag was forgotten by MySQL from a PRIMARY KEY. There were probably a multitude of other errors caused by this.

sql/sql_table.cc:
Fix bug #3749: if there were several indexs that made an automatically generated FOREIGN KEY index redundant, then MySQL miscalculated the number of keys, and the AUTO_INCREMENT flag was forgotten by MySQL from a PRIMARY KEY. There were probably a multitude of other errors caused by this.

4f107f6b

13 May, 2004 12 commits
- Merge bk-internal:/home/bk/mysql-4.1/ · 10f09b16
  unknown authored May 14, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  10f09b16
- compatibility fix for hp-ux 64bit (hpux compiler) and sun 64-bit (sun forte) · 39b2b685
  unknown authored May 14, 2004
  
  39b2b685
- fixed flags of printed query · d5c60237
  unknown authored May 13, 2004
  
  d5c60237
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 91999e2e
  unknown authored May 13, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
  91999e2e
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · fd04c488
  unknown authored May 13, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
  fd04c488
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6171b5da
  unknown authored May 13, 2004
```
into deer.(none):/home/hf/work/mysql-4.1.ps
```
  6171b5da
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 694b1706
  unknown authored May 13, 2004
```
into mc05.(none):/space2/tomas/mysql-4.1
```
  694b1706
- portability fix for MACOSX bugreport 3735 · 82f4d96f
  unknown authored May 13, 2004
```
ndb/src/ndbapi/Ndberr.cpp:
  Rename: ndb/src/ndbapi/Ndberror.cpp -> ndb/src/ndbapi/Ndberr.cpp
```
  82f4d96f
- portability fixes · 245ea07a
  unknown authored May 13, 2004
  
  245ea07a
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a9589d91
  unknown authored May 13, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb


ndb/src/common/transporter/Makefile:
  Auto merged
```
  a9589d91
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 027b398c
  unknown authored May 13, 2004
```
into deer.(none):/home/hf/work/mysql-4.1.ps
```
  027b398c
- client_test with embedded library will be built so one can check if he broke · 99727bb6
  unknown authored May 13, 2004
```
something in embedded PS


BitKeeper/etc/ignore:
  Added libmysqld/examples/client_test.c to the ignore list
libmysqld/examples/Makefile.am:
  tests/client_test is now symlinked to libmysqld/examples catalog
  then it's built with libmysqld.a
```
  99727bb6
12 May, 2004 16 commits

Only compile SHM if configured to · 8d32f377
unknown authored May 12, 2004

8d32f377
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2322c825
unknown authored May 12, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
2322c825
Merge build.mysql.com:/home/bk/mysql-4.1 · 00c446b5
unknown authored May 12, 2004
```
into build.mysql.com:/users/tulin/mysql-4.1
```
00c446b5
regression.sh: · 90c07da7
unknown authored May 12, 2004
```
  fixed typo


ndb/bin/regression.sh:
  fixed typo
```
90c07da7
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 22007e99
unknown authored May 12, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
```
22007e99
Daemon code to run on all unixes · eefa7d86
unknown authored May 12, 2004

eefa7d86

NdbMutex.h: · a871673a

unknown authored May 12, 2004

  oops forgot this one


ndb/include/portlib/NdbMutex.h:
  oops forgot this one

a871673a

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d230947c
unknown authored May 12, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
d230947c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9d1d2520
unknown authored May 12, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1
```
9d1d2520
Fix broken arg fot getrlimit · c934cdf4
unknown authored May 12, 2004
```
ndb/src/cw/cpcd/Process.cpp:
  Fix broken arg for getrlimit
```
c934cdf4

portability/autoconf fixes · 1441ff9f

unknown authored May 12, 2004


ndb/config/Defs.LINUX.x86.GCC.mk:
  postability/autoconf fixes
ndb/include/portlib/NdbMutex.h:
  postability/autoconf fixes
ndb/src/common/editline/unix.h:
  postability/autoconf fixes
ndb/src/common/portlib/memtest/memtest.c:
  postability/autoconf fixes
ndb/src/common/portlib/unix/NdbTCP.c:
  postability/autoconf fixes
ndb/src/common/portlib/unix/NdbThread.c:
  postability/autoconf fixes
ndb/src/common/transporter/Makefile:
  postability/autoconf fixes
ndb/src/common/transporter/SHM_Transporter.cpp:
  postability/autoconf fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  postability/autoconf fixes

1441ff9f

used item method (Bug #3686) · 488280b0
unknown authored May 12, 2004

488280b0
portability/autoconf fixes · cbff6f45
unknown authored May 12, 2004

cbff6f45
Merge mysql.com:/home/mydev/mysql-4.1 · db34fd65
unknown authored May 12, 2004
```
into mysql.com:/home/mydev/mysql-4.1-wl1687
```
db34fd65

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · ed2fa1b7

unknown authored May 12, 2004

into mc05.(none):/space2/tomas/mysql-4.1


ndb/include/newtonapi/defs/pcn_types.h:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp:
  Auto merged
ndb/src/common/portlib/unix/NdbCondition.c:
  Auto merged
ndb/src/common/portlib/unix/NdbDaemon.c:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged
ndb/src/common/util/getarg.c:
  Auto merged
ndb/src/common/util/strlcat.c:
  Auto merged
ndb/src/common/util/strlcpy.c:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/test/ndbapi/flexBench/flexBench.cpp:
  Auto merged
ndb/test/src/HugoCalculator.cpp:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
ndb/test/src/NdbConfig.cpp:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
ndb/tools/cpcc/cpcc.cpp:
  Auto merged

ed2fa1b7

portability/autoconf fixes and removed warnings · 9d3406c6

unknown authored May 12, 2004


ndb/include/newtonapi/defs/pcn_types.h:
  portability/autoconf fixes
ndb/include/portlib/NdbMutex.h:
  portability/autoconf fixes
ndb/src/common/editline/editline.c:
  portability/autoconf fixes
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  portability/autoconf fixes
ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp:
  portability/autoconf fixes
ndb/src/common/portlib/unix/NdbCondition.c:
  portability/autoconf fixes
ndb/src/common/portlib/unix/NdbDaemon.c:
  portability/autoconf fixes
ndb/src/common/portlib/unix/NdbHost.c:
  portability/autoconf fixes
ndb/src/common/util/File.cpp:
  portability/autoconf fixes
ndb/src/common/util/getarg.c:
  portability/autoconf fixes
ndb/src/common/util/strlcat.c:
  portability/autoconf fixes
ndb/src/common/util/strlcpy.c:
  portability/autoconf fixes
ndb/src/cw/cpcd/Process.cpp:
  portability/autoconf fixes
ndb/src/cw/cpcd/common.cpp:
  portability/autoconf fixes
ndb/src/cw/cpcd/main.cpp:
  portability/autoconf fixes
ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp:
  portability/autoconf fixes
ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp:
  portability/autoconf fixes
ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp:
  portability/autoconf fixes
ndb/src/kernel/error/TimeModule.cpp:
  portability/autoconf fixes
ndb/src/kernel/ndb-main/Main.cpp:
  portability/autoconf fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  portability/autoconf fixes
ndb/src/mgmsrv/main.cpp:
  portability/autoconf fixes
ndb/test/ndbapi/flexBench/flexBench.cpp:
  removed warnings
ndb/test/src/HugoCalculator.cpp:
  removed warnings
ndb/test/src/HugoOperations.cpp:
  removed warnings
ndb/test/src/HugoTransactions.cpp:
  removed warnings
ndb/test/src/NDBT_ResultRow.cpp:
  removed warnings
ndb/test/src/NdbBackup.cpp:
  removed warnings
ndb/test/src/NdbConfig.cpp:
  removed warnings
ndb/test/src/NdbRestarter.cpp:
  removed warnings
ndb/tools/cpcc/cpcc.cpp:
  removed warnings

9d3406c6