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

18248 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
5499b0c5e1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
 2005-01-04 22:01:23 +01:00
unknown
aae10cd184 changed documented method from get/setDistributionKey to get/setPartitionKey 
+ some extra docs on the area
updated docs by removing som async stuff


ndb/include/ndbapi/NdbTransaction.hpp:
  mostly reformatting but also some more explicit references to objects and methods
 2005-01-04 19:51:59 +01:00
unknown
c15e0f746b Hide internal unique index naming 2005-01-04 16:18:45 +01:00
unknown
584f68e8ad changed example names 
and updated some docs
 2005-01-04 16:15:15 +01:00
unknown
fcdd5e4333 deleted select all example as it is obsolete and replaced by ndbapi_scan_example 
BitKeeper/deleted/.del-select_all.cpp~de02d1231f741270:
  Delete: ndb/examples/select_all/select_all.cpp
BitKeeper/deleted/.del-Makefile~a3c445ed68365196:
  Delete: ndb/examples/select_all/Makefile
 2005-01-04 14:12:45 +01:00
unknown
46a847e700 changed some NdbConnection to NdbTransaction 2005-01-04 13:47:16 +01:00
unknown
c33a0fc5e4 updated all examples to use mysql c-api create table 2005-01-04 13:36:53 +01:00
unknown
d10e6cf0b5 added const declarations 2005-01-04 13:15:03 +01:00
unknown
fbe773128d changes ndb types include 2005-01-04 13:12:22 +01:00
unknown
aa210ae3a1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-04 08:31:40 +01:00
unknown
a0e534c7e5 changed NdbConnection to NdbTransaction 2005-01-04 08:30:48 +01:00
unknown
6926e70385 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
 2005-01-03 23:36:19 +01:00
unknown
3410ce0927 updated example1 to use mysql c-api for table creation 2005-01-03 23:16:59 +01:00
unknown
fcb2a0abd1 Merge 
ndb/include/ndb_types.h:
  SCCS merged
 2005-01-03 23:01:55 +01:00
unknown
114b315474 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-03 22:59:20 +01:00
unknown
3cd62d82fc merge error 2005-01-03 22:58:29 +01:00
unknown
5c93c3e11c merge 5.0->5.0-ndb 
BitKeeper/etc/logging_ok:
  auto-union
ndb/test/tools/Makefile.am:
  Auto merged
 2005-01-03 21:42:43 +01:00
unknown
b89482ab76 Merge bk-internal:/home/bk/mysql-5.0 
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
 2005-01-03 21:29:09 +01:00
unknown
d474247d1f sync0sync.h, sync0rw.h: 
Fix Bug#7624


innobase/include/sync0rw.h:
  Fix Bug#7624
innobase/include/sync0sync.h:
  Fix Bug#7624
 2005-01-03 21:27:17 +01:00
unknown
613201b83d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2005-01-03 22:20:47 +02:00
unknown
386f1f35fa fixed reporting error 2005-01-03 22:16:54 +02:00
unknown
57deb76867 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-03 20:31:47 +01:00
unknown
a14a225832 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndb_global.h.in:
  Auto merged
ndb/include/ndb_types.h:
  Auto merged
 2005-01-03 20:12:07 +01:00
unknown
cca9cd0bd6 updated ndbapi examples 2005-01-03 20:11:21 +01:00
unknown
9ecd9ac6b9 bug#7626 - post review version 
ndb/include/ndb_global.h.in:
  move types into ndb_global.h.in
  Check sizeof of Uint8, Uint32 & Uint64
ndb/include/ndb_types.h:
  move types into ndb_global.h.in
 2005-01-03 20:10:23 +01:00
unknown
2bcaed348d Better handling of ensuring that setup_tables() are not called twice 
This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests


mysql-test/r/mysqldump.result:
  Safety fix if a previous test would fail
mysql-test/r/show_check.result:
  Safety fix if a previous test would fail
