Commit graph

2882 commits

Author SHA1 Message Date
unknown
f72cec1b1c Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-19 18:42:01 +02:00
unknown
4f8bbaeda0 Bug #4769 - ft in subqueries 2004-08-19 18:40:15 +02:00
unknown
cc6d65b8d8 Bug 4531: unique key prefix interacts poorly with utf8
Check HEAP+HASH, binary collation
2004-08-19 16:07:18 +05:00
unknown
cba27e4a91 Fix trailing spaces behaviour for binary collation. 2004-08-19 15:21:35 +05:00
unknown
7fbc796d4a Bug#4521: unique key prefix interacts poorly with utf8.
Fix for binary collations for MyISAM and HEAP BTREE.
This patch also changes trailing spaces behaviour for
binary collations. Binary collations now have PAD 
characteristic too.
2004-08-19 15:15:10 +05:00
unknown
6cf9fd7cdb ctype_utf8.test, ctype_utf8.result:
Typo fix


mysql-test/r/ctype_utf8.result:
  Typo fix
mysql-test/t/ctype_utf8.test:
  Typo fix
2004-08-19 15:00:55 +05:00
unknown
0281941158 Bug#5081: UCS2 fields are filled with '0x2020' after extending field length 2004-08-19 11:59:33 +05:00
unknown
ae2bf6275e after merge fixes
strings/my_vsnprintf.c:
  %.#s support in my_vsnprintf
BitKeeper/etc/ignore:
  Added EXCEPTIONS-CLIENT to the ignore list
2004-08-19 03:02:09 +02:00
unknown
945625ebaa manually merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0dbg.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/conf_to_src.c:
  Auto merged
libmysql/dll.c:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_uint.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2004-08-18 19:57:55 +02:00
unknown
0c6b96658e Bug 4937: different date -> string conversion when using
SELECT ... UNION and INSERT ... SELECT ... UNION
2004-08-18 14:46:31 +02:00
unknown
d8e4cad72e func_like.result:
LIKE crashed mysqld for binary collations in some cases


mysql-test/r/func_like.result:
  LIKE crashed mysqld for binary collations in some cases
2004-08-18 12:11:26 +05:00
unknown
4e9bb7a9a9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-root
2004-08-18 02:16:43 +04:00
unknown
5a7dd14edf Fix for bug#4488: sign-aware equality check
mysql-test/r/range.result:
  Fix for bug#4488: more tests
mysql-test/t/range.test:
  Fix for bug#4488: more tests
2004-08-17 02:59:24 +04:00
unknown
952f456e83 ctype_utf8.test:
Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.


mysql-test/t/ctype_utf8.test:
  Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.
2004-08-16 19:58:50 +05:00
unknown
20160a1084 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-15 18:58:02 +02:00
unknown
24e03b49a2 Adding test cases for the example storage engine (so that you can test to see if it was built correctly). 2004-08-13 17:14:36 -07:00
unknown
2d8f4a61bf Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/tina-4.1


acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
configure.in:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-08-13 16:27:17 -07:00
unknown
a5a4ed90f5 Merge
myisam/mi_key.c:
  SCCS merged
2004-08-13 18:31:30 +02:00
unknown
b6f6d5b2fd apply UNIQUE constrain correctly for multi-byte charsets
only MyISAM is fixed


include/m_ctype.h:
  my_charpos() macro
myisam/mi_key.c:
  apply UNIQUE constrain correctly for multi-byte charsets
mysql-test/r/binary.result:
  new test
mysql-test/r/key.result:
  apply UNIQUE constrain correctly for multi-byte charsets
mysql-test/t/binary.test:
  new test
mysql-test/t/func_gconcat.test:
  make test to pass w/o InnoDB
mysql-test/t/key.test:
  apply UNIQUE constrain correctly for multi-byte charsets
2004-08-13 18:29:25 +02:00
unknown
467f5956eb CSC issue # 3299 fix:
ENUM and SET type didn't compute their length correctly.
That showed up for example while converting into a CHAR column.
2004-08-13 19:06:24 +05:00
unknown
eddc4fdeb5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-13 14:34:51 +02:00
unknown
55cc6be43c Added support for NULL in unique index 2004-08-13 13:51:18 +02:00
unknown
e2cfe7b607 ctype_utf8.result, ctype_utf8.test, item_strfunc.cc:
LEFT() didn't work well in some cases.


sql/item_strfunc.cc:
  LEFT() didn't work well in some cases.
mysql-test/t/ctype_utf8.test:
  LEFT() didn't work well in some cases.
mysql-test/r/ctype_utf8.result:
  LEFT() didn't work well in some cases.
2004-08-13 15:04:10 +05:00
unknown
da60f1973d ctype_utf8.result, ctype_utf8.test, mi_key.c:
bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.


myisam/mi_key.c:
  bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
mysql-test/t/ctype_utf8.test:
  bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
mysql-test/r/ctype_utf8.result:
  bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
2004-08-13 12:32:27 +05:00
unknown
16987e1ce2 ctype_ucs.result, ctype_ucs.test, item.cc:
#5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings


sql/item.cc:
  #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
mysql-test/t/ctype_ucs.test:
  #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
mysql-test/r/ctype_ucs.result:
  #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
2004-08-13 11:13:56 +05:00
unknown
89987fa104 This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file.
acconfig.h:
  Adding HAVE CSV rule
