Commit graph

30882 commits

Author SHA1 Message Date
unknown
a45c39e732 manual merge 2006-02-10 17:59:53 +01:00
unknown
9a68ba18c7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2006-02-10 17:53:13 +01:00
unknown
76d98963c7 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_basic.result:
  manual merge
mysql-test/t/ndb_basic.test:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
2006-02-10 17:50:17 +01:00
unknown
26287714d5 Bug #17249 ndb, delete statement with join where clause fails when table do not have pk
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead


mysql-test/r/ndb_basic.result:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
mysql-test/t/ndb_basic.test:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
sql/ha_ndbcluster.cc:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
sql/ha_ndbcluster.h:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
2006-02-10 17:40:22 +01:00
unknown
b4d38aa0c6 support-files/mysql.spec.sh : Use "-i" on "make test-force", essential for log file evaluation.
support-files/mysql.spec.sh:
  Use "-i" on "make test-force";
  this will prevent "make" from writing "***" which in turn was treated as a _build_ error
  by the log evaluation tool, causing it not to list the failing tests.
2006-02-10 17:40:04 +01:00
unknown
d830e2b40e Added partition pruning checks (WL#2987) 2006-02-10 17:06:24 +01:00
unknown
5b497b163a fix for bug #17289 Events: missing privilege check for drop database
Events were executed with all privileges possible on planet Earth :(
WL#1034


mysql-test/r/events.result:
  update test results
mysql-test/t/events.test:
  test for bug#17289 Events: missing privilege check for drop database
sql/event.h:
  -add two new methods to event_timed to change and restore
   the security context
sql/event_executor.cc:
  - move code regarding privilieges checking to event_timed::execute()
  - add a new function evex_print_warnings() which prints the notes/warnings/errors
    to the console (easily capturable with logs-into-tables) so one can see what
    has happened if there was an error of some sort!
sql/event_timed.cc:
  - fix documentation
  - add a new error code -99, EVENT was revoked from the user on the DB
  - set_sec_ctx, execute, restore_sex_ctx
sql/sql_error.cc:
  - make warning_level_names public to be used in event_executor.cc
  - change from 2 arrays to a LEX_STRING array
2006-02-10 15:02:57 +01:00
unknown
1208fca6bd Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013
into  neptunus.(none):/home/msvensson/mysql/bug14013/my51-bug14013


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-02-10 14:53:56 +01:00
unknown
101e618f7f Bug#14013 mysql_stmt_store_result() bombs if a cursor is open
- Add code to 'mysql_stmt_store_result' to allow it to be called on 
   a prepared statement with open server side cursor.
 - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'


client/mysqltest.c:
  Enable cursor protocol(remove the ifdef BUG14013_FIXED)
  When running in cursor mode, the warnings from execute needs 
  to be extracted after mysql_stmt_execute, put them in a dynamic string 
  for later use.
  Untabify some tabs.
libmysql/libmysql.c:
  Allow 'mysql_stmt_store_result' to be called on a statement with an open server side cursor.
  Detect that a server side cursor is open and send a "fetch" to ask for all rows to be sent to the client.
  Read all binary rows as normal store.
  Check that server said last row was sent after all binary rows has been sent.
tests/mysql_client_test.c:
  Update 'fetch_n' function to take parameter indicating if 'mysql_stmt_store_result' should be used on the statement.
  Call fetch_n with parameter set to use 'mysql_stmt_store_result'
2006-02-10 14:50:29 +01:00
unknown
2a098077ca fix test of bug 12744 on OSX 2006-02-10 14:42:08 +01:00
unknown
553750f6e8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
2006-02-10 15:12:35 +02:00
unknown
a68f171585 BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part.
This changeset is assumed to stay in 4.1.


client/mysql.cc:
  BUG#16217 forced to introduce a separate mysql client command.
  Feature is backported from 5.0, precisely 
  ChangeSet 1.2034 06/02/09 16:23:09 aelkin@mysql.com
  (under second review at the moment)
mysql-test/r/mysqlbinlog.result:
  changed in 5.0
mysql-test/t/mysqlbinlog.test:
  backported from 5.0. The last part of the test to mimic bug#16217
sql/log_event.cc:
  Inserting exclaiming comment command for mysql client made differently than in 5.0.
  Parsing still is cheap enough not to think to modify server code instead.
2006-02-10 15:12:27 +02:00
unknown
0d4cae389d Several Netware specific fixes.
Originally, done by Jani and pushed to the general 5.1 tree
as ChangeSet 2006/02/02 16:22:31+02:00 jani@ua141d10.elisa.omakaista.fi
now just copied to the 5.1.6 build clone.


configure.in:
  To configure InnoDB for cross compilation.
include/config-netware.h:
  NetWare specific change to fix the compilation errors caused by event.h
  NetWare specific change required for WINE PATH and for new versions LibC(Jun 05)
  and zlib(1.2.3)
netware/BUILD/compile-AUTOTOOLS:
  Netware specific change reflecting the change in source code
  directory structure.
netware/BUILD/compile-linux-tools:
  Netware specific change to fix the location where gen_lex_hash
  gets created. Fixed also directory structure reflecting changes.
netware/BUILD/compile-netware-END:
  Netware specific change for creating mysqld_error.h
netware/BUILD/mwenv:
  Netware specific change required for WINE PATH and for
  new versions LibC(Jun 05) and zlib(1.2.3).
netware/BUILD/nwbootstrap:
  NetWare Specific change to produce absoulte path for XDC file.
netware/Makefile.am:
  Netware specific changes to fix to match new
  directory structure.
netware/my_manage.h:
  Netware specific change required for WINE PATH and for new versions
  LibC(Jun 05) and zlib(1.2.3).
  ((I fail to understand the above comment for this change - 
  seems just to be a number alignment and a "#define NULL".  Joerg))
netware/mysql_test_run.c:
  Netware specific change, added --autoclose option for mysql_test_run.nlm.
sql/mysqld.cc:
  Stacksize change for Netware.
  Netware specific change to fix the compilation errors caused by event.h
sql/set_var.cc:
  Minor indending related fix.
sql/sql_class.cc:
  Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro.
storage/innobase/os/os0thread.c:
  Netware specific change to increase the thread stack size.
storage/myisam/mi_locking.c:
  Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
2006-02-10 13:50:22 +01:00
unknown
46e4eabf80 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/r/rpl_ndb_sync.result:
  manual merge
mysql-test/t/disabled.def:
  SCCS merged
mysql-test/t/rpl_ndb_sync.test:
  manual merge
2006-02-10 12:58:55 +01:00
unknown
545ac7f323 test updates
mysql-test/t/rpl_trigger.test:
  Test cleanup
mysql-test/t/rpl_ndb_sync.test:
  Test cleanup
mysql-test/t/rpl_ndb_idempotent.test:
  Test cleanup
mysql-test/r/rpl_trigger.result:
  Updated result files
mysql-test/r/rpl_ndb_sync.result:
  Updated result files
mysql-test/r/rpl_ndb_idempotent.result:
  Updated result files
mysql-test/t/rpl_ndb_dd_basic.test:
  Rename: mysql-test/t/rpl_ndb_disk.test -> mysql-test/t/rpl_ndb_dd_basic.test
mysql-test/r/rpl_ndb_dd_basic.result:
  Rename: mysql-test/t/rpl_ndb_dd_basic.result -> mysql-test/r/rpl_ndb_dd_basic.result
mysql-test/r/rpl_ndb_sp006.result:
  New results file
mysql-test/t/rpl_row_sp007_innodb-slave.opt:
  Ensure slave tables are created as innodb
mysql-test/t/disabled.def:
  updated 17290
mysql-test/r/rpl_ndb_sp007.result:
  New results file
mysql-test/t/rpl_ndb_sp007.test:
  Added comment
mysql-test/t/rpl_ndb_sp006.test:
  Added comment
mysql-test/extra/rpl_tests/rpl_row_sp003.test:
  Augmented for use with NDB due to injector thread not populating the bin log before sync with master is done
mysql-test/r/rpl_ndb_sp003.result:
  New results file
mysql-test/t/rpl_ndb_sp003.test:
  Wrapper to use same code for testing NDB that is used for InnoDB Currently
2006-02-10 12:52:35 +01:00
unknown
3b0eec9cb7 storage/innobase/include/univ.i : Get rid of "extern inline" (part of innodb-5.0-149/162 snapshots).
storage/innobase/include/univ.i:
  Part of innodb-5.0-149/162 snapshots:
  Avoid breaking --with-debug builds on QNX and other systems
  whose compiler pretends to be GCC 2.
  Outside __WIN__ define UNIV_INLINE as static inline.
2006-02-10 12:39:31 +01:00
unknown
3f25e323c5 Bug#17280 mysqltest, --echo sometimes does not expand $variables
- Evaluate all variables in the text before printing it to result file


client/mysqltest.c:
  Update echo command to vvaluate all variables in the string before printing, allow
  for variable names to be escaped using \
mysql-test/r/mysqltest.result:
  Update results for echo
mysql-test/t/mysqltest.test:
  Add more advanced tests for echo of strings with several variables 
  and/or text plus variables. Also test that variables can be escaped
2006-02-10 12:11:16 +01:00
unknown
0f23bab697 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/5.0-mike
2006-02-10 14:06:23 +03:00
unknown
c7766a9597 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-10 11:27:30 +01:00
unknown
941c883dd1 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/5.0-mike
2006-02-10 13:25:35 +03:00
unknown
ef80ab6651 Merge mysql.com:/usr/local/mysql/mysql-5.1-sp-destruct
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-02-10 10:44:09 +01:00
unknown
36f6cc3b7e MySQL Bugs: #17283: Issues with killing "bankTransactionMaker" (and others) in 86 tests 2006-02-10 10:34:18 +01:00
unknown
9cf0a6c65c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-02-10 10:19:06 +01:00
unknown
55271ba714 Fix missing test cleanup 2006-02-10 10:18:57 +01:00
unknown
655ea368c4 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-10 10:11:30 +01:00
unknown
72a0f50635 merge 2006-02-10 10:10:52 +01:00
unknown
85cf3e1351 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-10 09:56:08 +01:00
unknown
f31b9f695c Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-new


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-02-10 09:50:34 +01:00
unknown
c1a6def279 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-10 09:42:35 +01:00
unknown
f553ac1956 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-02-10 09:40:56 +01:00
unknown
a33f49381d Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-10 09:39:45 +01:00
unknown
b053fdbe8d Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-02-10 09:38:10 +01:00
unknown
165d539069 bug#10987 - ndb - unable to find restorable replica
Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
    
  This variable is used when cutting redo (calcKeepGci)
  
  Also make sure complete GCI is run inbetween LCP's


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
  
  This variable is used when cutting redo (calcKeepGci)
  Also make sure complete GCI is run inbetween LCP's
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
  
  This variable is used when cutting redo (calcKeepGci)
  Also make sure complete GCI is run inbetween LCP's
2006-02-10 09:37:36 +01:00
unknown
f86fb30344 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-10 09:20:09 +01:00
unknown
d06766b4d9 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-10 09:18:50 +01:00
unknown
bbcb4a567a bug#17295 - ndb - error while reading REDO log
fix corruption due to page 0, file 0 gets released


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure that page 0, file 0 isnt released
2006-02-10 09:17:53 +01:00
unknown
8a1652aaa2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-10 09:14:22 +01:00
unknown
7c6102eb9d Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/5.0-mike
2006-02-10 10:56:27 +03:00
unknown
4d494f8c0a Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
2006-02-10 10:24:30 +03:00
unknown
3443892a49 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-10 10:32:46 +04:00
unknown
65c74011c1 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-im-fixes
2006-02-10 03:38:29 +03:00
unknown
49ef59d6d8 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
2006-02-10 03:37:13 +03:00
unknown
7dcbb4803f IM changes by GUI team: add a version_no column to the
SHOW INSTANCE STATUS output


mysql-test/r/im_life_cycle.result:
  update result
mysql-test/t/im_life_cycle.imtest:
  fix test to take into account the new column
server-tools/instance-manager/commands.cc:
  add a version_no column to the SHOW INSTANCE STATUS output
server-tools/instance-manager/instance_options.cc:
  cleanup
2006-02-10 03:35:07 +03:00
unknown
094fcd2611 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-10 00:17:33 +01:00
unknown
d7ddf0e02f a bunch of IM fixes from the GUI team
mysql-test/r/im_life_cycle.result:
  correct result
mysql-test/t/im_life_cycle.imtest:
  check that wrong command is processed correctly
server-tools/instance-manager/Makefile.am:
  always look for passwords in /etc/ on unixes
server-tools/instance-manager/commands.cc:
  fix warning
server-tools/instance-manager/instance.cc:
  fix monitoring capabilities, when no port was specified
  for an instance
server-tools/instance-manager/instance_map.cc:
  allow relative paths in --defaults-file option
server-tools/instance-manager/mysqlmanager.cc:
  fix windows warning
server-tools/instance-manager/options.cc:
  add vars to allow relative paths in --defaults-file option
server-tools/instance-manager/options.h:
  add an option
server-tools/instance-manager/parse.cc:
  check for get_text_id return value
server-tools/instance-manager/portability.h:
  add _snprintf define, move platfrom-independent
  ifdefs to priv.h
server-tools/instance-manager/priv.cc:
  increase net timeout. it should be equal to mysqld's
server-tools/instance-manager/priv.h:
  move platform-independent ifdefs here
2006-02-10 02:15:55 +03:00
unknown
0420c0a5aa changed to use temporary heap table on a ndb test
corrected multiple --log-bin options in mysql-test-run


mysql-test/mysql-test-run.sh:
  corrected multiple --log-bin options in mysql-test-run
mysql-test/r/rpl_ndb_sync.result:
  changed to use temporary heap table on a ndb test
mysql-test/t/rpl_ndb_sync.test:
  changed to use temporary heap table on a ndb test
2006-02-10 00:15:07 +01:00
unknown
40aff07aee 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-09 23:48:52 +01:00
unknown
402b7e1243 remove volatile. fixes windows build
WL#1034 (Internal CRON)


sql/set_var.cc:
  remove volatile. fixes windows build
2006-02-09 23:15:48 +01:00
unknown
5f5dee66d3 from fix for bug#16414 (Events: Crash or hang if event drops itself)
WL #1034 


mysql-test/r/events.result:
  update result after pull
mysql-test/t/events.test:
  comment
2006-02-09 23:15:47 +01:00
unknown
c4066b9197 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-09 23:15:46 +01:00