1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-01 17:39:21 +03:00
Commit Graph

11397 Commits

Author SHA1 Message Date
unknown
5475703bad This problem has already been fixed by one of the previous changes.
Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci


mysql-test/r/ctype_latin1.result:
  Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
mysql-test/t/ctype_latin1.test:
  Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
2006-04-06 10:51:23 +05:00
unknown
cabe285995 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-05 14:06:34 -07:00
unknown
ef4309284d Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/opt_sum.cc:
  Auto merged
2006-04-05 14:00:54 -07:00
unknown
73fd451c68 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug5390


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/share/charsets/Index.xml:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2006-04-05 20:35:36 +02:00
unknown
509cb91e82 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-05 19:47:36 +05:00
unknown
f3a4f0afff Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/share/charsets/Index.xml:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2006-04-05 19:00:02 +05:00
unknown
0d0e4c422f Merge mysql.com:/home/mydev/mysql-5.0-bug5390
into  mysql.com:/home/mydev/mysql-5.1-bug5390


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/share/charsets/Index.xml:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Manual merge from 5.0.
2006-04-05 15:00:28 +02:00
unknown
6fa5591544 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390


sql/table.h:
  Auto merged
2006-04-05 11:38:16 +02:00
unknown
0e97b724b6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2006-04-05 10:08:38 +02:00
unknown
539986bb1e Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new
2006-04-05 09:10:31 +02:00
unknown
b3b626c31c Bug #13601: Wrong int type for bit
The wrong value was being reported as the field_length for BIT
  fields, resulting in confusion for at least Connector/J. The
  field_length is now always the number of bits in the field, as
  it should be.


mysql-test/r/type_bit.result:
  Add new results
mysql-test/r/type_bit_innodb.result:
  Add new results
mysql-test/t/type_bit.test:
  Add new regression test
mysql-test/t/type_bit_innodb.test:
  Add new regression test
sql/field.cc:
  Fix Field_bit->field_length to actually report the display width, and
  store the bytes stored in the rec in the new bytes_in_rec member.
sql/field.h:
  Fix Field_bit::field_length to store the correct value, adding
  Field_bit::bytes_in_rec to remember the number of bytes used for
  storing the value. Remove Field_bit_as_char::create_length, as it
  is now redundant.
sql/ha_ndbcluster.cc:
  Handle field_length of Field_bit actually being the display width (# of bits).
sql/key.cc:
  Fix inappropriate use of field->field_length for BIT field.
2006-04-04 17:54:58 -07:00
unknown
07302c6007 Merge
VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
VC++Files/storage/bdb/bdb.vcproj:
  Auto merged
VC++Files/storage/innobase/innobase.vcproj:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged
2006-04-04 23:37:44 +02:00
unknown
0fae7e3b01 Bug#18265: mysql client: No longer right-justifies numeric columns
Also fixes a new bug for which "NULL" wasn't printed (because the 
data it represents has length zero).  (Discovered my Paul DuBois.)


client/mysql.cc:
  Cleaned up the interactive-session table-printing function.
  
  - No longer rely on the length of the data to pad column boundries.
  - Be smarter about how we detect if the column is NULL.
  - Document how multibyte characters affect the output printing.
  - Use more descriptive variable names.
  
  More importantly, (re-)add these features that were crippled in an
  earlier change:
  - Print "NULL".
  - Right-justify numbers.
mysql-test/r/mysql.result:
  Updated old result and added new case.
mysql-test/t/mysql.test:
  Added new test case.
2006-04-04 17:35:07 -04:00
unknown
ec984b8c9d Fixed BUG#13683: INSERT DELAYED into a view creates an infinite loop.
The bug was caused by wrong behaviour of mysql_insert() which in case
 of INSERT DELAYED into a view exited with thd->net.report_error == 0.
 This blocked error reporting to the client which started waiting
 infinitely for response to the query.


mysql-test/r/insert.result:
  Fixed results for the added test case.
mysql-test/t/insert.test:
  Added test case.
