Commit graph

21185 commits

Author SHA1 Message Date
unknown
1250899c0d Fixing post-merge errors 2005-03-09 00:09:18 +02:00
unknown
12c6eb3b08 post merge fixes
sql/sql_parse.cc:
  Auto merged
2005-03-08 22:59:21 +02:00
unknown
39c32324d6 making a better test case for bug #8850
mysql-test/r/sp.result:
  fixing results for new test
mysql-test/t/sp.test:
  making a new test with autocommit set to 0 and 1.
  Second CALL is in autocommit mode to prove that the relevant bug 
  (bug #8550) is fixed.
2005-03-08 22:44:35 +02:00
unknown
eb61d60d60 mysqld.cc:
main(): add missing parameter to printf(ER(ER_READY),...) call


sql/mysqld.cc:
  main(): add missing parameter to printf(ER(ER_READY),...) call
2005-03-08 22:33:11 +02:00
unknown
3921f6cc18 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 21:33:10 +01:00
unknown
7adae6b37a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-08 20:38:06 +01:00
unknown
50985b6783 changelog-5.0.xml:
Add dummy changelog file. It should merge upward without conflict.
2005-03-08 13:15:36 -06:00
unknown
ca280f732d changelog-4.1.xml:
Add dummy changelog file. It should merge upward without conflict.
2005-03-08 13:13:15 -06:00
unknown
abe6094ac4 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 19:47:49 +01:00
unknown
f70688e2aa BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
for fulltext searches too
2005-03-08 19:45:55 +01:00
unknown
8ce2071248 dict0load.c:
dict_load_table(): Do not complain about mix_len != 0,
  because MySQL 3.23.4x left garbage in that column.


innobase/dict/dict0load.c:
  dict_load_table(): Do not complain about mix_len != 0,
  because MySQL 3.23.4x left garbage in that column.
2005-03-08 20:06:09 +02:00
unknown
4e8c5c1969 Fix to make builds possible
mysql-test/r/mysqldump.result:
  Fix for avoiding version text
mysql-test/t/mysqldump.test:
  Fix for avoiding version text
2005-03-08 20:06:08 +02:00
unknown
9968ac77c4 changelog-4.0.xml:
Fix bad root element name in DOCTYPE.  Sheesh.


Docs/changelog-4.0.xml:
  Fix bad root element name in DOCTYPE.  Sheesh.
2005-03-08 11:49:56 -06:00
unknown
fe3a425a94 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 18:19:21 +01:00
unknown
4d262ef095 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
2005-03-08 10:44:16 -06:00
unknown
606b0b1778 Add dummy changelog file. It should merge upward without conflict. 2005-03-08 10:43:44 -06:00
unknown
50914ba7ae Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0


include/my_sys.h:
  Auto merged
2005-03-08 17:35:53 +01:00
unknown
5ff4f8e503 Added possibility to add disabled tests to mysql-test-run. 2005-03-08 18:32:31 +02:00
unknown
d8222c03c0 Merge changes.
Build-tools/Do-compile:
  Change already present in 5.0
configure.in:
  Do not propagate a 4.0 version number to the 5.0 tree.
include/my_sys.h:
  Change already present in 5.0.
mysys/hash.c:
  For Sun compilers, 'static inline' is ok.
mysys/my_bitmap.c:
  Change already present in 5.0
sql/item_strfunc.cc:
  Change already present in 5.0
sql/net_serv.cc:
  Change already present in 5.0
2005-03-08 17:24:07 +01:00
unknown
1b6b5ed8fa Netware build environment script related patch. 2005-03-08 18:18:53 +02:00
unknown
9d01d51209 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 17:12:51 +01:00
unknown
8ab73b4cc7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-03-08 18:12:50 +02:00
unknown
0fdd650fec Fixed Bug#8922.
Reverted Jim's patch.


client/mysql.cc:
  Fixed Bug#8922, The deilimeter cannot be reset after it is set as word 'delimiter'
include/my_sys.h:
  Reverted Jim's patch.
mysys/mf_iocache.c:
  Reverted Jim's patch.
sql/sql_class.h:
  Reverted Jim's patch.
2005-03-08 18:12:12 +02:00
unknown
ab0e331436 After merge fixes
innobase/dict/dict0load.c:
  dict_load_table():
  Display diagnostic output if mix_len differs from 0.
2005-03-08 17:18:27 +02:00
unknown
976543fe84 dict0load.c:
dict_load_table(): Remove the check for row_format=compact for now,
  because the flag bit we used (high-order bit of mix_len)
  has not been zero for at least two customers.


innobase/dict/dict0load.c:
  dict_load_table(): Remove the check for row_format=compact for now,
  because the flag bit we used (high-order bit of mix_len)
  has not been zero for at least two customers.
2005-03-08 17:08:17 +02:00
unknown
0f1b29c536 bug#9052 - ndb - Use correct length during unique index build
ndb/src/kernel/blocks/trix/Trix.cpp:
  Use correct length during unique index build
2005-03-08 15:26:34 +01:00
unknown
88c893cbbf InnoDB: Win64 portability fixes
innobase/include/srv0srv.h:
  Declare those variables as ulong that are declared in ha_innodb.h
innobase/srv/srv0srv.c:
  Define those variables as ulong that are declared in ha_innodb.h
2005-03-08 16:25:31 +02:00
unknown
b80ec98e28 Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1


innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
2005-03-08 16:02:13 +02:00
unknown
3330dfb390 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-03-08 14:43:06 +01:00
unknown
c409a646b1 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-03-08 15:33:30 +02:00
unknown
70a61746a4 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1 2005-03-08 14:30:17 +01:00
unknown
609e4dc6b3 Post-merge manual fix.
Build-tools/Do-compile:
  Post-merge manual fix: Avoid the duplicate line.
2005-03-08 14:27:18 +01:00
unknown
295dedd11c Manual merge, no effect on 4.1.
Build-tools/Do-compile:
  Change in 4.0 was backport, no effect on 4.1
configure.in:
  No change in 4.1 on merging.
sql/item_strfunc.cc:
  No change in 4.1
2005-03-08 14:17:57 +01:00
unknown
395618a651 - bumped up version number in configure.in from 4.0.24 -> 4.0.25 (ChangeSet 1.2073 was already tagged
as 4.0.24)


configure.in:
  - bumped up version number from 4.0.24 -> 4.0.25
2005-03-08 11:42:21 +01:00
unknown
5b32b8e1dd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-08 10:28:38 +01:00
unknown
65558d1877 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-08 10:27:37 +01:00
unknown
9606577705 bug#8918 - ndb - improve error message when stopping due to StartFailureTimeout 2005-03-08 10:25:21 +01:00
unknown
c9b0cbf013 InnoDB: Win64 portability fix: add missing declaration and
correct the definition of srv_max_buf_pool_modified_pct.


innobase/include/srv0srv.h:
  Declare srv_max_buf_pool_modified_pct
innobase/srv/srv0srv.c:
  Define srv_max_buf_pool_modified_pct as ulong,
  as it is declared in ha_innodb.h.
2005-03-08 11:12:18 +02:00
unknown
a66165ce05 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-08 09:56:32 +01:00
unknown
45b5e513c6 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 09:51:00 +01:00
unknown
30f0b31687 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-03-08 10:03:56 +02:00
unknown
8e24e6079f Flush entries from the query cache for tables used in
administrative statements that may alter the table, such
as REPAIR TABLE. (Bug #8480)


mysql-test/r/query_cache.result:
  Add new results
mysql-test/t/query_cache.test:
  Add regression test
sql/sql_table.cc:
  Make sure entries are flushed from the query cache for
  any administrative command run on a table that acquires
  a write lock on it (and thus might change it), like 
  REPAIR TABLE.
2005-03-07 18:15:19 -08:00
unknown
05dfca24c4 Re-enable IO cache mode that allows slow and query logs to go to a FIFO
(lost in merge because the code to open these logs was moved to a different
file).


sql/sql_class.h:
  Use APPEND_CACHE for query log and slow log (so they can be FIFO)
2005-03-07 13:56:58 -08:00
unknown
7a35a18a82 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-07 22:38:41 +01:00
unknown
14f4eebdd3 Clean up merge
include/my_sys.h:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
2005-03-07 13:26:27 -08:00
unknown
857bc49d28 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-07 21:33:02 +01:00
unknown
c324036c5f Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-03-07 21:30:43 +02:00
unknown
dcd8383b86 added test compare function for testing event
fixed one bug in event, pk comes first in events...
2005-03-07 18:47:47 +01:00
unknown
25f8623fff Fixed BUG#8937: Stored Procedure: AVG() works as SUM() in SELECT ... INTO statement
mysql-test/r/sp.result:
  New test case for BUG#8937.
mysql-test/t/sp.test:
  New test case for BUG#8937.
sql/item_sum.h:
  Added val_int() method for Item_sum_avg for forced int types (in SPs for instance),
  otherwise Item_sum_sum::val_int() is used.
2005-03-07 18:09:53 +01:00
unknown
00a163d46f Fix for bug #8935 CAST(time AS DECIMAL) crashes
mysql-test/r/cast.result:
  test result
mysql-test/r/func_group.result:
  test result
mysql-test/t/cast.test:
  test case
sql/field.cc:
  this assert isn't correct actually
2005-03-07 20:53:51 +04:00