Commit graph

17691 commits

Author SHA1 Message Date
joreland@mysql.com
b753141a68 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-01 13:36:41 +01:00
joreland@mysql.com
e9feed9751 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-01 13:35:57 +01:00
joreland@mysql.com
afdbf9b4a4 bug#8853 - ndb - commit after nodefailure on not TC node
set exec_flag in execTC_COMMITREQ so that api will get rollbackrep
2005-03-01 13:32:11 +01:00
marko@hundin.mysql.fi
63f7f0a8dc Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-01 14:13:26 +02:00
jani@ua141d10.elisa.omakaista.fi
530b12166e Fixed Bug#7906, "Cmdline help for mysqld --ansi option misses some info". 2005-03-01 14:13:25 +02:00
ramil@mysql.com
c862c11aab Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b6089
2005-03-01 14:19:32 +04:00
ramil@mysql.com
8f90906961 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b6089
2005-03-01 12:31:05 +04:00
ramil@mysql.com
4225b8e8ff Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b5615
2005-03-01 12:20:55 +04:00
marko@hundin.mysql.fi
2b10afd911 After merge fixes 2005-03-01 09:51:32 +02:00
marko@hundin.mysql.fi
ce553fc2fe InnoDB: Fix compilation errors on IA-64 Windows 2005-03-01 09:27:09 +02:00
sergefp@mysql.com
d2fec05179 Fix for BUG#8562: In Item_int_with_ref::new_item() create Item_int or Item_uint
depending on ref->unsigned_flag. Item_int_with_ref can refer to both signed and 
unsigned integers.
2005-02-28 23:50:06 +03:00
sergefp@mysql.com
a6ad8a4d0f Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::error to -1 to cause
the error to be sent to the client.
2005-02-28 20:21:21 +03:00
ramil@mysql.com
c896fcb483 merging 2005-02-28 19:59:38 +04:00
sergefp@mysql.com
ad43387fc2 Merging fix for BUG#7519 - not applying changes to 4.1 as 4.1 is not affected. 2005-02-28 18:49:35 +03:00
ramil@mysql.com
883ff0cc81 merging 2005-02-28 18:11:18 +04:00
sergefp@mysql.com
a06c6d41bb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/psergey/mysql-4.0-look
2005-02-28 15:40:45 +03:00
sergefp@mysql.com
b44f24000b Merge 2005-02-28 14:52:35 +03:00
monty@mysql.com
ab11370de6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-28 12:00:18 +02:00
monty@mysql.com
253bfcf783 Fixed wrong memory references found by purify
(No really critical errors found, but a few possible wrong results)
2005-02-28 11:59:46 +02:00
sergefp@mysql.com
eb5d5de05f Fix for BUG#8560: Set max_sort_char for any 8-bit charset with binary collation. max_sort_char is needed by
my_like_range_simple to produce upper bound constants for LIKE "str_%" and similar expressions.
2005-02-26 17:15:04 +03:00
heikki@hundin.mysql.fi
41e45ab16a fil0fil.c:
Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message
2005-02-25 22:16:14 +02:00
heikki@hundin.mysql.fi
e40a88ea62 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-25 22:01:33 +02:00
bar@mysql.com
88e1ebd01a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1-again
2005-02-25 18:16:45 +04:00
bar@mysql.com
e42a8c454b mysqldump.c:
Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client
2005-02-25 18:12:53 +04:00
ramil@mysql.com
671fa8bd66 merge 2005-02-25 17:28:47 +04:00
ramil@mysql.com
4ab10bcedf merge 2005-02-25 16:34:17 +04:00
ramil@mysql.com
dee22632f7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b4802
2005-02-25 15:47:36 +04:00
joreland@mysql.com
54af1b8fc8 add auto generated ndb dsp-files (for msvc++ 6.0) to ignore file 2005-02-25 11:47:27 +01:00
joreland@mysql.com
1bbc88e9b1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-25 09:18:33 +01:00
joreland@mysql.com
b52ed0d669 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-25 09:14:43 +01:00
joreland@mysql.com
72127b52b3 BUG#8786 - ndb_autodiscover, post review
More explicit naming of variables
2005-02-25 09:10:35 +01:00
joreland@mysql.com
c25ce0e362 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 18:59:56 +01:00
joreland@mysql.com
15de06f290 bug#8786 - ndb autodiscover, sometimes fails
remove dict forwarding
  add api retries on NotMaster
2005-02-24 18:58:56 +01:00
lars@mysql.com
c99c44805c Fix of an incorrect merge 2005-02-24 17:25:06 +01:00
mwagner@here.mwagner.org
cbc8b5c3c8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
2005-02-23 23:57:28 -06:00
mwagner@here.mwagner.org
27efaa9127 Bootstrap:
Add new manual.texi include files
2005-02-23 23:44:13 -06:00
joreland@mysql.com
87402eb5bb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 06:14:43 +01:00
jimw@mysql.com
3ecabaa9f7 Don't try to create a symlink if the DATA DIRECTORY specified for a table
is the same as the normal datadir for that database. (Bug #8707)
2005-02-23 13:59:04 -08:00
mats@mysql.com
30ade5b57e Bug#8412: Setting error code to 0 on statements that cannot fail. 2005-02-23 20:59:00 +01:00
mats@mysql.com
6ad51ffb3c Bug#8412: Merge from 4.0 2005-02-23 19:58:54 +01:00
mats@mysql.com
a4cdb93b38 Merge mysql.com:/home/bkroot/mysql-4.0
into mysql.com:/home/bk/b8412-mysql-4.0
2005-02-23 19:40:31 +01:00
guilhem@mysql.com
772b1cedcd Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-23 18:18:22 +01:00
gluh@gluh.mysql.r18.ru
fc9c20995f Fix for bug #6572: SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
guilhem@mysql.com
086c2a915a FIx for BUG#8682 "flush_block_commit test hangs on HPUX":
start_waiting_global_read_lock() should wake up all those who are waiting
for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
AND those registered in global_read_lock_blocks_commit.
2005-02-23 17:38:51 +01:00
gluh@gluh.mysql.r18.ru
2b5ee94a33 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03:00
bar@mysql.com
4996daec19 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-02-23 16:29:01 +04:00
bar@mysql.com
99937c2b91 config-win.h:
Activate Unicode collations in Windows version.
2005-02-23 16:28:10 +04:00
tomas@poseidon.ndb.mysql.com
ce6ffc3dcc removed printout "- Repeated 1 times"
make sure transporter connections are close early in shutdown
2005-02-23 10:12:26 +01:00
jimw@mysql.com
a50be4d42b Merge mysql.com:/home/jimw/my/mysql-4.1-7989
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:15:34 -08:00
jimw@mysql.com
df3c8db4f3 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00