Commit graph

29573 commits

Author SHA1 Message Date
unknown
9f6f3ae06d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-12 15:52:40 +01:00
unknown
f8d126a059 Sun compiler fixes.
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  Add missing return value, otherwise Sun compiler complains.
2006-01-12 15:40:38 +01:00
unknown
c6599bfc5f Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-12 14:43:59 +01:00
unknown
ed2ecea404 ndb_dd_ddl.test:
Added requested changes to test.


mysql-test/t/ndb_dd_ddl.test:
  Added requested changes to test.
2006-01-12 14:31:42 +01:00
unknown
d9e3f5380b Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 14:29:17 +01:00
unknown
a80cfc9e1a Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-12 14:20:35 +01:00
unknown
379d71159b WL #1034 (Internal CRON) post-push fixes.
fix INSERT/REPLACE statements so test suite runs again.
The question is why we have 2 parallel universes - 2 different
ways to start the test suite, a shell and perl version. One more case
where redundancy makes life nightmare.


scripts/mysql_create_system_tables.sh:
  fix INSERT/REPLACE statements so test suite runs again.
  The question is why we have 2 parallel universes - 2 different
  ways to start the test suite, a shell and perl version. One more case
  where redundancy makes life nightmare.
2006-01-12 14:17:00 +01:00
unknown
2946f9a64f NetWare specific change to increase thread stack size.
Changes to Netware specific mysqld_safe.c


include/config-netware.h:
  NetWare specific change to increase thread stack size.
innobase/os/os0thread.c:
  NetWare specific change to increase thread stack size.
netware/mysqld_safe.c:
  NetWare specific change to make multiple mysqld_safe instances
  work when called through a NCF file.
sql/mysqld.cc:
  NetWare specific change to increase thread stack size.
2006-01-12 15:10:12 +02:00
unknown
0fa2fdb9be Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2006-01-12 14:40:39 +02:00
unknown
712442f76d Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-12 13:34:58 +01:00
unknown
35d46cee7c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2006-01-12 16:07:06 +04:00
unknown
46fdcba4f1 sql_show.cc:
after-merge fix for
  bug#15581 COALESCE function truncates mutli-byte TINYTEXT values


sql/sql_show.cc:
  after-merge fix for bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
  ,
2006-01-12 16:05:46 +04:00
unknown
58da9de12f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-12 13:00:16 +01:00
unknown
20c072388a Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 12:37:54 +01:00
unknown
d8753a825e WL #1034 (Internal CRON) post-push fix
- add Event_priv to db and host tables


scripts/mysql_create_system_tables.sh:
  add event_priv to db and host. will fix failing tests too
2006-01-12 12:06:13 +01:00
unknown
5bff97212a Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/tmp/mysql-5.1-new
2006-01-12 11:54:31 +01:00
unknown
4777b9ae49 revert change to SETUP.sh which went through with my push of WL#1034
BUILD/SETUP.sh:
  go back to -01 and reporting usage of uninitialized variables
2006-01-12 11:51:34 +01:00
unknown
80d156c8cc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-12 11:51:01 +01:00
unknown
810576eee2 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 11:48:06 +01:00
unknown
45f3e9ec3f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-new
2006-01-12 11:31:51 +01:00
unknown
a5ac8675b5 ndb_dd_ddl - fix bug
BitKeeper/deleted/.del-ndb_error_reporter~48c84ad377571240:
  Delete: ndb/tools/ndb_error_reporter
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Release file from hash
2006-01-12 11:30:17 +01:00
unknown
f86aa66d71 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-12 11:27:54 +01:00
unknown
9c446eadbe ndb -
fix Suma get buffer ptr, adopt to new page pool in tup


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Fix new page pool usage
    previously it accepted page = base + RNIL, since it didnt use page anyway, sort of a prefetch...
2006-01-12 10:48:36 +01:00
unknown
558d08518f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 10:36:05 +01:00
unknown
b398198be8 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-new


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
2006-01-12 10:11:58 +01:00
unknown
cd1f75e9cb ctype_utf8.result:
After merge fix:
  fixing order of results.


mysql-test/r/ctype_utf8.result:
  After merge fix:
  fixing order of results.
