Commit graph

16643 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
af74a32186 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-12-21 11:39:22 +01:00
tomas@poseidon.ndb.mysql.com
490f2fbab1 added ndb_init.h to distribution
added missing copyright text
    moved ndb_init things to separate header file
    removed ndb_global include
    documented cluster connection class
    moved internal constants to NdbImpl.hpp class
    changed wait_until_ready behaviour somewhat
2004-12-21 10:37:12 +01:00
hf@deer.(none)
514e5a2c50 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 12:33:17 +04:00
hf@deer.(none)
72dd42bee6 Tabs removed 2004-12-21 12:31:38 +04:00
ram@gw.mysql.r18.ru
19f3570ba8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7281
2004-12-21 11:43:25 +04:00
ram@gw.mysql.r18.ru
dfbdbfd006 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7281
2004-12-21 10:51:11 +04:00
hf@deer.(none)
98f2a83539 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 10:31:09 +04:00
hf@deer.(none)
e91a4ce0be Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 10:26:01 +04:00
hf@deer.(none)
e5125d3e88 Fix to perform correctly with charsets in embedded server 2004-12-21 10:05:58 +04:00
sergefp@mysql.com
1e102d1aaf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-order-bug
2004-12-21 03:02:38 +03:00
sergefp@mysql.com
0700f27ca1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug6825
2004-12-21 02:32:30 +03:00
mwagner@here.mwagner.org
f3fc9a2dda configure.in:
Increment from 4.0.23 to 4.0.24
2004-12-20 15:12:13 -06:00
tomas@poseidon.ndb.mysql.com
7d5e413f62 automatically configure with shared memory transporter for ndb if functions are available 2004-12-20 16:19:22 +01:00
tomas@poseidon.ndb.mysql.com
7b47be8990 added config parameter Group on connection
moved NdbWaiter, m_ndb_cluster_connection, to impl class
    moved node selection things to cluster connection
    moved all private things to impl class
    added opts for shared memory and node selection
    changed opts handling somewhat; introduced enum for options and common handling of option variables
    added checks for transporter support
    automatic addition of shared mem transporters
    moved wait_until_ready code to cluster connection
    added control of usage of new node selection method