mysql-test/r/sp.result:
  Fix for --ps-protocol
mysql-test/r/synchronization.result:
  Safety fix if a previous test would fail
mysql-test/r/system_mysql_db.result:
  Safety fix if a previous test would fail
mysql-test/t/mysqldump.test:
  Safety fix if a previous test would fail
mysql-test/t/select.test:
  Safety fix if a previous test would fail
mysql-test/t/show_check.test:
  Safety fix if a previous test would fail
mysql-test/t/sp.test:
  fix for --ps-protocol
mysql-test/t/strict.test:
  Fix for --ps-protocol
mysql-test/t/synchronization.test:
  Safety fix if a previous test would fail
mysql-test/t/system_mysql_db.test:
  Safety fix if a previous test would fail
sql/item_sum.cc:
  Fix bug in SUM(DISTINCT...) when using with prepared statements
sql/item_sum.h:
  Fix bug in SUM(DISTINCT...) when using with prepared statements
sql/mysql_priv.h:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_base.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_insert.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_parse.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_prepare.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_select.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_union.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_update.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/table.h:
  Better handling of ensuring that setup_tables() are not called twice
 2005-01-03 21:04:33 +02:00
unknown
e23ba8ea59 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndb_types.h:
  Auto merged
 2005-01-03 19:44:29 +01:00
unknown
e197fa459d bug#7626 - ndb UintPtr handling 
ndb/include/ndb_types.h:
  redo UintPtr handling
 2005-01-03 19:39:09 +01:00
unknown
423241da39 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-03 19:09:10 +01:00
unknown
3c1b5f54f0 bug#7626 - ndb - non portable uint_ptr 
ndb/include/ndb_types.h:
  redo UintPtr handling using SIZEOF_CHARP
ndb/test/tools/Makefile.am:
  remove unused defines
 2005-01-03 19:08:27 +01:00
unknown
5f0f39d0c6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-03 17:45:53 +01:00
unknown
f3c625607c updated ndbapi examples 
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)
 2005-01-03 17:44:57 +01:00
unknown
6e8bc54f7e Merge 
BitKeeper/etc/logging_ok:
  auto-union
 2005-01-03 14:33:00 +01:00
unknown
91b435dcb4 Merge for WL#2290 Add support for bit field in ndbcluster handler 2005-01-03 14:29:27 +01:00
unknown
3f005af82b Merge 2005-01-03 13:52:17 +01:00
unknown
cf3e08c566 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-03 13:52:16 +01:00
unknown
ab85635e68 Makefile: 
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
 2005-01-03 13:51:28 +01:00
unknown
79e05c8317 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-03 13:57:17 +02:00
unknown
e055be6658 Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases 
(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()
 2005-01-03 13:56:23 +02:00
unknown
fa7b260a11 ndb Updated example 
ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp:
  Updated example
ndb/include/ndbapi/NdbScanFilter.hpp:
  Fix default value
 2005-01-03 12:07:47 +01:00
unknown
2c6636b56a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-03 12:03:39 +01:00
unknown
703ceb1f04 Fixed failed merge 2005-01-03 11:56:51 +01:00
unknown
52722f1b43 updated ndbapi examples 2005-01-03 11:31:05 +01:00
unknown
865d0329f7 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
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
 2005-01-03 11:11:32 +01:00
unknown
477d1cc73f configure.in: 
updated ndb version number


configure.in:
  updated ndb version number
 2005-01-03 11:03:50 +01:00
unknown
7b04c06eef Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-03 11:01:39 +01:00
unknown
79d9caffe7 Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.h:
  Auto merged
 2005-01-03 09:46:59 +01:00
unknown
a6ba55f2c0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-03 09:36:25 +01:00
unknown
65defab653 merge 2005-01-03 09:24:18 +01:00
unknown
3652c4edd9 Streamlined code for trim, ltrim and rtrim 
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)
 2005-01-02 23:31:37 +02:00