magnus@neptunus.(none)
ad3c94c6da
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1
2004-04-15 17:46:50 +02:00
magnus@neptunus.(none)
af263160f2
Fix mysql-test-run to work better with NDB
...
Fix broken string constant in mysqld.cc
2004-04-15 17:30:50 +02:00
tomas@mc05.(none)
8e381405eb
make_binary_distribution.sh:
...
added --with-ndbcluster switch
2004-04-15 15:43:10 +02:00
magnus@neptunus.(none)
855fcf1411
Updated mysql-test-run to work with the started NDB Cluster
...
Added one test case for ndb to mysql-test-run, ndb_basic. It will show that
NDB Cluster is supported.
2004-04-15 12:03:13 +02:00
magnus@neptunus.(none)
88478c28b1
Merge conflicts with EXAMPLE handler
2004-04-15 09:22:29 +02:00
magnus@neptunus.(none)
50ff8ea369
Formatting changes requested by Monty
2004-04-15 09:17:55 +02:00
magnus@neptunus.(none)
7c2c408cb8
Added NDB storage engine
2004-04-15 09:14:14 +02:00
serg@sergbook.mylan
932cea8f4d
make the code to build with libtool 1.4.2
2004-04-15 00:42:30 -04:00
lenz@mysql.com
692e9dd6f0
- Fixed compile error in sql_parse.cc
2004-04-15 04:55:49 +02:00
brian@brian-akers-computer.local
886ef75c95
Resolved changes between example storage engine and NDB storage engine.
2004-04-14 14:36:36 -04:00
brian@brian-akers-computer.local
79c46d0d00
Extra paren removed (since well, they were a typo...).
2004-04-14 14:25:15 -04:00
tomas@mc05.(none)
527cd1a558
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space/tomas/mysql-4.1
2004-04-14 18:40:23 +02:00
brian@brian-akers-computer.local
86952cd9a6
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples
2004-04-14 11:59:51 -04:00
magnus@neptunus.(none)
ec9e88ba1d
Merge neptunus.(none):/home/magnus/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1_2
2004-04-14 17:19:32 +02:00
magnus@neptunus.(none)
9b8a81de00
Check if NDB should be built to to support MySQL Cluster
2004-04-14 17:17:51 +02:00
tomas@mc05.(none)
d48ebf3e58
mysql-test-run.sh:
...
added options for ndbcluster
2004-04-14 17:16:31 +02:00
tomas@mc05.(none)
40de5714b0
logging_ok:
...
Logging to logging@openlogging.org accepted
stop_ndbcluster, ndb_config_2_node.ini, install_ndbcluster:
new file
2004-04-14 15:46:39 +02:00
magnus@neptunus.(none)
7736a18801
Removed unnecessary README files
2004-04-14 15:42:56 +02:00
magnus@neptunus.(none)
371f7ec91b
Adding Makefile for ronja dir
2004-04-14 14:47:34 +02:00
magnus@neptunus.(none)
770fe3fc91
More files to ignore
2004-04-14 13:15:18 +02:00
magnus@neptunus.(none)
75317dafdc
Ignore .depend and .depend.mk
2004-04-14 13:11:30 +02:00
magnus@neptunus.(none)
9494601d95
Added more files for NDB Cluster
2004-04-14 12:13:54 +02:00
magnus@neptunus.(none)
e28b37020b
Add more files for NDB Cluster
2004-04-14 12:11:51 +02:00
magnus@neptunus.(none)
c0db0ce9aa
Fix up of Makefiles for NDB Cluster
2004-04-14 11:55:14 +02:00
magnus@neptunus.(none)
44230d75de
Adding more files for NDB Cluster
2004-04-14 11:11:26 +02:00
magnus@neptunus.(none)
32b20a9f35
Adding more files for NDB Cluster
2004-04-14 11:10:06 +02:00
magnus@neptunus.(none)
5b3aec2b90
Initial revision of NDB Cluster files
2004-04-14 10:53:21 +02:00
sergefp@mysql.com
a2a7eb2e74
Testcase for BUG#3420. The bug itself has been fixed by some previous PS code changes made since 4.1.1a
2004-04-14 01:42:01 +04:00
guilhem@mysql.com
5c7d736443
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-04-13 22:41:00 +02:00
guilhem@mysql.com
066382e6e7
Fix for BUG#3461 "multi-table DELETE replicated despite replicate-wild-ignore-table":
...
In tables_ok(), when there is no table having "updating==TRUE" in the list,
return that we don't replicate this statement (the slave is supposed to
replicate *changes* only).
In practice, the case can only happen for this statement:
DELETE t FROM t,u WHERE ... ;
tables_ok(t,u) will now return 0, which (check all_tables_not_ok())
will give a chance to tables_ok(t) to run.
2004-04-13 22:40:16 +02:00
brian@brian-akers-computer.local
4d5a8cb78c
All changes are to allow someone to compile the example storage engine and use it.
2004-04-12 21:01:45 -07:00
sergefp@mysql.com
5e22d6cbfc
Fix and testcase for BUG#3367.
2004-04-13 00:13:25 +04:00
tim@sand.box
cfc019af6e
Fix typos that resulted in adding names to the global namespace that
...
were never defined. This potentially caused problems when trying to link
libmysqld with shared libraries.
2004-04-12 08:05:15 -06:00
monty@mysql.com
7d9a9fd93a
Added missing return statement
2004-04-12 03:26:32 +03:00
monty@mysql.com
8b72dde888
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-12 01:43:07 +03:00
monty@mysql.com
dc0d2b83c2
Added function comment
2004-04-12 01:42:39 +03:00
bell@sanja.is.com.ua
c9a087b9eb
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
2004-04-10 01:15:18 +03:00
bell@sanja.is.com.ua
a535342d57
after review PS fixes
2004-04-10 01:14:32 +03:00
heikki@hundin.mysql.fi
7d3e633edc
ha_innodb.cc, sync0sync.h, sync0sync.c:
...
Use only noninlined InnoDB functions in ha_innodb.cc
2004-04-09 22:18:18 +03:00
serg@serg.mylan
d1e1bc82f2
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-09 18:51:51 +02:00
serg@serg.mylan
0d402d8d11
make session max_delayed_threads to be settable only to 0 or global value
2004-04-09 18:50:28 +02:00
ram@gw.mysql.r18.ru
a4a703ba8c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3376
2004-04-09 19:08:13 +05:00
ram@gw.mysql.r18.ru
c8937dbcb7
A fix. (Bug #3376 : AVG(constant) returns constant if no rows in result set)
2004-04-09 19:07:39 +05:00
bell@sanja.is.com.ua
e8137a13e0
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
2004-04-09 11:31:06 +03:00
bell@sanja.is.com.ua
0d773f29de
complex join example for test suite
2004-04-09 10:30:07 +03:00
jani@rhols221.adsl.netsonic.fi
96cb3ec0e9
- Merged in changes from mysqld_multi 2.6
...
- Changed reading of config file so that one can use a separate config
file for [mysqld_multi] also. In other words --config-file=file will
read group [mysqld_multi] from this file, earlier it wouldn't have.
2004-04-09 09:59:11 +03:00
monty@mysql.com
f96c4941d8
Fixed problems noticed with last build
2004-04-09 07:12:41 +03:00
bell@sanja.is.com.ua
555eb86616
merge
2004-04-08 23:50:10 +03:00
bell@sanja.is.com.ua
ef5f15c351
fixed subquery in the FROM clause with parameter (BUG#3020)
2004-04-08 23:28:47 +03:00
guilhem@mysql.com
c640a3904a
Fix for BUG#3422 "In 3.23 -> 4.0 replication, slave segfault when replicating LOAD DATA INFILE":
...
as we transform the 3.23 Load_log_event into a 4.0 Create_file_log_event which is one
byte longer, we need to increment event_len. The bug was that we did not increment it,
so later in code the end 0 was not seen so there was for example a segfault in
strlen(fname) because fname was not 0-terminated.
Other problems remain in 3.23->4.0 replication of LOAD DATA INFILE but they are less serious:
Exec_master_log_pos and Relay_log_space are incorrect. I'll document them.
They are not fixable without significant code changes (if you fix those problems in 4.0,
you get assertion failures somewhere else etc), * which are already done in 5.0.0 *.
2004-04-08 22:12:22 +02:00