Commit graph

17209 commits

Author SHA1 Message Date
jan@hundin.mysql.fi
4f3b3047a6 This is a code cleanup patch for X/Open XA. 2004-12-01 09:20:32 +02:00
jan@hundin.mysql.fi
fb50b9e63c Auto merged. 2004-11-30 12:11:02 +02:00
jan@hundin.mysql.fi
97f59719b6 Added support for X/Open XA prepare, recover, commit and rollback. 2004-11-30 11:45:02 +02:00
joreland@mysql.com
a1a4ddad74 ndb - Fixed INCORRECT result file for unique index test 2004-11-30 08:42:42 +01:00
joreland@mysql.com
634a1362e8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-30 07:46:52 +01:00
joreland@mysql.com
85f8ad7bd1 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-30 07:45:49 +01:00
joreland@mysql.com
474f23a402 ndb - fixed long overdue problems with unique indexes and null values 2004-11-30 07:41:26 +01:00
brian@avenger.(none)
86c57bd8c2 Merge 2004-11-29 20:15:48 -08:00
serg@serg.mylan
4e2a9c6905 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-29 22:49:00 +01:00
serg@serg.mylan
ceb0d1cf87 compatibility fixes 2004-11-29 22:47:50 +01:00
paul@kite-hub.kitebird.com
57cd047ca3 monty.doc:
Grammar fix.
user.r:
  A few typo fixes.
2004-11-29 13:26:12 -06:00
tomas@poseidon.ndb.mysql.com
ee70c9a501 ndb_grant.later:
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
2004-11-29 17:46:32 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
57b30a1eef Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
tomas@poseidon.ndb.mysql.com
07417cd309 NdbScanOperation.cpp:
added missing return
2004-11-29 15:36:43 +00:00
brian@avenger.(none)
15735b241f Adding support for archive to handle delayed inserts. 2004-11-29 01:40:25 -08:00
joreland@mysql.com
2aa77fdaae Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-29 09:28:23 +01:00
joreland@mysql.com
74bfe72d3d ndb - scan bug fix + more test cases 2004-11-29 09:00:39 +01:00
serg@serg.mylan
5ce151891a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-28 21:56:43 +01:00
serg@serg.mylan
5a07b871cc don't cast LEX_STRING to char* :) 2004-11-28 21:55:38 +01:00
serg@serg.mylan
b460059988 merged 2004-11-28 20:42:04 +01:00
serg@serg.mylan
cb538e45f5 post-merge fix 2004-11-28 19:48:41 +01:00
sergefp@mysql.com
10fda3160c Fix for division by zero problem:
* Don't try building ROR-intersect if the queried table has zero rows
 * Don't ever produce an estimate of zero returned rows.
2004-11-28 21:02:30 +03:00
serg@serg.mylan
96729c62be merged 2004-11-28 18:19:01 +01:00
serg@serg.mylan
800ffc6150 view.test:
more max_rows for show table status
comment spellchecking...
2004-11-28 18:00:42 +01:00
serg@serg.mylan
992f5c70dd limit Max_data_length in 'show table status' 2004-11-28 17:30:52 +01:00
serg@serg.mylan
989721d12f bad merge fixed 2004-11-28 17:06:40 +01:00
serg@serg.mylan
e731dd9d05 fix for decimal.c 2004-11-28 16:58:05 +01:00
serg@serg.mylan
1a32157950 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-28 16:32:01 +01:00
serg@serg.mylan
7eccc3107f skip last compress test if we're short of RAM 2004-11-28 16:31:14 +01:00
serg@serg.mylan
f09429a4df protection: TRASH in delete
fixed a bug that it discovered
2004-11-28 15:53:17 +01:00
kent@mysql.com
77c32ac173 configure.in:
A work-around for SCO, disable use of clock_gettime
2004-11-28 15:45:12 +01:00
serg@serg.mylan
5b3f7c59ec Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-28 04:45:20 +01:00
serg@serg.mylan
319546d5f0 create/drop/rename user cleanup 2004-11-27 23:07:30 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
f595216869 Change sql_mode BROKEN_NOT to HIGH_NOT_PRECEDENCE 2004-11-27 19:26:46 +00:00
kent@mysql.com
2c3159eb9e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2004-11-27 14:48:24 +01:00
serg@serg.mylan
34c3ab708c fix decimal2longlong too 2004-11-27 13:54:51 +01:00
kent@mysql.com
7eaed4bf52 mysql_priv.h:
Reverts incomplete change of insert_fields()
2004-11-27 13:39:15 +01:00
serg@serg.mylan
246cf0d682 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-27 12:37:03 +01:00
serg@serg.mylan
57eb9f0021 better overflow checks in decimal2ulonglong
better truncation check in decimal2ulonglong
2004-11-27 12:35:21 +01:00
bell@sanja.is.com.ua
94bbc72382 portability fix (some printf lack of NULL support in strings) 2004-11-26 17:27:47 +02:00
bell@sanja.is.com.ua
cb079c7432 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 17:27:46 +02:00
tomas@poseidon.ndb.mysql.com
48729bfa73 fixed ndb_grant test 2004-11-26 15:27:45 +00:00
tomas@poseidon.ndb.mysql.com
b0c42a4835 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2004-11-26 15:27:44 +00:00
joreland@mysql.com
81bda32393 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-26 16:27:43 +01:00
gluh@gluh.mysql.r18.ru
7269388d27 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.1
2004-11-26 18:27:42 +03:00
gluh@gluh.mysql.r18.ru
a67b4a5b1c portability fix(for powermac)
Fix for bug#6756: Crash if SHOW INDEX
2004-11-26 18:26:52 +03:00
bell@sanja.is.com.ua
5290e580ef portability fix (some printf lack of NULL support in strings) 2004-11-26 16:30:20 +02:00
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
marko@hundin.mysql.fi
d58c186759 srv0srv.c:
srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
  only if --innodb_status_file=1
2004-11-26 13:16:37 +02:00