Commit graph

27559 commits

Author SHA1 Message Date
unknown
015f5bd553 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12267


sql/sql_yacc.yy:
  Auto merged
2005-10-25 22:04:20 +05:00
unknown
947de78a36 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14016-bug-4.1-mysql
2005-10-25 20:37:45 +04:00
unknown
b96dbef6fd Fix bug #14016 date_format() 2nd parameter was compared using case insensitive
collation

By default constant strings in second parameter of date_time() have case
insensitive collation. Because of this expressions date_format(f,'%m') and 
date_format(f,'%M') wrongly becomes equal, which results in choosing wrong 
column to sort by.

Now if second parameter of date_format() is constant then it's collation is 
changed to case sensitive.


sql/item_timefunc.cc:
  Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation.
  If second parameter of date_format() is constant then it's collation is changed to case sensitive.
mysql-test/r/date_formats.result:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation
mysql-test/t/date_formats.test:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation
2005-10-25 20:37:26 +04:00
unknown
e579fe3eee Merge deer.(none):/home/hf/work/mysql-5.0.13820
into deer.(none):/home/hf/work/mysql-5.0.12267


sql/item_func.cc:
  Auto merged
2005-10-25 21:10:58 +05:00
unknown
57982bcc56 Merge deer.(none):/home/hf/work/mysql-5.0.13667
into deer.(none):/home/hf/work/mysql-5.0.12267


sql/sql_parse.cc:
  Auto merged
2005-10-25 21:09:37 +05:00
unknown
821107cfd1 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12267
2005-10-25 21:08:22 +05:00
unknown
d58f2bdfd7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13392-bug-4.1-mysql
2005-10-25 20:04:44 +04:00
unknown
45369edf57 Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATE
VALUES() can only refer to table insert going to. 
But Item_insert_value::fix_fields() were passing to it's arg full table list,
This results in finding second column which shouldn't be found, and
failing with error about ambiguous field.

Item_insert_value::fix_fields() now passes only first table of full table
list.


sql/item.cc:
  Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation.
  If second parameter of date_format() is constant then it's collation is changed to case sensitive.
mysql-test/r/insert_select.result:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation
mysql-test/t/insert_select.test:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation
2005-10-25 20:04:12 +04:00
unknown
54d1558c2f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/acurtis/mysql-5.0-noraid.2


sql/sql_yacc.yy:
  Auto merged
2005-10-25 08:18:32 -07:00
unknown
e1e02e6877 Deprecate RAID create options 2005-10-25 08:15:37 -07:00
unknown
613b20b331 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-10-25 07:29:40 -07:00
unknown
73b4d7ebed fix issue with IM that causes commandlines that are executed to be incorrect.
server-tools/instance-manager/instance.cc:
  terminate the new line buffer so our strcat's will work
2005-10-25 09:29:39 -05:00
unknown
eba555b3f6 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12267


sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-10-25 19:08:33 +05:00
unknown
a345629ac6 Imported fixes from 4.1 and 5.0 to 4.0. 2005-10-25 16:56:25 +03:00
unknown
562bfb2d57 Fix for BUG#14272: Don't run index scan when we should use quick select.
This could cause failures because there are table handlers (like federated)
that support quick select scanning but do not support index scanning.
 


mysql-test/t/disabled.def:
  Enabled federated testcase.
2005-10-25 16:34:03 +04:00
unknown
48765db2e5 Fix for bug #14290: wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.
sql/sql_show.cc:
  Fix for bug #14290: wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.
  adjust CHARACTER_MAXIMUM_LENGTH value for text fields.
2005-10-25 17:22:58 +05:00
unknown
b4e8705bdc Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-10-25 13:59:25 +02:00
unknown
abd77bc563 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b14207
2005-10-25 16:06:46 +05:00
unknown
cabb72f27f Bug#13347: empty result from query with like and cp1250 charset
ctype-win1250ch.c:
  Like range prefix tables were wrong.
ctype_cp1250_ch.result, ctype_cp1250_ch.test:
  Adding test case.


strings/ctype-win1250ch.c:
  Bug#13347: empty result from query with like and cp1250 charset
  Like range prefix tables were wrong.
mysql-test/t/ctype_cp1250_ch.test:
  Adding test case.
mysql-test/r/ctype_cp1250_ch.result:
  Adding test case.
2005-10-25 14:49:04 +05:00
unknown
10a889a577 Converted mysys/base64.c into C code (not C++).
mysys/base64.c:
  Converted into C code (not C++).
2005-10-25 11:30:43 +02:00
unknown
6e49a48a25 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


myisam/mi_check.c:
  Auto merged
2005-10-25 12:12:10 +03:00
unknown
b31dd53c85 Changed some dbug print options.
myisam/mi_check.c:
  Changed print style for keyoffset.
