1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-13 01:01:44 +03:00

6282 Commits

Author SHA1 Message Date
unknown
c95ce34ed5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 20:30:57 +02:00
unknown
8ecae2e65c Fix merge of func_str tests (accidently duplicated a test).
mysql-test/t/func_str.test:
  Remove duplicated test that crept in during merge
mysql-test/r/func_str.result:
  Update results
2005-02-02 09:05:52 -08:00
unknown
33e74b1427 Merge fixes for #8248, #5569.
mysql-test/r/func_str.result:
  Update results
mysql-test/t/func_str.test:
  Merge test
sql/item_strfunc.cc:
  Set charset on output string
sql/item_strfunc.h:
  Merge
sql/sql_parse.cc:
  Merge
vio/viosocket.c:
  Merge
2005-02-02 08:21:11 -08:00
unknown
f684332934 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-02-02 19:55:39 +05:00
unknown
5de673901f WL#964
renamed client_test to mysql_client_test
    fixed name for lstat in removef()
    added mysql-debug.exe for Windows
    added enviroment variable MYSQL_CLIENT_TEST
    added cleaning directory before tests
    New BitKeeper file ``VC++Files/tests/mysql_client_test.dsp''
    Delete: VC++Files/tests/client_test.dsp



BitKeeper/deleted/.del-client_test.dsp~659d0237a4c12ea1:
  Delete: VC++Files/tests/client_test.dsp
VC++Files/mysql.dsw:
  renamed client_test to mysql_client_test
mysql-test/my_manage.c:
  fixed name for lstat in removef()
mysql-test/mysql_test_run_new.c:
  added mysql-debug.exe for Windows
  added enviroment variable MYSQL_CLIENT_TEST
  added cleaning directory before tests
2005-02-02 19:53:49 +05:00
unknown
613c2f68e2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 16:50:35 +02:00
unknown
5725fa5df5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-02 11:35:33 +01:00
unknown
4c76152b35 func_str.result, func_str.test:
Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.


sql/item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
mysql-test/t/func_str.test:
  Added a test case for bug #7751.
mysql-test/r/func_str.result:
  Added a test case for bug #7751.
2005-02-01 23:34:31 -08:00
unknown
d81a0bede2 Fix for BUG#8023.
Allow LIMIT clause after DUAL.


mysql-test/r/limit.result:
  Added test result for BUG#8023.
mysql-test/t/limit.test:
  Added test for BUG#8023.
sql/sql_yacc.yy:
  Allow the specification of a LIMIT clause after DUAL. This is needed for queries as:
  select a from t1 union all select 1 from dual limit 1;
  In this query LIMIT is applied to the whole UNION, so it makes sense, however, the
  current parser did not allow any clause after DUAL.
2005-02-02 08:38:24 +02:00
unknown
3dd07e1abf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-02 06:33:22 +01:00
unknown
2ae812a7d6 Adjust test results for BUG#7634: The result of EXPLAIN is different if OS doesn't support file sizes > 2G 2005-02-02 07:51:43 +03:00
unknown
6d0d03dab9 Fix QUOTE() to not reuse the input field for output, which resulted in
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248)


sql/item_strfunc.h:
  Add tmp_value member
sql/item_strfunc.cc:
  Always allocate a new string for QUOTE(), in case the field is being reused
  for multiple rows.
mysql-test/t/func_str.test:
  Add regression test
mysql-test/r/func_str.result:
  Add test results
