Commits · aebab97dd0f254652d5ebcb7c1e4817c7109d18c · Kirill Smelkov / mariadb

14 May, 2004 12 commits

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

unknown authored May 14, 2004

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


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged

aebab97d

after merge fix · 8c0e5ebf
unknown authored May 14, 2004

8c0e5ebf

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

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

98fbcd9f

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

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()

725d1b44

InnoDB: Disable file locking on FreeBSD · 2536d718
unknown authored May 14, 2004
```
innobase/os/os0file.c:
  Disable os_file_lock() on FreeBSD
```
2536d718

Merge · a6b3433b

unknown authored May 14, 2004


mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  SCCS merged

a6b3433b

UNCACHEABLE_EXPLAIN is enough · 213392db
unknown authored May 14, 2004

213392db
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1d51406e
unknown authored May 14, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
```
1d51406e
fixed flags of printed query · c50d5e94
unknown authored May 14, 2004

c50d5e94
Bug #3403 Wrong encoding in EXPLAIN SELECT output · 375825aa
unknown authored May 14, 2004

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

sql_table.cc: · 6f0946d6

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.

6f0946d6

13 May, 2004 12 commits
- Merge bk-internal:/home/bk/mysql-4.1/ · 65755a9c
  unknown authored May 14, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  65755a9c
- compatibility fix for hp-ux 64bit (hpux compiler) and sun 64-bit (sun forte) · a3aacd79
  unknown authored May 14, 2004
  
  a3aacd79
- fixed flags of printed query · fd51cf47
  unknown authored May 13, 2004
  
  fd51cf47
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · d8522613
  unknown authored May 13, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
  d8522613
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 218a0220
  unknown authored May 13, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
  218a0220
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · ae95f382
  unknown authored May 13, 2004
```
into deer.(none):/home/hf/work/mysql-4.1.ps
```
  ae95f382
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · df41e3d5
  unknown authored May 13, 2004
```
into mc05.(none):/space2/tomas/mysql-4.1
```
  df41e3d5
- portability fix for MACOSX bugreport 3735 · 97ae6904
  unknown authored May 13, 2004
```
ndb/src/ndbapi/Ndberr.cpp:
  Rename: ndb/src/ndbapi/Ndberror.cpp -> ndb/src/ndbapi/Ndberr.cpp
```
  97ae6904
- portability fixes · b58eb134
  unknown authored May 13, 2004
  
  b58eb134
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b94ab162
  unknown authored May 13, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb


ndb/src/common/transporter/Makefile:
  Auto merged
```
  b94ab162
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5e992944
  unknown authored May 13, 2004
```
into deer.(none):/home/hf/work/mysql-4.1.ps
```
  5e992944
- client_test with embedded library will be built so one can check if he broke · 018b103b
  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
```
  018b103b
12 May, 2004 16 commits

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

ae94c9a1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 844f7629
unknown authored May 12, 2004
```
into mc05.(none):/space/tomas/mysql-4.1-ndb
```
844f7629
Merge build.mysql.com:/home/bk/mysql-4.1 · b36bf32d
unknown authored May 12, 2004
```
into build.mysql.com:/users/tulin/mysql-4.1
```
b36bf32d
regression.sh: · 05fd891c
unknown authored May 12, 2004
```
  fixed typo


ndb/bin/regression.sh:
  fixed typo
```
05fd891c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · eb261517
unknown authored May 12, 2004
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
```
eb261517
Daemon code to run on all unixes · 79f269cb
unknown authored May 12, 2004

79f269cb

NdbMutex.h: · 3f46ae17

unknown authored May 12, 2004

  oops forgot this one


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

3f46ae17

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

portability/autoconf fixes · 2e9dee04

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

2e9dee04

used item method (Bug #3686) · 01925fa5
unknown authored May 12, 2004

01925fa5
portability/autoconf fixes · 69424ca9
unknown authored May 12, 2004

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

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

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

5a6ab9bd

portability/autoconf fixes and removed warnings · efe5a75d

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

efe5a75d