myisam/mi_delete.c:
  Changed print style for keypos.
2005-10-25 12:11:31 +03:00
unknown
6416abfddb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13037
2005-10-25 13:04:46 +04:00
unknown
5ed3b0b3d7 Fix for BUG#13037: undefined variable in IF cause erroneous error-message.
mysql-test/r/sp-error.result:
  Results for the test case for BUG#13037.
mysql-test/t/sp-error.test:
  Test case for BUG#13037.
sql/sql_base.cc:
  Polishing: use constant.
sql/sql_class.cc:
  Reset THD::where in THD::cleanup_after_query();
  Polishing: use the constant (THD::DEFAULT_WHERE).
sql/sql_class.h:
  Introduce a constant for the default value of THD::where.
2005-10-25 13:02:48 +04:00
unknown
786b5e954c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b10303
2005-10-25 12:19:13 +05:00
unknown
10ed7b975a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
2005-10-24 23:57:15 -07:00
unknown
8fdc8d1356 Additional test request by Jonas. We check pushdown conditions for GEOM types.
mysql-test/r/ndb_gis.result:
  Result file change to check pushdown conditions.
mysql-test/t/ndb_gis.test:
  pushdown conditions now checked for geom  types
mysql-test/r/innodb_gis.result:
  New BitKeeper file ``mysql-test/r/innodb_gis.result''
2005-10-24 23:55:44 -07:00
unknown
84ece2e052 This patch add support for storing Geometry types to Archive, Innodb, NDB, and BDB.
sql/ha_archive.h:
  Adding support for Geometry type to archive.
sql/ha_berkeley.cc:
  Adding geometry support to berkely
sql/ha_innodb.cc:
  Adding geometry support to Innodb.
sql/ha_ndbcluster.cc:
  Adding Geometry support to NDB.
mysql-test/include/gis_generic.inc:
  New BitKeeper file ``mysql-test/include/gis_generic.inc''
mysql-test/r/archive_gis.result:
  New BitKeeper file ``mysql-test/r/archive_gis.result''
mysql-test/r/bdb_gis.result:
  New BitKeeper file ``mysql-test/r/bdb_gis.result''
mysql-test/r/ndb_gis.result:
  New BitKeeper file ``mysql-test/r/ndb_gis.result''
mysql-test/t/archive_gis.test:
  New BitKeeper file ``mysql-test/t/archive_gis.test''
mysql-test/t/bdb_gis.test:
  New BitKeeper file ``mysql-test/t/bdb_gis.test''
mysql-test/t/innodb_gis.test:
  New BitKeeper file ``mysql-test/t/innodb_gis.test''
mysql-test/t/ndb_gis.test:
  New BitKeeper file ``mysql-test/t/ndb_gis.test''
2005-10-24 23:20:39 -07:00
unknown
215602cbe3 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-13832


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-10-25 09:01:47 +03:00
unknown
3efd251ae3 Fix for BUG#13832 - Unknown column t1.a in 'on clause'.
The cause for the bug is that the priorities of all rules/terminals
that process the FROM clause are not fully specified, and the
parser generator produces a parser that doesn't always parse
the FROM clause so that JOINs are left-associative. As a result
the final join tree produced by the parser is incorrect, which
is the cause for subsequent name resolution to fail.


mysql-test/r/select.result:
  Test for BUG#13832.
mysql-test/t/select.test:
  Test for BUG#13832.
sql/sql_yacc.yy:
  Fix for BUG#13832 - Unknown column t1.a in 'on clause'.
  
  List all join-related operators as having lower priority
  than the join operands to make the parser process join-
  related productions from left to right.
2005-10-25 09:00:57 +03:00
unknown
ab27a943b1 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-25 03:00:09 +02:00
unknown
133ea93bc4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-25 02:36:51 +02:00
unknown
2937201b88 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
into mysql.com:/Users/kent/mysql/bk/mysql-4.0
2005-10-25 02:29:08 +02:00
unknown
e17b176e9b Makefile.am:
Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num


Makefile.am:
  Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num
2005-10-25 02:27:55 +02:00
unknown
8d6634c9e0 Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization
heap/_check.c:
  Change arguments to ha_key_cmp
heap/hp_create.c:
  Change arguments to ha_key_cmp
include/my_base.h:
  Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument
myisam/mi_check.c:
  Change arguments to ha_key_cmp
myisam/mi_rnext_same.c:
  Change arguments to ha_key_cmp
myisam/mi_search.c:
  Change arguments to ha_key_cmp
myisam/mi_write.c:
  Change arguments to ha_key_cmp
myisammrg/myrg_queue.c:
  Change arguments to ha_key_cmp
mysys/my_handler.c:
  Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument
  (This removes an if in a loop at the expensive of an int on the stack)
