Commit graph

31745 commits

Author SHA1 Message Date
unknown
3d203da0e0 fixes to make the code compile with gcc 2.95
BitKeeper/etc/ignore:
  Added include/openssl to the ignore list
2006-02-28 22:07:14 +01:00
unknown
f6d7a36a05 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged
2006-02-28 14:05:20 -06:00
unknown
046530d5bc mysqltest.c:
Fix reference to incorrect (non-existent) options in comment.


client/mysqltest.c:
  Fix reference to incorrect (non-existent) options in comment.
2006-02-28 14:04:21 -06:00
unknown
df0cab0b69 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  Auto merged
2006-02-28 14:01:16 -06:00
unknown
9099fb2d06 mysqltest.c:
Correct/clarify comments.


client/mysqltest.c:
  Correct/clarify comments.
2006-02-28 14:00:17 -06:00
unknown
11c7dbd3a5 fix compiler warnings: precision loses, unused vars
the warnings came from MSFT compiler (output of pushbuild)


sql/event.cc:
  fix compiler warnings: precision loses, unused vars
sql/event_executor.cc:
  fix compiler warnings: precision loses, unused vars
sql/event_timed.cc:
  fix compiler warnings: precision loses, unused vars
2006-02-28 20:32:37 +01:00
unknown
604d48206f Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged
2006-02-28 12:20:48 -06:00
unknown
773c1e049a mysqltest.c:
Fix typos.


client/mysqltest.c:
  Fix typos.
2006-02-28 12:19:30 -06:00
unknown
71dd60573e Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  y
  manual merge
2006-02-28 12:10:38 -06:00
unknown
bfe8486ac3 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-02-28 19:05:43 +01:00
unknown
46c82ab153 mysqltest.c:
Fix typos.


client/mysqltest.c:
  Fix typos.
2006-02-28 12:01:24 -06:00
unknown
6f91d118f2 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16537
2006-02-28 18:44:46 +01:00
unknown
58a6d96c8f class event_timed -> Event_timed
fix for bug#17793 (Scheduler uses class event_timed should be Event_timed)


sql/event.cc:
  class event_timed -> Event_timed
sql/event.h:
  class event_timed -> Event_timed
sql/event_executor.cc:
  class event_timed -> Event_timed
sql/event_priv.h:
  class event_timed -> Event_timed
sql/event_timed.cc:
  class event_timed -> Event_timed
sql/sql_lex.h:
  class event_timed -> Event_timed
sql/sql_show.cc:
  class event_timed -> Event_timed
sql/sql_yacc.yy:
  class event_timed -> Event_timed
2006-02-28 18:33:38 +01:00
unknown
b70aaf38bc Bug #17499 continued
- moved initialization of used_partitions
- more tests

+ removed reference to fixed bugs


mysql-test/r/ndb_partition_range.result:
  Bug #17499 continued
  - more testing
mysql-test/t/disabled.def:
  removed reference to fixed bugs
mysql-test/t/ndb_partition_range.test:
  Bug #17499 continued
  - more testing
sql/ha_ndbcluster.cc:
  Bug #17499 continued
  - moved initialization of used_partitions
sql/sql_partition.cc:
  Bug #17499 continued
  - moved initialization of used_partitions
2006-02-28 17:51:27 +01:00
unknown
8a061aa6e3 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into sunlight.local:/work_local/14169-bug-5.0-mysql


tests/mysql_client_test.c:
  Auto merged
2006-02-28 19:42:11 +03:00
unknown
59b6ab1fe0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-28 17:41:54 +01:00
unknown
ddbf62ca89 Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was
used

In a simple queries a result of the GROUP_CONCAT() function was always of 
varchar type.
But if length of GROUP_CONCAT() result is greater than 512 chars and temporary
table is used during select then the result is converted to blob, due to
policy to not to store fields longer than 512 chars in tmp table as varchar
fields.

In order to provide consistent behaviour, result of GROUP_CONCAT() now
will always be converted to blob if it is longer than 512 chars.
Item_func_group_concat::field_type() is modified accordingly.


