Commit graph

18488 commits

Author SHA1 Message Date
monty@mysql.com
530a104eec Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-03 22:01:11 +02:00
monty@mysql.com
e5cd3c6090 added ndb/include/ndb_global.h ndb/include/ndb_version.h to ignore 2005-01-03 22:00:32 +02:00
ingo@mysql.com
76d0f49495 Fixed a typo. 2005-01-03 20:48:49 +01:00
joreland@mysql.com
a9853184d3 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
monty@mysql.com
d35d4eab91 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-03 21:14:20 +02:00
joreland@mysql.com
875af1330b Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-03 20:12:42 +01:00
joreland@mysql.com
14b66b19e4 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-03 20:12:07 +01:00
tomas@poseidon.ndb.mysql.com
3a5b5b0c29 updated ndbapi examples 2005-01-03 20:11:21 +01:00
joreland@mysql.com
18920d4831 bug#7626 - post review version 2005-01-03 20:10:23 +01:00
monty@mysql.com
2299e1eca4 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
2005-01-03 21:04:33 +02:00
jimw@mysql.com
0e8d3f1ccd Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-03 19:56:20 +01:00
jimw@mysql.com
98d7964d2a Fix 'SHOW CREATE FUNCTION' to say 'FUNCTION' in its error message. (Bug #6338) 2005-01-03 19:53:54 +01:00
joreland@mysql.com
ce57f0156d Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-03 19:44:29 +01:00
joreland@mysql.com
b852147b5d Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-03 19:42:38 +01:00
joreland@mysql.com
7d0d191999 bug#7626 - ndb UintPtr handling 2005-01-03 19:39:09 +01:00
joreland@mysql.com
5278560bc3 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
joreland@mysql.com
bd597f54d5 bug#7626 - ndb - non portable uint_ptr 2005-01-03 19:08:27 +01:00
tomas@poseidon.ndb.mysql.com
2ee205e55a 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
tomas@poseidon.ndb.mysql.com
51863a7f14 updated ndbapi examples
removed references to example2 (asynch api)
2005-01-03 17:44:57 +01:00
kent@mysql.com
c725e09089 mtr_process.pl:
Added missing stop_reap_all() if returns early from function
mysql-test-run.pl:
  Improved output from --script-debug
  Initial Cygwin support
  Improved mysqld process termination
2005-01-03 16:54:08 +01:00
kent@mysql.com
dd19a613bc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-03 16:49:55 +01:00
wax@mysql.com
8a73a86e94 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-03 18:38:37 +05:00
wax@kishkin.ru
dc6a186659 WL#964
added sort of file names for all OS
2005-01-03 18:37:08 +05:00
serg@sergbook.mysql.com
a606a7d16f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-03 15:36:00 +02:00
serg@sergbook.mysql.com
b425811d6e Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-03 15:35:59 +02:00
monty@mysql.com
a981ca050d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-03 15:35:58 +02:00
wax@mysql.com
e2ba3a1118 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-03 18:35:58 +05:00
serg@sergbook.mysql.com
5e18c54646 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-03 15:35:58 +02:00
hf@deer.(none)
75f6c8ad1c Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7545
2005-01-03 17:35:57 +04:00
hf@deer.(none)
27eff9f700 Fix for bug #7545 (Undefined symbols if --without-geometry) 2005-01-03 17:33:04 +04:00
mskold@mysql.com
9647a076a6 Merge 2005-01-03 14:33:00 +01:00
mskold@mysql.com
31360fb01a Merge for WL#2290 Add support for bit field in ndbcluster handler 2005-01-03 14:29:27 +01:00
mskold@mysql.com
ce103eeff7 Merge 2005-01-03 13:52:17 +01:00
tomas@poseidon.ndb.mysql.com
e57c090965 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
tomas@poseidon.ndb.mysql.com
7c6458f69b Makefile:
fixed ndbapi_example     
ndbapi_example1.cpp:
  fixed ndbapi_example
2005-01-03 13:51:28 +01:00
serg@sergbook.mysql.com
e363e55b51 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-03 14:16:32 +02:00
monty@mysql.com
e205136170 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
monty@mysql.com
ce456b6a20 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.
2005-01-03 13:56:23 +02:00
joreland@mysql.com
9011082eb8 ndb Updated example 2005-01-03 12:07:47 +01:00
mskold@mysql.com
6fa7831ade 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
mskold@mysql.com
8edd9baa2c Fixed failed merge 2005-01-03 11:56:51 +01:00
serg@sergbook.mysql.com
e77cc313bd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-03 12:48:48 +02:00
kent@mysql.com
f098575122 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-03 11:41:24 +01:00
tomas@poseidon.ndb.mysql.com
c3f03a3801 updated ndbapi examples 2005-01-03 11:31:05 +01:00
tomas@poseidon.ndb.mysql.com
864b3b2080 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-03 11:11:32 +01:00
tomas@poseidon.ndb.mysql.com
93f9641412 configure.in:
updated ndb version number
2005-01-03 11:03:50 +01:00
tomas@poseidon.ndb.mysql.com
9ed1a96c23 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
mskold@mysql.com
689748b548 Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2005-01-03 09:46:59 +01:00
joreland@mysql.com
d00c61bcd8 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
joreland@mysql.com
bafb41ae12 merge 2005-01-03 09:24:18 +01:00