Commit graph

29573 commits

Author SHA1 Message Date
unknown
593bed0d92 Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong
select result

Item equal objects are employed only at the optimize phase. Usually they are not
supposed to be evaluated.  Yet in some cases we call the method val_int() for
them. Here we have to take care of restricting the predicate such an object
represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.

Added a check for field's table being const in Item_equal::val_int().
If the field's table is not const val_int() just skips that field when
evaluating Item_equal.


mysql-test/t/select.test:
  Added test case for bug #15633: Evaluation of Item_equal for non-const table caused wrong select result
mysql-test/r/select.result:
  Added test case for bug #15633: Evaluation of Item_equal for non-const table caused wrong select result
mysql-test/r/func_group.result:
  Corrected test result for bug #12882 after fix for bug#15633
sql/item_cmpfunc.h:
  Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong select result
  Added comment about fields from non-const tables in class description.
sql/item_cmpfunc.cc:
  Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong select result
  Added check for field's table being const in Item_equal::val_int().
2006-01-11 22:49:43 +03:00
unknown
6c2c8482bf RBR test updates per lars request
mysql-test/extra/rpl_tests/rpl_EE_err.test:
  Splitting tests case per Lars review
mysql-test/t/rpl_EE_err.test:
  Splitting tests case per Lars review
mysql-test/r/rpl_EE_err.result:
  Splitting tests case per Lars review
mysql-test/t/rpl_stm_EE_err2.test:
  New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
  New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
mysql-test/r/rpl_stm_EE_err2.result:
  New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
BitKeeper/deleted/.del-rpl_row_EE_err.test~b3d8db3eacbb7af5:
  Delete: mysql-test/extra/rpl_tests/rpl_row_EE_err.test
BitKeeper/deleted/.del-rpl_row_EE_err.test~6cd033708a4535db:
  Delete: mysql-test/t/rpl_row_EE_err.test
BitKeeper/deleted/.del-rpl_row_EE_err.result~5ad217703f686c4d:
  Delete: mysql-test/r/rpl_row_EE_err.result
2006-01-11 20:02:11 +01:00
unknown
9dc0942ac1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 19:50:59 +01:00
unknown
0966a18915 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-11 19:50:58 +01:00
unknown
45a4daa43f bug: replication of table spaces to work
bug: check if storage engine is enabled to avoif code dump


BitKeeper/etc/ignore:
  Added storage/ndb/test/ndbapi/DbAsyncGenerator storage/ndb/test/ndbapi/DbCreate storage/ndb/test/ndbapi/ndbapi_slow_select storage/ndb/test/ndbapi/testBitfield storage/ndb/test/ndbapi/testLcp storage/ndb/test/ndbapi/testPartitioning storage/ndb/test/ndbapi/testReadPerf storage/ndb/test/ndbapi/test_event_merge storage/ndb/test/tools/listen_event to the ignore list
2006-01-11 19:49:38 +01:00
unknown
af6d402627 WL #1034
- add a bit more debug messages
- disable events.test for now due to a bug


mysql-test/r/events.result:
  fix result
mysql-test/t/disabled.def:
  make it disabled
mysql-test/t/events.test:
  disable show processlist
sql/event_executor.cc:
  a bit more debug messages
2006-01-11 19:31:21 +01:00
unknown
7355e7d58f 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-11 18:50:53 +01:00
unknown
bbed1ba99f Changes done from Jonas's review of pervious commit
mysql-test/t/ndb_dd_basic.test:
  Changed test.t1 back to t1 per Jonas's review
mysql-test/r/ndb_dd_basic.result:
  Changed test.t1 back to t1 per Jonas's review
2006-01-11 18:50:04 +01:00
unknown
21d71ab514 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-11 09:37:48 -08:00
unknown
1e3dfe04f6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 18:10:27 +01:00
unknown
2fc956fae9 WL #1034 (Internal CRON) pre-push updates
- various fixes of test cases
(hopefully the last pre-push update before the push)


mysql-test/include/system_db_struct.inc:
  extend test case to include testing for event system table
mysql-test/r/events.result:
  results of events test
mysql-test/r/system_mysql_db.result:
  more testing - add structure of event system table
mysql-test/t/events.test:
  test case for events (internal CRON)
mysql-test/t/system_mysql_db_fix.test:
  drop event table and leave the test database empty
scripts/mysql_create_system_tables.sh:
  add missing create table statement
scripts/mysql_fix_privilege_tables.sql:
  don't specify the database. this fixes a failing test case which creates the
  tables not on mysql but on a test database and then tests again mysql.