2004-12-20 12:36:14 +01:00
ram@gw.mysql.r18.ru
da562b7e02 A fix (bug #7281: RAND(RAND) crashes server). 2004-12-20 13:47:38 +04:00
konstantin@mysql.com
9f5f59532c Fix assertion failure in client_test when linked with the embedded
library: stmt_update_metadata (used when we update max_length
in mysql_stmt_store_result) needs valid row->length.
2004-12-19 20:28:52 +03:00
paul@frost.snake.net
66f0ff16a3 mysql.cc:
Fix up mysql help messages.
2004-12-18 14:30:00 -06:00
paul@frost.snake.net
adfb20f64a fill_help_tables.sh:
Convert @samp{c} to 'c', not c.
2004-12-18 14:22:20 -06:00
guilhem@mysql.com
031474cf17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-12-18 18:31:49 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
498c2bc46a Fix test results 2004-12-18 15:15:41 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1be319a708 Merge Bug#7391 from 4.0 2004-12-18 15:12:10 +00:00
georg@beethoven.local
ae3028e5a3 Merge 2004-12-18 15:00:50 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
27133a48db Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug7391.4
2004-12-18 11:59:10 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
a524018ab3 Fix test 2004-12-18 11:57:17 +00:00
monty@mysql.com
eb83e8a046 Simplify code during review 2004-12-18 13:45:19 +02:00
matt@booty.(none)
35942c09de my-innodb-heavy-4G.cnf.sh:
I fixed the typos in the transaction-isolation comments.
  I fixed the spelling mistakes in the comment.  It had tripped up a support 
  customer as they couldn't start the server with transaction-isolation=
  read-commited
2004-12-17 22:25:35 -05:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1e07c1a6c1 Remove bogus lines 2004-12-18 02:34:11 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
3047649845 Bug#7391 - Multi-table UPDATE security regression
Add in missing privilege checks. 
  Tests for the privileges.
2004-12-18 02:07:32 +00:00
guilhem@mysql.com
884663662b Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7,
SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump
produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in
mysqldump (compatibility with old servers).
2004-12-17 23:37:43 +01:00
mleich@mysql.com
c5eb9f1e4c Delete files which were accidently created within the last push 2004-12-17 17:03:15 +01:00
mleich@mysql.com
8ac392e8f8 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/matthias/Arbeit/mysql-4.1/src
2004-12-17 13:09:25 +01:00
tomas@poseidon.ndb.mysql.com
9311c8f564 added TRACE to managemnt server
removed TRACE from management client
2004-12-17 12:27:08 +01:00
mleich@mysql.com
aa7cc4526b Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/matthias/Arbeit/mysql-4.1/src
2004-12-17 12:15:25 +01:00
tomas@poseidon.ndb.mysql.com
7a502ebac0 removed more duplicated commands for management server 2004-12-17 12:03:08 +01:00
joreland@mysql.com
5712bc55dc merge 2004-12-17 11:11:04 +01:00
matthias@three.local.lan
006a512f8f Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-17 11:02:44 +01:00
tomas@poseidon.ndb.mysql.com
e69cc6b27f enabled setting version for ndb 2004-12-17 10:55:00 +01:00
tomas@poseidon.ndb.mysql.com
7ffe3ce690 CommandInterpreter.hpp, CommandInterpreter.cpp:
removed methods that are duplicated in management client
2004-12-17 10:40:56 +01:00
joreland@mysql.com
cfa20fbaa6 merge 2004-12-17 10:36:14 +01:00
joreland@mysql.com
1f55f7784d bug#7379 & bug#7346 - ndb_restore 2004-12-17 10:27:58 +01:00
tomas@poseidon.ndb.mysql.com
911df28cd8 version.c:
4.1.9 compatible with 4.1.8
2004-12-17 10:24:57 +01:00
sergefp@mysql.com
da332aca40 Fix for BUG#6825: When calculating Item_func_neg::max_length, add 1 for '-'.
For numeric constants we only need to add, since the parser doesn't produce 
negative numbers. 
For strings we only add (we actually could substract 1 if given string is a constant 
and it has '-number' form but we're not doing that because 
 * we set max_length bigger then necessary in other cases as well.  
 * the current solution is simpler and safer (bigger max_length is better then cutting out)
2004-12-17 12:14:45 +03:00
tomas@poseidon.ndb.mysql.com
2d6abb1f86 moved some Ndb member variables to NdbImpl class
removed theCurrentConnectCounter
optimized the_release_ind by using pos[0] to indicate that there is something there
smaller storage of theDBNodes array by using Uint8
set the_relase_ind array to Uint32 to avoid possible parallell thread usage errors
2004-12-17 09:55:23 +01:00
joreland@mysql.com
533b5dcc78 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-17 06:57:43 +01:00
joreland@mysql.com
9395fa2942 Bumb up ndb version 2004-12-17 06:55:21 +01:00
guilhem@mysql.com
f057721954 A .test for BUG#6287 "Slave skips auto_increment values in Replication with InnoDB"
which Heikki fixed in 4.1.8 and 4.0.23. I verified that without Heikki's patch the test fails (7 gets inserted).
Test added to 4.1 because in testsuite of 4.0 it's impossible to start slave with InnoDB.
2004-12-16 23:14:41 +01:00
guilhem@mysql.com
3287e82f09 Very minor fixes for Seconds_Behind_Master column of SHOW SLAVE STATUS. 2004-12-16 22:38:42 +01:00
joreland@mysql.com
2c0b980a85 merge 2004-12-16 22:19:59 +01:00
joreland@mysql.com
dc3d133057 merge 2004-12-16 21:55:50 +01:00
matthias@three.local.lan
5c4d2286d4 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-16 20:35:16 +01:00