dlenev@mysql.com
beb2c1d909
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-smfix
2004-12-22 19:00:03 +03:00
dlenev@brandersnatch.localdomain
7b9fd879f6
Fix for bug #7458 "Microseconds are gobbled from the string result of
...
STR_TO_DATE() function if there is another format specifier after %f
in format string". Also small cleanup of STR_TO_DATE() implementation.
(After review version.)
2004-12-22 18:58:25 +03:00
tomas@poseidon.ndb.mysql.com
99622f3fa1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-12-22 16:30:16 +01:00
tomas@poseidon.ndb.mysql.com
09dccee098
changed name of g_eventLogger so it can be used in TransporterRegistry and is the same as in the kernel
2004-12-22 16:29:01 +01:00
bar@mysql.com
78260fc1c8
Bugs#7278: Don't open a table if it contains columns with non-supported charsets
2004-12-22 18:56:57 +04:00
pekka@mysql.com
c104fe598e
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-12-22 15:08:23 +01:00
pekka@mysql.com
542820d3f8
ndb: use Ndb_cluster_connection in test*
2004-12-22 15:08:22 +01:00
joreland@mysql.com
f22b3a75e8
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-22 14:59:27 +01:00
joreland@mysql.com
8aa60fdd01
ndb - Fix bug in backward compatility code (for our test programs)
2004-12-22 14:58:57 +01:00
pekka@mysql.com
60b79f2b7e
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-12-22 13:38:16 +01:00
pekka@mysql.com
f57153fe81
ndb: bug#7340 fix
2004-12-22 13:38:15 +01:00
bar@mysql.com
e53b446a73
Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
...
See mysqldump.test comments for more details
2004-12-22 16:02:27 +04:00
heikki@hundin.mysql.fi
64f36c94d1
ha_innodb.cc:
...
Add a comment that no InnoDB table lock is now acquired in LOCK TABLES if AUTOCOMMIT=1. This helps to avoid deadlocks when porting old MyISAM applications to InnoDB.
2004-12-22 11:11:16 +02:00
heikki@hundin.mysql.fi
73f61e9d15
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-12-22 11:09:09 +02:00
joreland@mysql.com
193310c884
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-22 10:09:08 +01:00
joreland@mysql.com
13916aa8dd
wl1292 - ndb autotest - adapt to changes in Logger
2004-12-22 10:01:31 +01:00
heikki@hundin.mysql.fi
917e8b4da3
ha_innodb.cc:
...
If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily
2004-12-22 11:01:25 +02:00
tomas@poseidon.ndb.mysql.com
e28ad14429
added some debug printouts
2004-12-22 07:50:44 +01:00
tomas@poseidon.ndb.mysql.com
890a97c7cd
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-12-22 07:23:21 +01:00
tomas@poseidon.ndb.mysql.com
78ce178559
added configuration hostnames to SHM config struct
...
use configured hostnames for SHM transporter setup
2004-12-22 07:20:01 +01:00
heikki@hundin.mysql.fi
f1fe6e1784
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-12-21 19:33:43 +02:00
tomas@poseidon.ndb.mysql.com
8f2579c6db
main.cpp:
...
ifdef on version prior to 5.0
2004-12-21 18:33:41 +01:00
heikki@hundin.mysql.fi
b56085a87e
os0file.c:
...
Put back accidentally removed undef and remove a debug def
2004-12-21 18:33:53 +02:00
heikki@hundin.mysql.fi
e25b633367
os0file.c:
...
Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform
2004-12-21 18:21:17 +02:00
tomas@poseidon.ndb.mysql.com
424484830f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-12-21 15:58:18 +01:00
tomas@poseidon.ndb.mysql.com
6c9dcae992
NdbApi.hpp:
...
NdbApi.hpp to include ndb_inti.h and ndb_cluster_connecion.hpp
2004-12-21 15:57:36 +01:00
bar@mysql.com
57ec14d939
Bug#7302: UCS2 data in ENUM field get truncated when new column is added
2004-12-21 17:12:27 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
ecd85b1836
Bug#6481 - storage_engine system variable allows nonsensical value
...
Check that the requested storage engine is enabled.
2004-12-21 11:09:48 +00:00
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