sql/item_sum.h:
  Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was 
  used
  The Item_func_group_concat::field_type() now returns FIELD_TYPE_BLOB if the result is longer than 512 chars.
tests/mysql_client_test.c:
  Added test case for bug#14169: type of group_concat() result changed to blob if tmp_table was used
2006-02-28 19:30:30 +03:00
unknown
174791b5cd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-28 17:29:13 +01:00
unknown
0c4ef91556 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16537
2006-02-28 17:04:31 +01:00
unknown
9a720dfa4f don't use magic numbers when there are already constants
(forgotten to be committed)
2006-02-28 17:02:31 +01:00
unknown
ef5b8bebdd ndb - blob tables vs dict cache : patch 1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  blob fix 1: cache no tables at create.
  previously main table was cached before blob tables were ready.
  autoincr fix to avoid caching as side-effect.
  also removes some rename fix where createBlobTables had old/new args.
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  blob fix 1: cache no tables at create.
  previously main table was cached before blob tables were ready.
  autoincr fix to avoid caching as side-effect.
  also removes some rename fix where createBlobTables had old/new args.
storage/ndb/src/ndbapi/ndberror.c:
  blob fix 1: cache no tables at create.
  previously main table was cached before blob tables were ready.
  autoincr fix to avoid caching as side-effect.
  also removes some rename fix where createBlobTables had old/new args.
2006-02-28 17:01:47 +01:00
unknown
bccd95392f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-28 16:28:34 +01:00
unknown
23c6613659 Bug#17499, complementing patch 2006-02-28 16:27:33 +01:00
unknown
c6d8d3ea9a Updated new tests from Lars review
mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
  Updated from review comments
mysql-test/include/rpl_multi_engine3.inc:
  Updated from review comments
2006-02-28 16:14:46 +01:00
unknown
4e58be10f6 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-28 16:13:43 +01:00
unknown
cab4f3bc7b Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-02-28 15:10:34 +01:00
unknown
b1a3417b6b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
2006-02-28 14:45:31 +01:00
unknown
79298b3e77 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16537
2006-02-28 14:45:25 +01:00
unknown
b934539d77 fix for bug#16537
(post-review pre-push changes)
coding style (mostly trailing spaces removed)


mysql-test/r/events.result:
  fix result file
sql/event.cc:
  - remove trailing spaces
  - add a missing initializer (gcc warning)
  - C++ to C comments
sql/event_executor.cc:
  - fix coding style (C++ to C comments, remove trailing spaces)
  - fix wrong indexing buggie not found till now (queue indexing is 0 based,
    not 1 based)
sql/event_timed.cc:
  - fix coding style
2006-02-28 14:43:49 +01:00
unknown
7f7c624656 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.16313
2006-02-28 17:29:49 +04:00
unknown
50ce511bdb Bug #17499 Alter table of ndb partitioned tables causes mysqld to core
- moved used_partitions initialization
2006-02-28 14:29:48 +01:00
unknown
b203771eab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-28 14:18:59 +01:00
unknown
447c6aa3df Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-28 14:02:16 +01:00
unknown
26dab541e1 Merge 5.0 -> 5.1
mysql-test/r/grant2.result:
  Update test result
mysql-test/t/grant2.test:
  Explicitly specify "columns" when inserting into mysql.user and mysql.db
2006-02-28 13:54:32 +01:00
unknown
208e6c5fdc Windows compile fixes.
VC++Files/sql/mysqld.vcproj:
  Add missing source file.
2006-02-28 13:21:35 +01:00
unknown
bab96216a8 Merge neptunus://home/msvensson/mysql/bug16795/my51-bug16795
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
2006-02-28 13:04:48 +01:00
unknown
d015b03aef Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
into  neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795


sql/ha_ndbcluster.cc:
  Auto merged
