Commit graph

13921 commits

Author SHA1 Message Date
joreland@mysql.com
b9dbef8e23 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-19 10:37:47 +02:00
bar@mysql.com
4f8144833f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-19 13:37:46 +05:00
tomas@poseidon.(none)
a0f8452e2f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-19 08:37:45 +00:00
tomas@poseidon.(none)
f9337ba947 Some platfom compile/build fixes for ndb 2004-08-19 08:24:27 +00:00
bar@mysql.com
7f92905954 Bug#5081: UCS2 fields are filled with '0x2020' after extending field length 2004-08-19 11:59:33 +05:00
joreland@mysql.com
afc10d5182 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-19 08:05:30 +02:00
joreland@mysql.com
3023d0ddc1 Set correct error code 2004-08-19 08:03:54 +02:00
bar@mysql.com
3f75d2bd3e field.cc:
Serg's typo fix :)
2004-08-19 10:28:40 +05:00
serg@serg.mylan
3bac9dd7db Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-19 03:03:02 +02:00
serg@serg.mylan
3f2210c064 after merge fixes 2004-08-19 03:02:09 +02:00
guilhem@mysql.com
c31d49d540 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-19 01:05:40 +02:00
guilhem@mysql.com
f5228a60e6 Very small API change: changing the values in enum enum_shutdown_level;
as this enum is not really usable yet (as MySQL server supports only one
shutdown level), and as SHUTDOWN_DEFAULT is still left to 0, this change
should disturb no user. Later (in 4.1.4 or 4.1.5) code will be pushed to
implement graceful shutdown using this enum.
2004-08-19 01:03:43 +02:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
tomas@poseidon.(none)
7c69afaf15 Added some explicit templates 2004-08-18 14:26:39 +00:00
serg@serg.mylan
8ce92878a2 Bug 4937: different date -> string conversion when using
SELECT ... UNION and INSERT ... SELECT ... UNION
2004-08-18 14:46:31 +02:00
tomas@poseidon.(none)
8706d60b53 Added some explicit templates 2004-08-18 12:15:02 +00:00
tomas@poseidon.(none)
4fe6ab1fc6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-18 10:11:30 +00:00
tomas@poseidon.(none)
5a9533bbf3 bug#5076 bug#5077 2004-08-18 10:10:50 +00:00
serg@serg.mylan
a17f968954 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-18 09:25:27 +02:00
bar@mysql.com
e0731bad9e func_like.result:
LIKE crashed mysqld for binary collations in some cases
2004-08-18 12:11:26 +05:00
bar@mysql.com
1cd108ff97 Many files:
LIKE crashed mysqld for binary collations in some cases
2004-08-18 12:07:54 +05:00
joreland@mysql.com
d7ecb3ff47 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-18 01:07:56 +02:00
heikki@hundin.mysql.fi
6feb6ea545 srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:
Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
mysqld.cc, ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
2004-08-18 01:48:01 +03:00
sergefp@mysql.com
83dc887b9d Renamed Arg_comparator::compare_int -> compare_int_signed 2004-08-18 02:37:31 +04:00
joreland@mysql.com
029ce2f08f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-18 00:27:09 +02:00
joreland@mysql.com
26a30a7331 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-18 00:24:11 +02:00
joreland@mysql.com
51b696ebbc Make sure registers is 64-bit aligned 2004-08-18 00:19:47 +02:00
sergefp@mysql.com
f60b356f5f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-root
2004-08-18 02:16:43 +04:00
joreland@mysql.com
94189cb43b Don gather results for unallocated api's 2004-08-18 00:06:18 +02:00
serg@serg.mylan
ccc97ac12c use my_vsnprintf() just in case
bug#4925
2004-08-18 00:04:43 +02:00
joreland@mysql.com
1e2f7cfccf Use native format in interpreter -
(old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])

This fixes problem with auto increment on different byte order

(This also make adding of signed ints really simple...)
2004-08-17 22:59:38 +02:00
guilhem@mysql.com
05d75947b2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-17 17:34:58 +02:00
guilhem@mysql.com
32f905f73c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-17 17:34:53 +02:00
guilhem@mysql.com
7e89f474ab Fix for BUG#5038 "Cannot disable LOAD DATA LOCAL INFILE from client"
(specific to 4.1): don't put CLIENT_LOCAL_FILES in
CLIENT_CAPABILITIES; it would make mysql_options(CLIENT_LOCAL_FILES,0)
have no effect.
2004-08-17 17:33:21 +02:00
miguel@hegel.txg.br
da9fe0e6e2 Removed non-used variable 2004-08-17 12:20:01 -03:00
tomas@poseidon.(none)
2dac426237 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-17 14:05:01 +00:00
tomas@poseidon.(none)
670f3427a7 automake fix for getting dependencies right for ndb 2004-08-17 14:03:20 +00:00
guilhem@mysql.com
8c9fc27f7c Fix for BUG#5073 "--disable-local-infile has no effect if client reads it with MYSQL_READ_DEFAULT":
that was a forgotten '~' probably.
2004-08-17 14:12:37 +02:00
heikki@hundin.mysql.fi
48b61d6180 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-08-17 14:30:36 +03:00
joreland@mysql.com
a2255169d7 Merge mysqldev@bk-internal.mysql.com:/tmp/jonas/save
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-17 11:57:50 +02:00
mysqldev@mysql.com
f05b70cff5 Solaris fixes 2004-08-17 11:55:51 +02:00
brian@avenger.(none)
1fc56217b9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/mysql/4.1
2004-08-17 01:34:17 -07:00
brian@avenger.(none)
f3fb5f8399 Fix for not compiling ha_tina. 2004-08-17 01:29:19 -07:00
dlenev@brandersnatch.localdomain
ba64ecf328 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-hpux
2004-08-17 12:06:03 +04:00
dlenev@brandersnatch.localdomain
da36c03a51 Portablity fix.
hpux11 compiler dislikes empty array initializers.
2004-08-17 12:05:34 +04:00
joreland@mysql.com
95e56a1fd3 Limit testIndex CreateAll
Limit testBackup BackupOne
2004-08-17 09:29:00 +02:00
joreland@mysql.com
f5eb28f160 More testBackup fixes 2004-08-17 08:50:01 +02:00
ram@gw.mysql.r18.ru
f1ab1b129f A fix (bug #5055: SQL_SELECT_LIMIT=0 crashes command line client):
mysql outwits itself.
2004-08-17 11:12:22 +05:00
joreland@mysql.com
38e210dc27 Fix testBackup 2004-08-17 07:48:13 +02:00
sergefp@mysql.com
fdb51f67a2 Fix for bug#4488: sign-aware equality check 2004-08-17 02:59:24 +04:00