acinclude.m4:
  Build option of csv engine
configure.in:
  Update for building CSV
sql/Makefile.am:
  Added files for CSV build
sql/handler.cc:
  Needed options for CSV to be created.
sql/handler.h:
  CSV type engine enum.
sql/mysql_priv.h:
  Addition of the have_csv_db variable.
sql/mysqld.cc:
  Code to show csv option.
sql/set_var.cc:
  Adding have show variables for both csv and example.
2004-08-12 20:57:18 -07:00
unknown
4dfe16c287 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
2004-08-13 02:27:21 +05:00
unknown
a88902033a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0


sql/sql_select.cc:
  Auto merged
2004-08-13 02:25:50 +05:00
unknown
fe61e5d2e4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-12 20:31:00 +02:00
unknown
4a0f586bc7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-12 20:43:14 +05:00
unknown
6473366f2a #4521: unique key prefix interacts poorly with utf8
Fix for MyISAM with prefix compressed keys.
2004-08-12 20:39:24 +05:00
unknown
7e5247aade fixed Bug #4358 Problem with HAVING clause that uses alias
from the select list and TEXT field 

make setup_copy_fields to insert Item_copy_string for blobs in 
the beginning of the copy_funcs (push_back instead of push_front)

the thing is that Item_copy_string::copy for function can call 
Item_copy_string::val_int for blob via Item_ref.
But if Item_copy_string::copy for blob isn't called before, 
it's value will be wrong.

So all the Item_copy_string::copy for blobs should be called before 
Item_copy_string::copy for functions.


mysql-test/r/having.result:
  added test case for
  Bug #4358 Problem with HAVING clause that uses
              alias from the select list and TEXT field
mysql-test/t/having.test:
  added test case for
  Bug #4358 Problem with HAVING clause that uses
              alias from the select list and TEXT field
sql/sql_select.cc:
  make setup_copy_fields to insert Item_copy_string for blobs in 
  the beginning of the copy_funcs (push_back instead of push_front)
  
  the thing is that Item_copy_string::copy for function can call 
  Item_copy_string::val_int for blob via Item_ref.
  But if Item_copy_string::copy for blob isn't called before, 
  it's value will be wrong.
  
  So all the Item_copy_string::copy for blobs should be called before 
  Item_copy_string::copy for functions.
  
  fixed 
  Bug #4358 Problem with HAVING clause that
             uses alias from the select list and TEXT field
2004-08-12 20:37:31 +05:00
unknown
fe19bd924d Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-12 13:13:22 +02:00
unknown
f6e5d6ce9d Fix for BUG#4678 "mysql-test-run fails on grant_cache":
do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root')
(such behaviour is a feature of mysql_real_connect(), see the manual).


mysql-test/t/grant_cache.test:
  do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root').
sql/slave.cc:
  a comment
2004-08-12 13:12:09 +02:00
unknown
ab9b33597e Added initial sorting in order to make test case repeatable. 2004-08-12 16:02:12 +05:00
unknown
cbfac1be39 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-12 12:29:41 +02:00
unknown
1b666071d1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b4898
2004-08-12 14:59:33 +05:00
unknown
55f964e45c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4878
2004-08-12 14:50:29 +05:00
unknown
6bd68efaf6 A test case (bug #4898: User privileges depending on ORDER BY Settings of table db) 2004-08-12 14:49:16 +05:00
unknown
11b2abb20d Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
2004-08-12 14:21:35 +06:00
unknown
caa525d8cc Added tests for fix of bug#4730 2004-08-12 10:15:53 +02:00
unknown
a7d2c573f1 A fix (Bug #4878: Service crashes on query execution) 2004-08-12 11:28:39 +05:00
unknown
acf5df3a6d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411


BitKeeper/etc/logging_ok:
  auto-union
2004-08-11 23:26:44 +01:00
unknown
4f08c4b726 Bug#4411
Fix for server hang bug


mysql-test/r/heap.result:
  Bug#4411
    Test for server hang bug
mysql-test/t/heap.test:
  Bug#4411
    Test for server hang bug
sql/opt_sum.cc:
  Bug#4411
    Allow code to exit the loop.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-11 23:24:36 +01:00
unknown
4c6f6c60d5 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-11 23:44:08 +02:00
unknown
ab64eb64af Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflow
include/my_global.h:
  uint_max constants moved from sql_analyse.cc
sql/sql_analyse.cc:
  cleanup
2004-08-11 23:43:41 +02:00
unknown
b37a736110 Fix for BUG#4488: first portion: sign aware '<' and '>' comparisons. 2004-08-11 23:08:20 +04:00
unknown
f54f4b2c69 ctype_uca.test, ctype_uca.result, ctype-uca.c:
Slovak collation didn't work: typo fix in the tailoring rules


strings/ctype-uca.c:
  Slovak collation didn't work: typo fix in the tailoring rules
mysql-test/r/ctype_uca.result:
  Slovak collation didn't work: typo fix in the tailoring rules
mysql-test/t/ctype_uca.test:
  Slovak collation didn't work: typo fix in the tailoring rules
2004-08-11 18:06:20 +05:00
unknown
5ee446d9d0 - fixed non-predictable floating point results in func_math by adding
format() around them (as suggested by serg)
2004-08-11 13:11:59 +02:00
unknown
9ae2a1bd01 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-11 12:38:11 +02:00