Commit graph

18218 commits

Author SHA1 Message Date
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
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
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
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
monty@mysql.com
1e88bdbf90 Streamlined code for trim, ltrim and rtrim
Portability fixes
2005-01-02 23:31:37 +02:00
tomas@poseidon.ndb.mysql.com
7840e5d9c6 updated EventApi documentation 2005-01-02 13:21:17 +01:00
sergefp@mysql.com
9bb8f6d031 Fix the tests: allow result of concat('a', -0.0) be both 'a0.0' and 'a-0.0'
(this depends on s[n]printf implementation and differs from system to system)
2005-01-02 14:15:51 +03:00
tomas@poseidon.ndb.mysql.com
a4843c63e3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-01 22:51:24 +01:00
kent@mysql.com
bb806c1e98 make_win_src_distribution.sh, make_binary_distribution.sh, mysql-test-run.sh:
Removed references to ISAM and MERGE
2005-01-01 21:13:09 +01:00
kent@mysql.com
4c914f1c15 Many files:
Removed references to ISAM and MERGE
2005-01-01 20:54:45 +01:00
kent@mysql.com
fb820c4b9c prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw:
Removed references to ISAM and MERGE
2005-01-01 20:27:51 +01:00
joreland@mysql.com
9dac644fc9 ndb - removed deprecated Ndb constructor 2005-01-01 19:25:31 +01:00
joreland@mysql.com
228a63d337 ndb - post merge fixes 2005-01-01 17:57:50 +01:00
joreland@mysql.com
fe8f4ab012 merge 2005-01-01 14:01:37 +01:00
joreland@mysql.com
0de1b0f213 ndb - more removal of old constructor usage in test prgs 2005-01-01 09:28:24 +01:00
joreland@mysql.com
a7c2a9e0b8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-01 09:13:17 +01:00
serg@sergbook.mysql.com
a5ccba28ea Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2004-12-31 18:01:00 +01:00
serg@sergbook.mysql.com
a9c7fb9dfd post-merge 2004-12-31 17:59:43 +01:00
serg@sergbook.mysql.com
a04fc26c54 manually merged 2004-12-31 15:26:24 +01:00
heikki@hundin.mysql.fi
e97584fbb4 row0upd.c:
Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version
2004-12-31 15:14:17 +02:00
sergefp@mysql.com
98ccc21011 Make test results independent on who runs them 2004-12-31 15:48:19 +03:00
sergefp@mysql.com
849d1203ff Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-debug-31dec
2004-12-31 15:13:48 +03:00
sergefp@mysql.com
b572374c0b Remove display of join buffer size, test fails when someone changes the minimum 2004-12-31 15:11:07 +03:00
sergefp@mysql.com
91ab26eaf1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
2004-12-31 14:55:34 +03:00
sergefp@mysql.com
034c59ed59 Fix test results to account for difference between release BDB, debug BDB and MyISAM. 2004-12-31 14:48:11 +03:00
dlenev@brandersnatch.localdomain
4e17aab243 Yet another after merge fix.
Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).
2004-12-31 14:02:40 +03:00
serg@sergbook.mysql.com
45ce994e5d post-merge 2004-12-31 11:52:14 +01:00
joreland@mysql.com
3c52b247ac Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 11:39:43 +01:00
dlenev@mysql.com
2f8dcec05a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-1339
2004-12-31 13:33:00 +03:00
sergefp@mysql.com
a09df7488d Merge mysql.com:/dbdata/psergey/mysql-5.0-bug7264
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
2004-12-31 13:15:54 +03:00
monty@mysql.com
08416134c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-12-31 12:01:55 +02:00
monty@mysql.com
e4ffff2918 Fix max_key_length and max_unique_length to take into account varchar and null extra lengths
This fixes a bug found by bdb.test
Fixes a portability issue with bdb tables
2004-12-31 11:56:50 +02:00
dlenev@mysql.com
536cb92195 Manual merge. 2004-12-31 12:48:27 +03:00
mronstrom@mysql.com
2745a69418 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/mikron/mysql-5.0
2004-12-31 10:39:24 +01:00
joreland@mysql.com
4a26906bd6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 10:22:05 +01:00