sql/sql_insert.cc:
  Fixed BUG#13683: INSERT DELAYED into a view creates an infinite loop.
   Changed mysql_insert(): delayed_get_table() applied to a view exits
   with ER_WRONG_OBJECT error (and with thd->net.report_error == 1) and
   in this case we must just exit from mysql_insert().  Prior to this
   change, instead of exiting open_and_lock_tables() was invoked which
   cleared thd->net.report_error to zero and caused the bug.
2006-04-05 01:09:07 +04:00
unknown
e77888f530 Fixed bug #18237.
The code in opt_sum_query that prevented the COUNT/MIN/MAX 
optimization from being applied to outer joins  was not adjusted 
after introducing nested joins. As a result if an outer join
contained a reference to a view as an inner table the code of
opt_sum_query missed the presence of an on expressions and
erroneously applied the mentioned optimization.


mysql-test/r/view.result:
  Added a test case for bug #18237.
mysql-test/t/view.test:
  Added a test case for bug #18237.
2006-04-04 12:55:02 -07:00
unknown
af66d20c8e Merge
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
2006-04-04 20:25:23 +02:00
unknown
676eb6837a Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new
2006-04-04 19:44:03 +02:00
unknown
7b61256f68 Merge mysql.com:/home/timka/mysql/src/5.0-tmp-merge
into  mysql.com:/home/timka/mysql/src/5.1-merge


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
2006-04-04 14:35:17 +03:00
unknown
3d34946e76 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-04 04:35:16 -07:00
unknown
b92ca9ba48 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-bug18659-pre
2006-04-04 15:35:14 +04:00
unknown
0a2cd4bb9f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2006-04-04 15:42:32 +05:00
unknown
ff3495c414 After merge fix for Bug#12076 --with-extra-charsets has no effect
mysql-test/r/information_schema.result:
  IS_COMPILED is not determenistic
mysql-test/t/information_schema.test:
  IS_COMPILED is not determenistic
strings/conf_to_src.c:
  Adding dumping of extra 5.0 fields
strings/ctype-extra.c:
  Recreating sources according to 5.0 XML files using conf_to_src.
2006-04-04 15:40:42 +05:00
unknown
6896392164 Bug #18490 cluster: binlog events lost on remote mysqld (asynchronous) 2006-04-04 11:25:02 +02:00
unknown
90c926d99a Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
2006-04-04 09:51:06 +02:00
unknown
a1c46189b8 Add option --debugger=NAME and --client-debugger=NAME.
Add support for "--debugger=windbg" and "--debugger=vcexpress"
2006-04-04 09:49:32 +02:00
unknown
57b67a742c Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-03 23:26:31 -07:00
unknown
9bef795e3a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0


sql/item.cc:
  Auto merged
2006-04-03 21:07:27 -07:00
unknown
a26509aead BUG#18659: In get_part_iter_for_interval_via_walking(), when we need to
obtain partition number, call partition_info->get_part_partition_id() when
the table has subpartitions, and get_partition_id() otherwise. (The bug
was that we were always doing the latter)


mysql-test/r/partition_pruning.result:
  Testcase for BUG#18659
mysql-test/t/partition_pruning.test:
  Testcase for BUG#18659
2006-04-04 00:52:14 +04:00
unknown
62264b1392 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new
2006-04-03 15:31:12 +02:00
unknown
b5ca723613 Merge
scripts/mysql_install_db.sh:
  Auto merged
2006-04-03 03:52:22 +02:00
unknown
2574445ef1 Makefile.am:
Distribute mysql-test-run.pl


mysql-test/Makefile.am:
  Distribute mysql-test-run.pl
2006-04-03 03:47:28 +02:00
unknown
6de1d9d378 Makefile.am:
Install Perl mysql-test-run into test directory


mysql-test/Makefile.am:
  Install Perl mysql-test-run into test directory
2006-04-02 02:10:41 +02:00
unknown
a5abc598e5 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-04-01 02:57:56 -08:00
unknown
f0bfea2bb0 Added a test case for bug #16504.
Results changed after the bug fix.
2006-03-31 23:12:05 -08:00
unknown
9eccbdaa88 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-520ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug13520


sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged
2006-04-01 00:59:25 -05:00
unknown
5ef6e903a4 Fixed bug #16504.
Multiple equalities were not adjusted after reading constant tables.
It resulted in neglecting good index based methods that could be
used to access of other tables.