2006-01-12 13:08:49 +04:00
unknown
085c97c19e WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
NDB cluster is not fully supported. This will be added with
WL 1892 (NDB Handler: Add support for CREATE/DROP INDEX).
Some preparatory code for this is already present though.
A change for the "duplicate key" error message is planned
for another changeset.


include/my_base.h:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Defined a mask of flags which must be the same for two indexes
  if they should compare as compatible.
  Added an error number for a new drop index error message.
mysql-test/r/key.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  The test result.
mysql-test/t/key.test:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  The test case.
sql/handler.cc:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Prepared for a later change in an error message:
  Replace index number by index name for "duplicate key" error.
  Added handling for the new drop index error message.
sql/handler.h:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Added new flags and methods.
  Removed old flags and methods (from the last attempt).
sql/share/errmsg.txt:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Added a new error message for drop index.
sql/sql_table.cc:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Moved definitions to the top of the file.
  In mysql_prepare_table() allow an index to have the name
  "PRIMARY" if it has the key type "Key::PRIMARY".
  Added a parenthesis for readability.
  Removed old code from the last attempt.
  Some changes to compare_tables():
  - Input parameter "List<Key> *key_list" is replaced by
    "KEY *key_info_buffer, uint key_count".
  - Output parameters added: "index_drop_buffer/index_drop_count"
    and "index_add_buffer/index_add_count".
  - Key comparison must now find matching keys in changed
    old and new key lists.
  - Key comparison of a key is easier now because both old
    and new keys are of type 'KEY'.
  Call mysql_prepare_table() before compare_tables(). The
  translated KEY structs are needed at some places now.
  Inserted a code segment for checking alter_table_flags().
  Removed mysql_prepare_table() from the 'partition' branches
  (it is done above now).
  Removed a pair of unnecessary braces.
  Inserted a code segment for executing fast add/drop index.
  Made close of table dependent on whether it was opened.
  Prepared for NDB cluster support.
  Fixed commit to be called outside of LOCK_open.
2006-01-12 10:05:07 +01:00
unknown
29505f389b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
2006-01-12 11:55:34 +03:00
unknown
ea20aeff71 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-12 09:14:00 +01:00
unknown
9878a35a6a Fix typo bug in previous cset 2006-01-12 11:11:16 +03:00
unknown
69f4b6a92b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs3
2006-01-12 11:48:48 +04:00
unknown
8d9ffc6ad4 BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)


mysql-test/r/index_merge.result:
  Testcase for BUG#16166
mysql-test/t/index_merge.test:
  Testcase for BUG#16166
