Commit graph

19160 commits

Author SHA1 Message Date
unknown
7d358a015f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-24 10:48:51 +01:00
unknown
343e9bbd34 mysql-test-run.sh:
backported access to ndb_mgm from 5.0


mysql-test/mysql-test-run.sh:
  backported access to ndb_mgm from 5.0
2005-01-24 10:47:51 +01:00
unknown
dc5a3cae2e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
2005-01-24 10:34:55 +01:00
unknown
2f196ec771 remmoved inline in NdbRecAttr methods including memcpy 2005-01-24 10:33:39 +01:00
unknown
ef52e1c9bc Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-01-24 09:55:41 +02:00
unknown
be3b13749e ndb - Add includes to test prg as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexAsynch.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexBench.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexHammer.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/slow_select.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/src/HugoCalculator.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
2005-01-23 20:13:42 +01:00
unknown
c667388b2b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/tools/waiter.cpp:
  Auto merged
2005-01-23 12:13:34 +01:00
unknown
fdedd0fc5b backported from 5.0 extra option to ndb_waiter 2005-01-23 12:12:50 +01:00
unknown
7a34153b44 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-4.1-lenz
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-22 19:33:04 +01:00
unknown
539b6d59b0 Manual merge
mysql-test/r/select_found.result:
  Auto merged
2005-01-22 03:12:44 -08:00
unknown
d3db70de4c Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-22 02:42:54 -08:00
unknown
25c2d1adb0 select_found.result, select_found.test:
Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.


sql/sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.
mysql-test/t/select_found.test:
  Added a test case for bug #7945.
mysql-test/r/select_found.result:
  Added a test case for bug #7945.
2005-01-22 02:40:27 -08:00
unknown
966086abdf Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0


innobase/fil/fil0fil.c:
  Auto merged
2005-01-22 04:49:35 +02:00
unknown
c695ccd27e fil0fil.c:
Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free(), in DROP TABLE or in ALTER TABLE


innobase/fil/fil0fil.c:
  Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free()
2005-01-22 04:45:22 +02:00
unknown
fcd0902266 log0recv.c:
Remove superfluous fprintf about log record application in InnoDB startup


innobase/log/log0recv.c:
  Remove superfluous fprintf about log record application in InnoDB startup
2005-01-21 23:47:44 +02:00
unknown
531065373a fil0fil.c:
Add a missing newline to an error print


innobase/fil/fil0fil.c:
  Add a missing newline to an error print
2005-01-21 23:36:00 +02:00
unknown
b5269973ab dict0load.c:
Fix a compilation error reported by Paul Dubois; I forgot to compile 5.0 after the merge
os0thread.c:
  test


innobase/os/os0thread.c:
  test
innobase/dict/dict0load.c:
  Fix a compilation error reported by Paul Dubois; I forgot to compile 5.0 after the merge
2005-01-21 22:03:08 +02:00
unknown
140a86c674 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 19:40:30 +01:00
unknown
b5778c1c4a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-21 19:33:54 +01:00
unknown
277a557e45 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
2005-01-21 18:07:22 +01:00
unknown
8e37b80816 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-01-21 19:02:12 +02:00
unknown
a3f7796dd9 Bug#8070
corrected possible unalignment in NdbRecAttr access methods
2005-01-21 17:57:44 +01:00
unknown
17c49b61db Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-01-21 18:56:18 +02:00
unknown
5b5f5071ea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 17:50:58 +01:00
unknown
8d8e0cb539 WL#2126 - Multi_read_range.
Addendum for correct multi_range_count system variable handling.
Fixed a typo.
Added to sys_variables.
Added to init_vars.
2005-01-21 17:38:46 +01:00
unknown
3cbafff2e0 Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0


innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
2005-01-21 18:16:02 +02:00
unknown
6eecb8e4e2 fil0fil.c:
Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works


innobase/fil/fil0fil.c:
  Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works
2005-01-21 17:59:23 +02:00
unknown
5e98f462be dict0dict.c:
Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition


innobase/dict/dict0dict.c:
  Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition
2005-01-21 17:54:50 +02:00
unknown
da931f9d67 Manual merge of the fix for BUG#4285 from 4.1
sql/sql_show.cc:
  removed sql_key_cache
2005-01-21 17:41:11 +02:00
unknown
888ee151b5 Merge of fix for BUG#4258 from 4.1.
Needs additional manual merge.


mysys/mf_keycache.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Properly resetting all key cache counters.
sql/sql_show.cc:
  Needs manual merge.
2005-01-21 17:38:36 +02:00
unknown
7f4324a58d Merge mysql.com:/home/timka/mysql/src/4.1-bug-4285
into mysql.com:/home/timka/mysql/src/4.1-dbg


sql/sql_show.cc:
  Auto merged
2005-01-21 16:47:51 +02:00
unknown
5556f53d09 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-21 16:10:41 +02:00
unknown
5d4f4a8131 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-21 14:57:57 +01:00
unknown
11a37f4775 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 14:41:01 +01:00
unknown
90f9479098 sql_show.cc:
#7943: Wrong prefix lengths reported on UTF-8 columns
  after merge fix.


sql/sql_show.cc:
  #7943: Wrong prefix lengths reported on UTF-8 columns
  after merge fix.
2005-01-21 17:00:14 +04:00
unknown
7a13309132 merge bug##7943: Wrong prefix lengths reported on UTF-8 columns
mysql-test/r/ctype_mb.result:
  Auto merged
sql/sql_show.cc:
  merge
2005-01-21 16:55:17 +04:00
unknown
f813e0dac0 Bug#7943: Wrong prefix lengths reported on UTF-8 columns
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
2005-01-21 16:49:20 +04:00
unknown
92be4551cb Fix weird link error on sol9x86
- use incremental linker


configure.in:
  Fix weird link error on sol9x86
2005-01-21 13:16:46 +01:00
unknown
7063399ee4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 12:18:24 +01:00
unknown
eaec73c3be enabled adding option to ndb_mgm in mysql test run 2005-01-21 12:15:14 +01:00
unknown
9f7f6ed2c9 A fix (bug #7261: Alter table loses temp table with lower_case_table_names=2). 2005-01-21 15:14:31 +04:00
unknown
7195b0109c Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-21 12:14:16 +01:00
unknown
0edfc25e50 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-21 09:53:31 +01:00
unknown
d29c45330c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999


sql/share/errmsg.txt:
  Auto merged
2005-01-21 12:10:19 +04:00
unknown
580bd979cd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-21 08:41:39 +01:00
unknown
4c0a0c3e56 moved START_AND_EXIT check so it can actually be used
fix as not to overwrite previoulsy set flags in configure


config/ac-macros/ha_ndbcluster.m4:
  fix as not to overwrite previoulsy set flags in configure
configure.in:
  fix as not to overwrite previoulsy set flags in configure
mysql-test/mysql-test-run.sh:
  movet START_AND_EXIT check so it can actually be used
2005-01-21 08:41:38 +01:00
unknown
a1b6bd5adc Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2005-01-21 08:30:21 +01:00
unknown
4bfad5aedb bug#8051 - ndb, typo, more info on crash
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  typo
2005-01-21 08:28:23 +01:00
unknown
7a3767fc5e Bug#8051 - ndb
Make sure to ship error code in system error signal
2005-01-21 07:53:02 +01:00
unknown
43abffc89b 2005-01-20 23:23:15 +01:00