Commits · 3410ce0927a659d23137ae41580cd4be787697a1 · Kirill Smelkov / mariadb

03 Jan, 2005 21 commits

updated example1 to use mysql c-api for table creation · 3410ce09
unknown authored Jan 03, 2005

3410ce09
updated ndbapi examples · cca9cd0b
unknown authored Jan 03, 2005

cca9cd0b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 5f0f39d0
unknown authored Jan 03, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
5f0f39d0

unknown authored Jan 03, 2005

    removed references to example2 (asynch api)


ndb/examples/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example1/ndbapi_example1.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example2/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example2/ndbapi_example2.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example3/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example3/ndbapi_example3.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example4/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example4/ndbapi_example4.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example5/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example5/ndbapi_example5.cpp:
  updated ndbapi examples
ndb/include/ndbapi/Ndb.hpp:
  removed references to example2 (asynch api)
ndb/include/ndbapi/NdbRecAttr.hpp:
  removed references to example2 (asynch api)

f3c62560

Merge · 6e8bc54f
unknown authored Jan 03, 2005
```
BitKeeper/etc/logging_ok:
  auto-union
```
6e8bc54f
Merge for WL#2290 Add support for bit field in ndbcluster handler · 91b435dc
unknown authored Jan 03, 2005

91b435dc
Merge · 3f005af8
unknown authored Jan 03, 2005

3f005af8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · cf3e08c5
unknown authored Jan 03, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
cf3e08c5

Makefile: · ab85635e

unknown authored Jan 03, 2005

  fixed ndbapi_example     
ndbapi_example1.cpp:
  fixed ndbapi_example


ndb/examples/ndbapi_example1/ndbapi_example1.cpp:
  fixed ndbapi_example
ndb/examples/ndbapi_example1/Makefile:
  fixed ndbapi_example

ab85635e

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 79e05c83
unknown authored Jan 03, 2005
```
into mysql.com:/home/my/mysql-5.0
```
79e05c83

Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases · e055be66

unknown authored Jan 03, 2005

(Old code failed for INSERT ... ON DUPLICATE with prepared statements) 
Instead, always reset table->insert_values on open.


mysql-test/t/trigger.test:
  Fix test for --ps-protocol
sql/sql_base.cc:
  Clear insert_values on open_table
sql/sql_insert.cc:
  Remove clear_insert_values()
sql/sql_parse.cc:
  Remove clear_insert_values()
sql/sql_prepare.cc:
  Remove clear_insert_values()
sql/table.cc:
  Remove clear_insert_values()
sql/table.h:
  Remove clear_insert_values()

e055be66

ndb Updated example · fa7b260a

unknown authored Jan 03, 2005


ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp:
  Updated example
ndb/include/ndbapi/NdbScanFilter.hpp:
  Fix default value

fa7b260a

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2c6636b5
unknown authored Jan 03, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
2c6636b5
Fixed failed merge · 703ceb1f
unknown authored Jan 03, 2005

703ceb1f
updated ndbapi examples · 52722f1b
unknown authored Jan 03, 2005

52722f1b

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 865d0329

unknown authored Jan 03, 2005

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


configure.in:
  Auto merged
ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged

865d0329

configure.in: · 477d1cc7

unknown authored Jan 03, 2005

  updated ndb version number


configure.in:
  updated ndb version number

477d1cc7

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7b04c06e
unknown authored Jan 03, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
7b04c06e
Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser · 79d9caff
unknown authored Jan 03, 2005
```
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.h:
  Auto merged
```
79d9caff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · a6ba55f2
unknown authored Jan 03, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
a6ba55f2
merge · 65defab6
unknown authored Jan 03, 2005

65defab6

02 Jan, 2005 3 commits

Streamlined code for trim, ltrim and rtrim · 3652c4ed

unknown authored Jan 02, 2005

Portability fixes


mysql-test/r/func_str.result:
  Added test for ltrim and rtrim with NULL
mysql-test/t/func_str.test:
  Added test for ltrim and rtrim with NULL
sql/item_strfunc.cc:
  Streamlined code for trim, ltrim and rtrim
tests/client_test.c:
  Fixed wrong usage of %lld (not portable)

3652c4ed

updated EventApi documentation · 54a899e3
unknown authored Jan 02, 2005

54a899e3

Fix the tests: allow result of concat('a', -0.0) be both 'a0.0' and 'a-0.0' · e1455e4d

unknown authored Jan 02, 2005

(this depends on s[n]printf implementation and differs from system to system)


mysql-test/t/func_concat.test:
  Allow result of concat('a', -0.0) be both 'a0.0' and 'a-0.0'

e1455e4d

01 Jan, 2005 9 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4cff6feb

unknown authored Jan 01, 2005

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged

4cff6feb

make_win_src_distribution.sh, make_binary_distribution.sh, mysql-test-run.sh: · 3a4372d3