mysql-test/r/having.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/r/select.result:
  Added a test case for bug #16504.
mysql-test/r/subselect.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/r/varbinary.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/t/select.test:
  Added a test case for bug #16504.
sql/item.cc:
  Fixed bug #16504.
  An Item_equal object may contain only a constant member.
  It may happen after reading constant tables.
sql/item_cmpfunc.cc:
  Fixed bug #16504.
  Added method Item_equal::check_const that check appearance of new 
  constant items in a multiple equality.
sql/item_cmpfunc.h:
  Fixed bug #16504.
  Added method Item_equal::check_const that check appearance of new 
  constant items in a multiple equality.
sql/sql_select.cc:
  Fixed bug #16504.
  Adjusted multiple equalities after reading constant tables.
  Fixed a few typo in comments.
2006-03-31 21:26:17 -08:00
unknown
a6871e2713 Merge 2006-04-01 05:53:37 +02:00
unknown
2a4e2e8da2 Makefile.am:
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)


support-files/mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
mysql-test/Makefile.am:
  Let "make install" install mysql-test-run.pl
2006-04-01 05:44:10 +02:00
unknown
561c21c3f9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18025-r2


sql/sql_partition.cc:
  Auto merged
2006-03-31 22:26:04 +04:00
unknown
c1a3261e60 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug17631


sql/ha_partition.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-03-31 11:42:12 -06:00
unknown
b81c6cdd21 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new
2006-03-31 18:27:08 +02:00
unknown
29f5013225 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-31 21:17:38 +05:00
unknown
1658694741 Merge
scripts/mysqld_safe.sh:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
2006-03-31 15:26:51 +02:00
unknown
201a144156 Merge mysql.com:/usr/home/bar/mysql-5.0.1.2107.1.1
into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/cast.result:
  Auto merged
sql/field.cc:
  Auto merged
2006-03-31 17:38:00 +05:00
unknown
9568d1f2aa Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new
2006-03-31 13:43:20 +02:00
unknown
bb4007a7c5 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new


sql/handler.cc:
  Auto merged
2006-03-31 13:34:30 +02:00
unknown
dc05f1954f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18025-r2


sql/opt_range.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
2006-03-31 15:20:00 +04:00
unknown
457510903f Fix for BUG#18025: Wrong query results because of bugs in partition pruning:
- Fix typo bug in SEL_ARG::is_singlepoint()
 - In set_up_range_analysis_info(), treat MEDIUMINT as enumerable type just like other integer types


mysql-test/r/partition_pruning.result:
  Testcase for BUG#18025
mysql-test/t/partition_pruning.test:
  Testcase for BUG#18025
sql/opt_range.cc:
  BUG#18025: Fix a typo bug in SEL_ARG::is_singlepoint()
sql/sql_partition.cc:
  BUG#18025: In set_up_range_analysis_info(), treat MEDIUMINT as enumerable type just like other integer types.
2006-03-31 15:17:15 +04:00
unknown
085aa5c99e Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-16710


mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
2006-03-31 12:39:33 +03:00
unknown
a01d48f92e Fix for BUG#16710.
The bug was due to a missed case in the detection of whether an index
can be used for loose scan. More precisely, the range optimizer chose
to use loose index scan for queries for which the condition(s) over
an index key part could not be pushed to the index together with the
loose scan.

As a result, loose index scan was selecting the first row in the
index with a given GROUP BY prefix, and was applying the WHERE
clause after that, while it should have inspected all rows with
the given prefix, and apply the WHERE clause to all of them.

The fix detects and skips such cases.


mysql-test/r/group_min_max.result:
  Added test for BUG#16710.
mysql-test/t/group_min_max.test:
  Added test for BUG#16710.
sql/item.cc:
  Added new method [Item | Item_field]::find_item_in_field_list_processor.
sql/item.h:
  Added new method [Item | Item_field]::find_item_in_field_list_processor.
sql/opt_range.cc:
  Handle the case when there is no MIN/MAX aggregate function, and a
  keypart of the index being considered, that is after the GROUP BY
  prefix, is used in the WHERE clause and the condition where it is
  used cannot be pushed to the index.
  If this is the case, we rule out this index.
2006-03-31 12:34:28 +03:00