sql/event_executor.cc:
  if asked to stop -> stop.
2006-01-11 18:09:05 +01:00
unknown
0c64879d8c Test clean up and moving over from old clone.
mysql-test/t/ndb_dd_basic.test:
  Rename: mysql-test/t/ndb_basic_disk.test -> mysql-test/t/ndb_dd_basic.test
mysql-test/r/ndb_dd_basic.result:
  Rename: mysql-test/r/ndb_basic_disk.result -> mysql-test/r/ndb_dd_basic.result
mysql-test/t/ndb_dd_ddl.test:
  New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
mysql-test/r/ndb_dd_ddl.result:
  New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
2006-01-11 17:06:14 +01:00
unknown
db122ce4bf Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
2006-01-11 16:16:50 +01:00
unknown
8d1ea9e259 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-11 16:06:05 +01:00
unknown
c6993d67be Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root


sql/item_strfunc.cc:
  Auto merged
sql/password.c:
  Manual merge
2006-01-11 17:49:56 +03:00
unknown
31ff9e9a10 A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
rename sha1_* to mysql_sha1_*


include/sha1.h:
  rename sha1_* to mysql_sha1_*
mysys/sha1.c:
  rename sha1_* to mysql_sha1_*
sql/item_strfunc.cc:
  rename sha1_* to mysql_sha1_*
sql/password.c:
  rename sha1_* to mysql_sha1_*
2006-01-11 17:31:52 +03:00
unknown
f59bbb4f56 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/warnings/mysql-5.1-new
2006-01-11 17:20:44 +04:00
unknown
012cd81b03 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild2
2006-01-11 14:04:44 +01:00
unknown
d156a05244 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-11 13:55:04 +01:00
unknown
bfa1100074 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-01-11 13:53:35 +01:00
unknown
ca5f559464 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-11 13:06:20 +01:00
unknown
aa6d8dcc74 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/tmpbuild
2006-01-11 13:03:19 +01:00
unknown
51b3a1d178 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
2006-01-11 13:03:09 +01:00
unknown
a66eafd671 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works


sql/sql_show.cc:
  Auto merged
2006-01-11 12:51:17 +01:00
unknown
b8ce8ad1d5 WL #1034 (Internal CRON) pre-push fixes
after another merge fixes.


mysql-test/r/information_schema.result:
  WL #1034 (Internal CRON)
  fix result
mysql-test/r/mysqlcheck.result:
  WL #1034 (Internal CRON)
  fix result
mysql-test/r/sp.result:
  WL #1034 (Internal CRON)
  fix result
sql/event.cc:
  after fixes for WL1012 fix these to be able to compile
sql/event_timed.cc:
  after fixes for WL1012 fix these to be able to compile
sql/share/errmsg.txt:
  readd error messages removed during manual update
sql/sql_yacc.yy:
  fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
  merge. The merge wasn't good :(