2006-02-28 13:03:26 +01:00
unknown
742549c50b Merge neptunus:/home/msvensson/mysql/bug16795/my50-bug16795
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-02-28 13:03:00 +01:00
unknown
82960f19f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-02-28 13:00:23 +01:00
unknown
3706278669 Windows compile fixes.
win/cmakefiles/mysys:
  Remove no longer existing source file from list.
sql/log_event.cc:
  Fix byte * <-> char * Windows build problem.
VC++Files/mysys/mysys.vcproj:
  Remove no longer existing source file from list.
2006-02-28 12:52:38 +01:00
unknown
029f16a1af Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-02-28 12:40:19 +01:00
unknown
46fc76534a Bug #17701, ALTER TABLE t1 ADD PARTITION for PARTITION BY LIST hangs test
- code wrongly tries to do a "fast alter partition", although not supported


sql/handler.h:
  moved defines
sql/sql_partition.h:
  moved defines
2006-02-28 12:29:50 +01:00
unknown
5f06d1738c Bug#16385, Partitions: crash when updating a range partitioned NDB table
- too little space was allocated for receiving events, partition uses extra column in table


mysql-test/r/ndb_partition_range.result:
  Bug#16385, Partitions: crash when updating a range partitioned NDB table
mysql-test/t/ndb_partition_range.test:
  Bug#16385, Partitions: crash when updating a range partitioned NDB table
2006-02-28 12:28:52 +01:00
unknown
ad5eb8d133 Bug #17763 mysqld cores with list partitioning if update to missing partition
- error string wrongly formatted


mysql-test/r/ndb_partition_error.result:
  Bug #17763 mysqld cores with list partitioning if update to missing partition
mysql-test/t/ndb_partition_error.test:
  Bug #17763 mysqld cores with list partitioning if update to missing partition
2006-02-28 12:27:53 +01:00
unknown
f6f5292145 manual merge
mysql-test/r/events.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/event.cc:
  Auto merged
sql/event.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-02-28 12:08:13 +01:00
unknown
317c6851ba fix for bug#16537 (Events: mysql.event.starts is null)
- now when the event is created and STARTS is omitted then STARTS is implicitly
  CURRENT_TIMESTAMP
- This CS also fixed incorrect presentation of STARTS/ENDS in I_S.EVENTS
(incorporated review changes)


mysql-test/r/events.result:
  results of new test cases
mysql-test/t/events.test:
  new test cases for bug #16537 (Events: mysql.event.starts is null)
sql/event.cc:
  - check whether event_timed::starts_null only in case
    event_timed::expression is set, so for recurring events only
  - disable binlogging of CREATE EVENT statement. It should not be
    replicated but the result of the execution. Still the replication is
    untouched topic.
sql/event.h:
  - add flags whether starts, ends and execute_at are null or not
sql/event_executor.cc:
  - check whether xxx_null instead of !xxxx.year
sql/event_timed.cc:
  - introduce xxx_null and change the usage of xxx.year to !xxx_null
sql/sql_show.cc:
  - don't show 0000-00-00 in I_S.EVENTS when the value is NULL
sql/sql_yacc.yy:
  - if STARTS is omitted default to current_timestamp
2006-02-28 11:43:10 +01:00
unknown
00de3c0471 Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-02-28 11:30:27 +01:00
unknown
701b699144 Bug#17377 Federated Engine returns wrong Data, always the rows with the highest ID
- Always make rnd_pos reposition the cursor in the fetched result set.


mysql-test/r/federated.result:
  Update test result
mysql-test/t/federated.test:
  Add test for bug#17377
sql/ha_federated.cc:
  Remove the "scan_flag" variable. rnd_pos should always move to a new position in the result set. 
  The "scan" flag in rnd_init will protect from the old result set being 
  closed and a new fecthed. I think the "scan_flag" was added before check of the "scan" argument in rnd_init was added.
sql/ha_federated.h:
  Remove class variable "scan_flag"
2006-02-28 11:17:40 +01:00
unknown
9b924484da Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


sql/field.h:
  Auto merged
2006-02-28 11:10:39 +01:00
unknown
dc2e5fff19 Merge neptunus:mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
2006-02-28 11:03:18 +01:00