unknown authored Jan 01, 2005

  Removed references to ISAM and MERGE


mysql-test/mysql-test-run.sh:
  Removed references to ISAM and MERGE
scripts/make_binary_distribution.sh:
  Removed references to ISAM and MERGE
scripts/make_win_src_distribution.sh:
  Removed references to ISAM and MERGE

3a4372d3

Many files: · b0f963f5

unknown authored Jan 01, 2005

  Removed references to ISAM and MERGE


netware/BUILD/compile-linux-tools:
  Removed references to ISAM and MERGE
netware/Makefile.am:
  Removed references to ISAM and MERGE
os2/ChangeLog.os2:
  Removed references to ISAM and MERGE
os2/MySQL-Source.icc:
  Removed references to ISAM and MERGE
os2/MySQL-Sql.icc:
  Removed references to ISAM and MERGE
os2/MySQL-Util.icc:
  Removed references to ISAM and MERGE
support-files/debian/gomi:
  Removed references to ISAM and MERGE

b0f963f5

prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw: · 6c5c48b5

unknown authored Jan 01, 2005

  Removed references to ISAM and MERGE


VC++Files/mysql.dsw:
  Removed referenses to ISAM and MERGE
VC++Files/sql/mysqld.dsp:
  Removed referenses to ISAM and MERGE
VC++Files/sql/mysqldmax.dsp:
  Removed referenses to ISAM and MERGE
VC++Files/winmysqladmin/winmysqladmin.cpp:
  Removed referenses to ISAM and MERGE
VC++Files/prepare:
  Removed referenses to ISAM and MERGE

6c5c48b5

ndb - removed deprecated Ndb constructor · 11a2a356

unknown authored Jan 01, 2005


ndb/include/ndbapi/Ndb.hpp:
  removed deprecated methods
ndb/src/ndbapi/NdbPool.cpp:
  removed deprecated methods
ndb/src/ndbapi/NdbPoolImpl.cpp:
  removed deprecated methods
ndb/src/ndbapi/NdbPoolImpl.hpp:
  removed deprecated methods
ndb/src/ndbapi/Ndbinit.cpp:
  removed deprecated methods
ndb/tools/delete_all.cpp:
  removed deprecated methods
ndb/tools/desc.cpp:
  removed deprecated methods
ndb/tools/drop_index.cpp:
  removed deprecated methods
ndb/tools/drop_tab.cpp:
  removed deprecated methods
ndb/tools/restore/consumer_restore.cpp:
  removed deprecated methods
ndb/tools/restore/consumer_restore.hpp:
  removed deprecated methods
ndb/tools/restore/restore_main.cpp:
  removed deprecated methods
ndb/tools/select_all.cpp:
  removed deprecated methods
ndb/tools/select_count.cpp:
  removed deprecated methods

11a2a356

ndb - post merge fixes · a61ef102
unknown authored Jan 01, 2005
```
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  merge
```
a61ef102

merge · 2a5aa24f

unknown authored Jan 01, 2005


configure.in:
  Auto merged
ndb/include/ndbapi/NdbApi.hpp:
  Auto merged
ndb/include/ndbapi/NdbReceiver.hpp:
  Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
  Auto merged
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/common/transporter/Transporter.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged

2a5aa24f

ndb - more removal of old constructor usage in test prgs · a142cea8

unknown authored Jan 01, 2005


ndb/test/ndbapi/flexAsynch.cpp:
  new constructor
ndb/test/ndbapi/flexHammer.cpp:
  new constructor
ndb/test/ndbapi/flexTT.cpp:
  new constructor
ndb/test/ndbapi/slow_select.cpp:
  new constructor
ndb/test/ndbapi/testDeadlock.cpp:
  new constructor
ndb/test/ndbapi/testLcp.cpp:
  new constructor

a142cea8

Merge mysql.com:/home/jonas/src/mysql-5.0 · 3fef20e2
unknown authored Jan 01, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
3fef20e2

31 Dec, 2004 7 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9c92a255

unknown authored Dec 31, 2004

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/user_limits.result:
  Auto merged
mysql-test/t/user_limits.test:
  Auto merged

9c92a255

post-merge · 31c4511d
unknown authored Dec 31, 2004

31c4511d

manually merged · b99bea67

unknown authored Dec 31, 2004


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/fil0fil.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged

b99bea67

row0upd.c: · 6b393398

unknown authored Dec 31, 2004

Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version

innobase/row/row0upd.c:
Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version

6b393398

Make test results independent on who runs them · 21166957
unknown authored Dec 31, 2004

21166957
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · bd23099b
unknown authored Dec 31, 2004
```
into mysql.com:/home/psergey/mysql-5.0-debug-31dec
```
bd23099b
Remove display of join buffer size, test fails when someone changes the minimum · b5de0a07
unknown authored Dec 31, 2004

b5de0a07