sql/sql_select.cc:
  BUG#16166: "Can't use index_merge with FORCE INDEX": adjust the heuristics check:
  if (force-index-is-used && there-is-possible-ref-access && 
  +    THERE IS NO POSSIBLE RANGE/INDEX_MERGE ACCESS)
  {
    ...
2006-01-12 10:48:27 +03:00
unknown
4ab53435d6 sql_table.cc:
Typo fix.
  Thanks Serg for noticing this.


sql/sql_table.cc:
  Typo fix.
  Thanks Serg for noticing this.
2006-01-12 11:41:57 +04:00
unknown
b49ea12f57 Merge mysql.com:/usr/home/bar/mysql-4.1.b15581
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/r/ctype_utf8.result:
  After-merge fix.
sql/field.cc:
  After merge fix.
2006-01-12 11:38:09 +04:00
unknown
f00e5b36c7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b15581
2006-01-12 11:13:34 +04:00
unknown
41315876ee Fixed typo.
Really dumb typo....


sql/ha_archive.h:
  Fix typo
2006-01-11 22:59:08 -08:00
unknown
927c7b262b Adding a --use-threads options which I believe will allow it to be ported to windows.
client/Makefile.am:
  Adding pthread flag
client/client_priv.h:
  New option to use theads.
client/mysqlslap.c:
  Adding support to optionally use threads (which should allow it to work with windows)
2006-01-11 21:30:52 -08:00
unknown
a549befb6d Added bitfield support and a test for it.
Archive uses native row format, so honestly this is just the change in a flag. 


sql/ha_archive.h:
  Added bit field support (and dropped the ha_not_exact_count since we always have this).
mysql-test/r/archive_bitfield.result:
  New BitKeeper file ``mysql-test/r/archive_bitfield.result''
mysql-test/t/archive_bitfield.test:
  New BitKeeper file ``mysql-test/t/archive_bitfield.test''
2006-01-11 21:16:51 -08:00
unknown
db35f19d39 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 05:16:23 +01:00
unknown
3c5c5c3775 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 19:16:56 -08:00
unknown
4ee6e77f4c delete the stale file and this should fix the build
after my push of WL#1034 (Internal CRON) into 5.1


BitKeeper/deleted/.del-event.h~2c9fb599ae4e39e7:
  Delete: libmysqld/event.h
2006-01-12 01:22:52 +01:00
unknown
4eb2b162c5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/MySQL/devel/5.0-bug15103
2006-01-12 03:05:29 +03:00
unknown
f315b0b8a7 Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem.
mysql-test/r/information_schema.result:
  Remove extra spaces from result file.
mysql-test/r/mysqldump.result:
  Remove extra spaces from result file.
mysql-test/r/rpl_ddl.result:
  Remove extra spaces from result file.
mysql-test/r/trigger-compat.result:
  Remove extra spaces from result file.
mysql-test/r/trigger-grant.result:
  Remove extra spaces from result file.
mysql-test/r/trigger.result:
  Remove extra spaces from result file.
sql/sql_yacc.yy:
  Remove leading spaces.
2006-01-12 03:02:52 +03:00
unknown
264df6d02a Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr


storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
  Auto merged
2006-01-12 00:17:11 +01:00
unknown
35c2846c5c ndb - wl#2972 (5.1, related) detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  detached trigger fixes for multiops
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  detached trigger fixes for multiops
storage/ndb/test/ndbapi/test_event_merge.cpp:
  detached trigger fixes for multiops
2006-01-11 23:51:18 +01:00
unknown
7c21527385 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  linux.site:/home/reggie/work/mysql-5.0
2006-01-11 16:34:51 -06:00
unknown
65bffb0f6d simple Windows compile fixes.
include/config-win.h:
  use the ll and ull postfix codes for create longlong and ulonglong
  symbols.  This allows ULL(a) and LL(a) to be used in more complex
  macro definitions than the previous definitions.  This may work on
  other compilers but we just tested on Visual 7.1 and 8.0
  
  Also, define HAVE_STRNLEN for all windows platforms.  Our own strnlen
  offers no performance improvements over the CRT version.
2006-01-11 16:18:11 -06:00
unknown
4e2e0c6d53 Fixed bug #15538: unchecked table absence caused server crash.
Absence of table in left part of LEFT/RIGHT join wasn't checked before
name resolution which resulted in NULL dereferencing and server crash.

Modified rules: 
"table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer 
JOIN_SYM table_ref"
NULL check is moved before push_new_name_resolution_context()


sql/sql_yacc.yy:
  Fixed bug #15538: unchecked table absence caused server crash.
  Modified rules:
  "table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer 
  JOIN_SYM table_ref"
  NULL check is moved before push_new_name_resolution_context()
mysql-test/r/select.result:
  Added test case for bug #15538: unchecked table absence caused server crash.
mysql-test/t/select.test:
  Added test case for bug #15538: unchecked table absence caused server crash.
2006-01-11 23:39:09 +03:00
unknown
ddcc6d7bd4 Fixed bug #15347: Wrong result of subselect when records cache and set
functions are involved.

When subselect is a join with set functions and no record have been found in
it, end_send_group() sets null_row for all tables in order aggregate functions 
to calculate their values correctly. Normally this null_row flag is cleared for 
each table in sub_select(), but flush_cached_records() doesn't do so.
Due to this all fields from the table processed by flush_cached_records() are 
always evaluated as nulls and whole select produces wrong result.

flush_cached_records() now clears null_row flag at the very beginning.


mysql-test/t/select.test:
  Added test case for bug #15347: Wrong result of subselect when records cache
  and set functions are involved
mysql-test/r/select.result:
  Added test case for bug #15347: Wrong result of subselect when records cache
  and set functions are involved
sql/sql_select.cc:
  Fixed bug #15347: Wrong result of subselect when records cache and set functions are involved
  flush_cached_records() now clears null_row flag at the very beginning.
2006-01-11 23:16:21 +03:00
unknown
09d2e055bc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 12:06:30 -08:00