sql/records.cc:
  Simplify new rr_index() code
  Create common error handling function for rr_() functions.
  Remove loop from rr_index() as handler::index_next() can never return HA_ERR_RECORD_DELETED
sql/sql_load.cc:
  Simplify
sql/sql_update.cc:
  Simplify code
  Fixed bug when one is updating an index column that could be used with ORDER BY
sql/structs.h:
  Removed not needed structure element
2005-10-25 02:27:40 +03:00
unknown
bd3ec22f85 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
2005-10-25 00:37:08 +02:00
unknown
2e4b962d97 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype


sql/log_event.h:
  Auto merged
2005-10-25 00:23:14 +02:00
unknown
90573decba Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-10-25 00:16:51 +02:00
unknown
d63b12d909 Fixed enum numbering, patch 2
sql/log_event.h:
  One enum value per line
  Fixed a mistake
  Added values to every line for strange compilers
2005-10-24 23:09:14 +02:00
unknown
ee46cce804 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
2005-10-25 00:57:23 +04:00
unknown
1d0d71b092 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
2005-10-25 00:55:31 +04:00
unknown
33d5d4ad99 Fix for BUG#13095: Cannot create VIEWs in prepared statements
- allow CREATE VIEW as well as DROP VIEW to use in prepared statements;
  - fix CREATE VIEW implementation to make it work in prepared statements.


mysql-test/r/sp.result:
  Results file for the test case for BUG#13095.
mysql-test/t/sp.test:
  Test case for BUG#13095.
sql/sql_lex.h:
  Added a variable to remember start of whole CREATE VIEW statement
  as well as start of its SELECT part.
sql/sql_prepare.cc:
  Allow CREATE VIEW and DROP VIEW to use in prepared statements.
sql/sql_view.cc:
  Use stored start of whole CREATE VIEW statement instead of thd->query,
  which differs from the original when prepared statement is executing.
sql/sql_yacc.yy:
  Remember start of whole CREATE VIEW statement as well as start of its
  SELECT part.
2005-10-25 00:54:04 +04:00
unknown
49d0a3cc31 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-24 13:52:26 -07:00
unknown
e430912167 Disabled federated test, added then removed
federated.disabled and instead using disabled.def (per
comments in this commit)

disabled.def:
  disabled federated until bug 14272 is fixed.
.del-federated.disabled~9e4cca59f547174d:
  Delete: mysql-test/t/federated.disabled
federated.disabled:
  New BitKeeper file ``t/federated.disabled'' to disable federated test until
  Bug 14272 is fixed.
  new file


BitKeeper/deleted/.del-federated.disabled~9e4cca59f547174d:
  Delete: mysql-test/t/federated.disabled
mysql-test/t/disabled.def:
  disabled federated until bug 14272 is fixed.
2005-10-24 13:51:05 -07:00
unknown
d91f4dead8 BUG#11704: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in
OPTIMIZE TABLE.


sql/ha_innodb.cc:
  Fix for BUG#11704: "Found locks from different thread" warnings:
  The source of warnings was this scenario in OPTIMIZE:
    thr1: lock table with TL_WRITE_ONLY (InnoDB converts lock to TL_WRITE_ALLOW_WRITE)
    thr2: (UPDATE command) obtains a TL_WRITE_ALLOW_WRITE lock
    thr1: call mysql_lock_abort(). This function sets type of thr'1 lock to TL_WRITE_ONLY
    thr2: try to release thr2's lock. See two locks: TL_WRITE_ONLY, TL_WRITE_ALLOW_WRITE 
          and produce a warning.
  
  The fix: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in
  OPTIMIZE TABLE.
2005-10-25 00:27:15 +04:00
unknown
84626e7017 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2005-10-24 20:03:40 +02:00
unknown
b6975a8306 Reducing risk for incorrect merges. Since we are multiple teams working on
different features, adding numbering to enums reduce the risk that code will
be merged incorrectly.  This particular enum must have fixed values to ensure
that an upgraded server always can read old logs.  I added this, since I 
noticed the incorrect order in the RBR clone.


sql/log_event.h:
  Added numbering of enum values
2005-10-24 19:06:32 +02:00
unknown
9b20b6c955 Fixes bug #14137. Converts charsets_dir path to underlying
system representation.


sql/mysqld.cc:
  Added code to convert charsets_dir path to system representation.
2005-10-24 20:08:56 +04:00
unknown
e897eb3492 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-24 17:23:45 +02:00
unknown
19758ce635 Fix for dropping a table with frm file consisting of "junk"
mysql-test/r/show_check.result:
  Move result to correct place
sql/sql_table.cc:
  Reset error if table_type is unknown. ie. the .frm file could not be opened
2005-10-24 15:05:06 +02:00