2006-01-11 12:49:56 +01:00
unknown
e44150128e Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-01-11 15:45:03 +04:00
unknown
10f8e8f97c WL#1892 Post-review fix, removed index insertion in list at create 2006-01-11 12:41:38 +01:00
unknown
5c4a94b903 Fix handlerton alter_tablespace for example storage engine 2006-01-11 12:39:09 +01:00
unknown
8764e3c50d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2006-01-11 12:36:38 +01:00
unknown
daff646dd0 Restructered index management, to prepare for add/drop index (WL#1892) 2006-01-11 12:35:28 +01:00
unknown
2769f0dce6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-01-11 15:05:40 +04:00
unknown
5df64b263c Additional fix for wl#2506
mysql-test/extra/binlog_tests/ctype_cp932.test:
    fixed test case
mysql-test/r/binlog_stm_ctype_cp932.result:
    fixed test result
mysql-test/t/ctype_ucs.test:
    fixed test case
sql/sql_show.cc:
   Compilation with disabled partitioning is fixed
2006-01-11 15:04:18 +04:00
unknown
0d732a1470 manual merge
sql/Makefile.am:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-01-11 12:01:36 +01:00
unknown
a64008e13c Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b16095-mysql-5.1-new
2006-01-11 11:50:09 +01:00
unknown
641ce5e97e wl2723 - ndb opt. nr
mysql-test/t/rpl_multi_engine.test:
  merge fix
libmysqld/sql_tablespace.cc:
  New BitKeeper file ``libmysqld/sql_tablespace.cc''
mysql-test/r/ndb_basic_disk.result:
  New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
mysql-test/t/ndb_basic_disk.test:
  New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
sql/sql_tablespace.cc:
  New BitKeeper file ``sql/sql_tablespace.cc''
storage/ndb/src/kernel/blocks/OptNR.txt:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
storage/ndb/src/kernel/vm/mem.txt:
  New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
storage/ndb/tools/ndb_error_reporter:
  New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''
2006-01-11 11:35:25 +01:00
unknown
cea02f8c0d Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-11 11:24:57 +01:00
unknown
ecd1229a65 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2006-01-11 11:21:23 +01:00
unknown
113290fe2f Add comments that groups and describes the inits
client/mysqltest.c:
  Add comments
  Group inits logically
2006-01-11 11:10:58 +01:00
unknown
c5451d02ad Remove obsolete comment 2006-01-11 11:07:17 +01:00
unknown
b5fb52dc49 Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.
client/mysqltest.c:
  Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.
mysql-test/r/mysqltest.result:
  Correct test result, "At line 1" should be printed
2006-01-11 11:06:26 +01:00
unknown
53212ec5f5 Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
into  mysql.com:/usr/local/mysql/mysql-5.1-new


storage/ndb/src/common/portlib/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged
storage/ndb/config/common.mk.am:
  Manual merge.
2006-01-11 09:21:11 +01:00
unknown
4cacc3675c Bug#16095 (INSERT DELAYED crashes mysqld server):
Checking that binlog is open before calling binlog_query().


mysql-test/r/rpl_row_basic_11bugs.result:
  Result change caused by test change.
mysql-test/t/rpl_row_basic_11bugs.test:
  Ignoring format event since it contain the version number.
sql/sql_insert.cc:
  Debriding code.
  Checking that binlog is open before calling binlog_query().
2006-01-11 09:16:24 +01:00
unknown
7ea07618b0 Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-11 09:02:13 +01:00
unknown
a9d9054a10 Added support for CREATE TABLE AUTO_INCREMENT and added more tests. Also non-unique index scans of autoincrement not function.
mysql-test/r/archive.result:
  New Result file.
mysql-test/t/archive.test:
  New tests. Modifies old style 0 to NULL.
sql/ha_archive.cc:
  Added support for scanning non unique indexes. Added support for the AUTO_INCREMENT bit for CREATE TABLE
sql/ha_archive.h:
  Added variables for continueing scans of index_next
2006-01-10 22:54:34 -08:00
unknown
bbec7eda63 Disable code for "let" to assign each column from query to it's own variable
client/mysqltest.c:
  Disable "let" assign each column of query to own var
mysql-test/r/mysqltest.result:
  Remove test results for disabled test
mysql-test/t/mysqltest.test:
  Disable test for "let assigns each column of query to own var"
2006-01-11 00:24:57 +01:00
unknown
9d2def6896 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/MySQL/devel/5.0-bug15110


sql/sql_parse.cc:
  Auto merged
2006-01-11 02:10:59 +03:00
unknown
d4d29edb83 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.


BitKeeper/etc/ignore:
  added client/my_user.c libmysqld/my_user.c sql/my_user.c
client/Makefile.am:
  Use my_user.c in linking of mysqldump executable.
client/mysqldump.c:
  Fix for BUG#15110(mysqldump --triggers: does not include DEFINER clause)
include/Makefile.am:
  Add my_user.c
include/mysql_com.h:
  Introduce a constant for max user length.
libmysqld/Makefile.am:
  Add my_user.c
mysql-test/r/mysqldump.result:
  Update result file.
sql-common/Makefile.am:
  Add my_user.c
sql/Makefile.am:
  Add my_user.c
sql/sp.cc:
  Use constant for max user length.
sql/sp_head.cc:
  Use common function to parse user value.
sql/sql_acl.cc:
  Use constant for max user length.
sql/sql_parse.cc:
  Use constant for max user length.
sql/sql_show.cc:
  Use constant for max user length.
sql/sql_trigger.cc:
  Use constant for max user length.
include/my_user.h:
  A header file for parse_user().
sql-common/my_user.c:
  A new file for parse_user() implementation.
2006-01-11 02:07:40 +03:00
unknown
da73b0e137 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/nfstmp1/ingo/autopush-773/mysql-5.0
2006-01-10 21:57:47 +01:00
unknown
923b97736f WL #1034 (Internal CRON) pre-push update
fix errmsg.txt


sql/share/errmsg.txt:
  fix errmsg.txt so being able to build it
2006-01-10 21:47:12 +01:00
unknown
2c0f53d69c 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-10 21:43:09 +01:00