2005-02-01 18:29:10 -08:00
unknown
6162c4a6eb Fix value of YEAR field when set from a non-numeric string. (Bug #6067)
mysql-test/t/type_date.test:
  Add new regression test
mysql-test/r/type_date.result:
  Add result
sql/field.cc:
  Set YEAR to 0 when set to a non-numeric string, not 2000,
  and issue a warning.
2005-02-01 15:08:31 -08:00
unknown
0e50e32480 WL#1967
Support for COMMIT/ROLLBACK optional arguments


innobase/include/trx0roll.h:
  WL#1967
    trx_release_savepoint_for_mysql()
innobase/trx/trx0roll.c:
  WL#1967
    trx_release_savepoint_for_mysql()
mysql-test/r/innodb.result:
  WL#1967
    Test for savepoint release
mysql-test/t/innodb.test:
  WL#1967
    Test for savepoint release
sql/ha_innodb.cc:
  WL#1967
    innobase_release_savepoint_name()
sql/ha_innodb.h:
  WL#1967
    innobase_release_savepoint_name()
sql/handler.cc:
  WL#1967
    ha_release_savepoint_name()
sql/handler.h:
  WL#1967
    ha_release_savepoint_name()
sql/lex.h:
  WL#1967
    New tokens: CHAIN, RELEASE
sql/mysqld.cc:
  WL#1967
    new option: completion-type
sql/set_var.cc:
  WL#1967
    new option: completion-type
sql/sql_class.h:
  WL#1967
    new option: completion-type
sql/sql_lex.h:
  WL#1967
    Support RELEASE SAVEPOINT
    additional flags to support COMMIT/ROLLBACK options
sql/sql_parse.cc:
  WL#1967
    Transaction operations in mysql_endtrans(), begin_trans()
sql/sql_yacc.yy:
  WL#1967
    Support COMMIT/ROLLBACK optional args
2005-02-01 19:48:05 +00:00
unknown
6b7f067e8b merge 2005-02-01 17:16:05 +01:00
unknown
6a2b914190 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-01 17:09:36 +01:00
unknown
9d548d7f22 ndb - Put all output from ndb tools during mysql-test-run into log file
mysql-test/mysql-test-run.sh:
  Put all output from ndb_tool into log file
mysql-test/t/ndb_autodiscover.test:
  Put all output from ndb_tool into log file
mysql-test/t/ndb_restore.test:
  Put all output from ndb_tool into log file
2005-02-01 17:08:39 +01:00
unknown
38e395aa32 WL#2269 Enable query cache for NDB
- Added a thread that fetches commit_count for open tables. This
will mean that NDB will not have to be contacted for every use of a cached query. 


sql/ha_ndbcluster.cc:
  Added a thread that periodically will fetch commit_count 
  for open tables and store that value in share. 
  The commit count value is then used when query cache 
  asks if a cached query can be used. 
  The thread activation interval is regulated by the 
  config variable ndb_cache_check_time, it's default value is 0
  which means that NDB is contacted every time a cached query is reused.
sql/ha_ndbcluster.h:
  Added commit_count to share
  Added ndb_cache_check_time
sql/mysqld.cc:
  Added config variable ndb_cache_check_time
sql/set_var.cc:
  Added config variable ndb_cache_check_time
2005-02-01 15:43:08 +01:00
unknown
c53184ebb7 Proper fix for comparision with ' '
(Bug #7788 "Table is full" occurs during a multitable update")


client/mysqldump.c:
  Style fixes
innobase/include/univ.i:
  UNIV_DEBUG should not depend on configure --debug but on --debug=full
mysql-test/r/compare.result:
  Added test to find bug in previous bugfix
mysql-test/t/compare.test:
  Added test to find bug in previous bugfix
mysys/my_handler.c:
  Proper fix for comparision with ' '
strings/ctype-big5.c:
  Proper fix for comparision with ' '
strings/ctype-bin.c:
  Proper fix for comparision with ' '
strings/ctype-gbk.c:
  Proper fix for comparision with ' '
strings/ctype-latin1.c:
  Proper fix for comparision with ' '
strings/ctype-mb.c:
  Proper fix for comparision with ' '
strings/ctype-simple.c:
  Proper fix for comparision with ' '
strings/ctype-sjis.c:
  Proper fix for comparision with ' '
strings/ctype-tis620.c:
  Proper fix for comparision with ' '
strings/ctype-ucs2.c:
  Proper fix for comparision with ' '
strings/ctype-utf8.c:
  Proper fix for comparision with ' '
2005-02-01 16:27:08 +02:00
unknown
dc472dca33 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-02-01 18:34:54 +05:00
unknown
f7606a335e Skip cp932 and eucjpms tests when the character sets are not compiled. 2005-02-01 14:37:51 +04:00
unknown
2bb14c6fe7 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2005-02-01 12:20:03 +03:00
unknown
9fe76ad98b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-01 11:05:29 +02:00
unknown
af97b55308 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-01 10:05:22 +01:00
unknown
6e0691f54f Update client_xml test to avoid timestamp-sensitive part of test.
mysql-test/t/client_xml.test:
  Exclude create in mysqldump test, it includes timestamp
mysql-test/r/client_xml.result:
  Update result file
2005-01-31 18:48:42 -08:00
unknown
41763b20e2 Merge mysql.com:/home/jimw/my/mysql-4.1-7811
into mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysql.cc:
  Auto merged
2005-01-31 17:51:45 -08:00
unknown
ac5e79b9a1 Update test results after bug-fix merge.
mysql-test/r/mysqldump.result:
  Fix results
2005-01-31 17:31:42 -08:00
unknown
8b08a2e87f Merge
BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
strings/ctype-simple.c:
  SCCS merged
2005-01-31 16:27:17 -08:00
unknown
ec12a1f341 Merge mysql.com:/home/jimw/my/mysql-4.1-8134
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 15:29:55 -08:00
unknown
20745ec65f Merge mysql.com:/home/jimw/my/mysql-4.1-8148
into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqldump.c:
  Auto merged
2005-01-31 15:28:33 -08:00
unknown
60f628f264 Bug#7011
Merge from 4.1


sql/sql_select.cc:
  Auto merged
2005-01-31 15:57:32 +00:00
unknown
6685c7a671 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug7011.4
2005-01-31 15:06:04 +00:00
unknown
c02f4c5b6c fixed problem with groupping by view (BUG#7116)
mysql-test/r/view.result:
  view and group_concat()
mysql-test/t/view.test:
  view and group_concat()
sql/item.cc:
  comments added
sql/sql_select.cc:
  fixed ORDER/GROUP BY processing for view support
2005-01-31 16:24:11 +02:00
unknown
6e667ec888 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-31 19:23:19 +05:00
unknown
5ebe0dd231 WL#964
added client_test.dsp in project
    added CHARACTER SET in tables
    added 5th time zone
    included lstat in if()
    expanded ignore list for windows
    added directory slave1 and slave2
    added options for mysqld and mysqltest
    fixed error in read_option()
    fixed and added enviroment variables for Linux and Windows
    rewrote str_tok()
    added replacment 3th column
    New BitKeeper file ``VC++Files/tests/client_test.dsp''



VC++Files/mysql.dsw:
  added client_test.dsp in project
mysql-test/my_create_tables.c:
  added CHARACTER SET in tables
  added 5th time zone
mysql-test/my_manage.c:
  included lstat in if()
mysql-test/mysql_test_run_new.c:
  expanded ignore list for windows
  added directory slave1 and slave2
  added options for mysqld and mysqltest
  fixed error in read_option()
  fixed and added enviroment variables for Linux and Windows
  rewrote str_tok()
mysql-test/t/ps_1general.test:
  added replacment 3th column
2005-01-31 19:18:06 +05:00
unknown
e2955fee5b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-31 17:13:03 +03:00
unknown
0bd5c1e3b2 Bug#7011
Fix tests after merge from 4.0
2005-01-31 13:18:36 +00:00
unknown
ed9f484556 Bug#7011
Merge from 4.0


sql/sql_select.cc:
  Auto merged
2005-01-31 12:48:00 +00:00
unknown
17d9b972f8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0


sql/sql_yacc.yy:
  Auto merged
2005-01-31 13:36:05 +03:00
unknown
db7c18c351 Merge 2005-01-31 10:24:33 +01:00
unknown
ba98de430c fixed problem in view over view setup (BUG#7433)
mysql-test/r/view.result:
  view over other view setup
mysql-test/t/view.test:
  view over other view setup
sql/table.cc:
  before using ancestor, check that it exists
2005-01-31 10:43:36 +02:00
unknown
913d1e97c1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-01-31 09:36:23 +02:00
unknown
934fde094c Bug#7011
Fix replication for multi-update
  new test - rpl_multi_update2


sql/mysql_priv.h:
  Bug#7011
    New function mysql_multi_update_lock()
sql/sql_parse.cc:
  Bug#7011
    New function check_multi_update_lock()
    For multi-update on slave, perform an early open&lock
sql/sql_update.cc:
  Bug#7011
    Split out multi-update locking into its own function,
      mysql_multi_update_lock()
2005-01-30 10:24:03 +00:00
unknown
f787145fc0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-30 00:32:14 +01:00
unknown
3c2ac1fc76 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-29 19:57:29 +03:00
unknown
aeebe7041c mysql-test-run.sh:
Old Solaris 'test' lack -e


mysql-test/mysql-test-run.sh:
  Old Solaris 'test' lack -e
2005-01-29 15:59:29 +01:00
unknown
15501915c6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-29 12:46:13 +01:00
unknown
d5a4968e16 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
2005-01-29 07:04:04 +01:00
unknown
c2383412b2 Fix error in string comparisons with CHAR(31) against the space-padding
of strings of unequal length. (Bug #8134)


mysql-test/t/compare.test:
  Add new regression test
strings/ctype-simple.c:
  Fix value used for swapping negative/positive values using XOR
mysql-test/r/compare.result:
  Add new test result
2005-01-28 17:18:35 -08:00
unknown
af68c169ab Fix test results for mysqldump test. Part of Bug #8148.
mysql-test/r/mysqldump.result:
  Update results
2005-01-28 12:13:01 -08:00