tomas@poseidon.ndb.mysql.com
97c8234b46
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2004-11-26 13:44:49 +00:00
tomas@poseidon.ndb.mysql.com
19dab11881
added error code message for 897
2004-11-26 13:20:48 +00:00
bell@sanja.is.com.ua
f92dac8d2e
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-11-26 13:03:46 +02:00
bell@sanja.is.com.ua
5f64e02228
fixed redifinition of variable
2004-11-26 12:28:12 +02:00
ingo@mysql.com
b0cace4ed3
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
2004-11-26 11:19:40 +01:00
ingo@mysql.com
35beae1690
Changed test to remove node name from output.
...
(was from WL#2050 - CREATE USER and DROP USER and RENAME USER)
2004-11-26 11:18:20 +01:00
ram@gw.mysql.r18.ru
47abf905a5
Portability fix: we had problems with -1.1E-38, -2.2E-308 values
...
on 64-bit platforms (due to compiler's optimization).
-1.1E-38 replaced with -1.1E-37
-2.2E-308 replaced with -2.2E-307
2004-11-26 14:02:39 +04:00
tomas@poseidon.ndb.mysql.com
facaf4f7a0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-26 09:46:13 +00:00
tomas@poseidon.ndb.mysql.com
8c3144c133
cleaned up code a bit
...
added command CONNECT in management client
added some verbose printouts
removed prompt printout on !isatty(0)
2004-11-26 09:44:57 +00:00
heikki@hundin.mysql.fi
14b60dfce4
ha_innodb.cc:
...
Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error
2004-11-26 00:26:35 +02:00
heikki@hundin.mysql.fi
ccec75f9af
Many files:
...
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
2004-11-26 00:12:50 +02:00
ingo@mysql.com
c5cb1affa2
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
2004-11-25 22:48:59 +01:00
tomas@poseidon.ndb.mysql.com
a3d2aaf99f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-25 21:32:04 +00:00
tomas@poseidon.ndb.mysql.com
106f124eec
moved default setting to config.ini to MgmtSrvr
...
only try to connect to other ndb_mgmd if connect_string explicitly given or config_file not given
2004-11-25 21:29:59 +00:00
petr@mysql.com
a5938c30e9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-11-26 00:00:35 +03:00
ingo@mysql.com
0eca0e0a68
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
2004-11-25 21:58:28 +01:00
petr@mysql.com
0faef6d0d1
Fix for the unixware: non-posix sigwait
2004-11-25 23:57:58 +03:00
ingo@mysql.com
cb53411b47
WL#2050 - CREATE USER and DROP USER and RENAME USER
...
Added new commands CREATE USER and RENAME USER.
Changed behaviour of DROP USER.
Changed an error messages for the new commands.
2004-11-25 21:55:49 +01:00
pem@mysql.com
77bbadbf81
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2004-11-25 16:14:30 +01:00
pem@mysql.comhem.se
a1e0e96e2d
Fixed BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY
...
...and for PURGE BEFORE too. (Don't fix_fields in the parser!)
2004-11-25 16:13:06 +01:00
tomas@poseidon.ndb.mysql.com
538a3f7a53
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2004-11-25 13:33:31 +00:00
mats@mysql.com
4ac392fa45
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/bkroot/mysql-4.1
2004-11-25 13:35:53 +01:00
ram@gw.mysql.r18.ru
886d54bb37
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
2004-11-25 16:18:48 +04:00
bar@mysql.com
3d6e811ed5
table.cc:
...
Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
2004-11-25 16:18:47 +04:00
ram@gw.mysql.r18.ru
511eb626bf
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
2004-11-25 16:18:46 +04:00
serg@serg.mylan
895376998f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-25 13:18:46 +01:00
tomas@poseidon.ndb.mysql.com
870c718b03
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-25 12:18:45 +00:00
tomas@poseidon.ndb.mysql.com
5a09289bd1
ndb/src/common/logger/LogHandler.cpp
...
changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp
some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp
rewrote parsing on parseNameValuePair, was buggy
2004-11-25 12:14:15 +00:00
mats@mysql.com
9ffb3fd39c
Merge
2004-11-25 12:23:41 +01:00
joreland@mysql.com
5d70a4895f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-25 10:40:56 +01:00
joreland@mysql.com
64bc875228
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-25 10:39:34 +01:00
joreland@mysql.com
a9e5e7de88
bug#6775 - ndb - fix bug introduced by bug fix
2004-11-25 10:38:46 +01:00
mats@mysql.com
fe0911e95e
Merge mysql.com:/space/bkroot/mysql-4.0
...
into mysql.com:/space/bk/b6148-mysql-4.0
2004-11-25 09:38:52 +01:00
mats@mysql.com
c06cae0f55
Fix for Bug#6148. Only rewind read position in binary log when the
...
slave SQL thread is started.
2004-11-25 09:26:45 +01:00
bell@sanja.is.com.ua
d472a62475
do not leave sql command uninitialized, because it used for detection need of preparation correct idends printing during finding identifiers i
2004-11-25 10:23:47 +02:00
bell@sanja.is.com.ua
a1cac9687e
spelling fixed/comments added (postreview fixes)
2004-11-25 09:28:32 +02:00
bell@sanja.is.com.ua
69ec6a4592
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0
2004-11-25 02:27:02 +02:00
bell@sanja.is.com.ua
1e3d8b0839
post-merge fix
2004-11-25 02:23:13 +02:00
guilhem@mysql.com
2e6d576053
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-11-25 01:09:04 +01:00
guilhem@mysql.com
d913f4e4ab
sql_select.cc:
...
my_message_sql does not tolerate a NullS argument (segfault)
2004-11-25 01:06:37 +01:00
serg@serg.mylan
e80bd82e83
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 23:47:14 +01:00
serg@serg.mylan
e8203e437a
bug#6784
...
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
2004-11-24 23:16:16 +01:00
heikki@hundin.mysql.fi
213e61d339
lowercase_table3.result:
...
Correct InnoDB's result output in test; the pseudo-file-extension for InnoDB tables '.InnoDB' was replaced by a more realistic '.ibd' extension
2004-11-25 00:04:03 +02:00
brian@avenger.(none)
71f31d1c94
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into avenger.(none):/export/brian/mysql/merge/5.0
2004-11-24 13:34:35 -08:00
brian@avenger.(none)
2b0b6ec20c
Merging 4.1 to 5.0
2004-11-24 12:34:44 -08:00
bell@sanja.is.com.ua
bce05e9aab
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-11-24 21:25:36 +02:00
ram@gw.mysql.r18.ru
bc231c3d27
A fix. Why didn't we use UINT_MAX32?
2004-11-24 22:18:28 +04:00
bell@sanja.is.com.ua
3fa511ff54
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-11-24 20:01:34 +02:00
bell@sanja.is.com.ua
6d5d5ff941
fixed problem in MacOS
...
correct printing of aliases
2004-11-24 19:48:30 +02:00
heikki@hundin.mysql.fi
bd6ccd46fc
configure.in:
...
Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
2004-11-24 19:41:38 +02:00