1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Commit Graph

5056 Commits

Author SHA1 Message Date
unknown
6d7937c078 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
2004-12-16 20:29:59 +01:00
unknown
1b17ba5244 Have 'mysql-test-run' write a list of all failed tests at the end, if run with '--force'.
mysql-test/mysql-test-run.sh:
  Backport an improvement from 4.1: If the tool is run with '--force', give a list of all test cases that failed at the end.
  This is essential for automated analysis of the build logs file.
2004-12-16 20:26:24 +01:00
unknown
ae6f147a4f Test for BUG#6054. The bug itsel is fixed by the fix for #5837.
mysql-test/r/update.result:
  test result
mysql-test/t/update.test:
  test queries
2004-12-16 18:46:38 +02:00
unknown
8722bb9a09 Moved drop table statement to the end.
mysql-test/r/update.result:
  moved drop statement
mysql-test/t/update.test:
  moved drop statement
2004-12-16 18:44:39 +02:00
unknown
da2c55b3ab Test for BUG#6054. The bug itsel is fixed by the fix for #5837.
mysql-test/r/update.result:
  test results
mysql-test/t/update.test:
  bug test
2004-12-16 18:04:51 +02:00
unknown
8a8c2272c0 Fix for BUG#7266.
mysql-test/r/greedy_optimizer.result:
  Adjusted query costs accordingly.
sql/sql_select.cc:
  Someone added this 0.001 cost factor to best_extension_by_limited_search(), but forgot to
  add it to the old version of the optimizer - find_best().
2004-12-16 16:44:40 +02:00
unknown
0e7f1ae3a0 Fix for bug#7211: information_schema: crash if bad view(after review) 2004-12-16 17:44:36 +03:00
unknown
8c5a5c32c5 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
2004-12-16 17:33:21 +03:00
unknown
05bbcee9e6 Fix for bug#7212: information_schema: "Can't find file" errors if storage engine gone(after review) 2004-12-16 16:31:36 +03:00
unknown
9a2c0bd932 Enlarged group item key_length by a varstring length field.
Group item fields are implemented as varstrings nowadays.
Made init_connect.test robust against existing t1.


mysql-test/r/init_connect.result:
  Made init_connect.test robust against existing t1.
mysql-test/t/init_connect.test:
  Made init_connect.test robust against existing t1.
sql/sql_select.cc:
  Enlarged group item key_length by a varstring length field.
  Group item fields are implemented as varstrings nowadays.
2004-12-16 11:41:52 +01:00
unknown
73165ecacd Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-16 10:22:23 +01:00
unknown
d9b62f824b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-12-14 18:48:54 +04:00
unknown
e938cfcea6 Clean-up.
TYPE=MyISAM replaced with ENGINE=MyISAM.
2004-12-14 18:47:34 +04:00
unknown
820d68d903 corrected mysqltest.dsp
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script


BitKeeper/etc/ignore:
  Added mysql-4.1.8-win-src.zip to the ignore list
VC++Files/client/mysqltest.dsp:
  corrected dsp file
VC++Files/mysql-test/mysql_test_run_new.dsp:
  corrected mysql_test_run_new.dsp
VC++Files/mysql.dsw:
  added dependency
  corrected path of mysql_test_run_new.dsp
client/mysqltest.c:
  fixed wrong code
mysql-test/Makefile.am:
  added my_create_tables.c
mysql-test/my_manage.c:
  removed command_line
  fixed #elif
mysql-test/my_manage.h:
  restored NAME_MAX and MAX_FNAME
mysql-test/mysql_test_run_new.c:
  added create_system_files()
  added compare for windows
scripts/make_win_src_distribution.sh:
  added all files of testes
  added mysql-test
2004-12-14 18:46:55 +05:00
unknown
8d45c5f9d0 Fix for bug #7220: information_schema: errors in "character_sets" 2004-12-14 16:18:59 +03:00
unknown
a88f6fda40 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1


sql/item.h:
  Auto merged
2004-12-14 16:26:10 +04:00
unknown
0d9ac947b0 Fx for bug#7221: information_schema: errors in "key_column_usage" 2004-12-14 15:20:46 +03:00
unknown
cef35aeb1c bug#6275 "client_test" fail in 4.1.7 make test
bug#6911 resultset metadata always return client character set
2004-12-14 15:58:30 +04:00
unknown
b603cbc3ba Fix bug#7222 information_schema: errors in "routines" 2004-12-14 14:55:28 +03:00
unknown
3aa1605fa9 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-14 12:24:59 +01:00
unknown
a9973c1b92 Fix for bug #7223: information_schema: error in "views" 2004-12-14 13:41:32 +03:00
unknown
8eea17107c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-12-14 14:25:33 +04:00
unknown
e05278329e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-14 10:24:26 +01:00
unknown
16de85317e mysql-test-run.sh:
removed diskless option for ndb test


mysql-test/mysql-test-run.sh:
  removed diskless option for ndb test
2004-12-14 10:23:35 +01:00
unknown
00d9273aa5 Portability fix (bug #7203: "delayed" test fails on QNX when using prepared statements)
mysql-test/t/delayed.test:
  Portability fix (bug #7203: "delayed" test fails on QNX when using prepared statements)
  1 is not enough delay for QNX.
2004-12-14 11:35:23 +04:00
unknown
e19a3042ef Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
2004-12-14 03:37:20 +03:00
unknown
bd8f96f759 Small bug fix
ps-modify1 used the user variables @1, @2, @100 set within ps_query and 
           ps_modify. That architecture was wrong, because the dependence
           of ps_modify1 on ps_query and ps_modify makes the test script
           maintenance and the use of these test cases during bug fixing/
           debugging of single sub test cases very uncomfortable.
Therefore these user variables (@1, @2, @100) are also set within ps-modify1.

The result files of the test cases ps_2myisam, ps_3innodb, ps_4heap, ps_6bdb,
ps_7ndb will be affected by that change and show 3 additional lines, but
nothing else will change.    


mysql-test/include/ps_modify1.inc:
  Initialization of three user variables, with values derived from ps_query
  and ps_modify
mysql-test/r/ps_2myisam.result:
  updated result set
mysql-test/r/ps_3innodb.result:
  updated result set
mysql-test/r/ps_4heap.result:
  updated result sset
mysql-test/r/ps_6bdb.result:
  updated result set
mysql-test/r/ps_7ndb.result:
  updated result set
2004-12-13 21:00:43 +01:00
unknown
317d3dc257 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1
2004-12-13 20:24:13 +01:00
unknown
fdffe61f6e Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-13 18:53:49 +01:00
unknown
75a43405d4 Merged (will need a post-merge fix)
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
2004-12-13 20:10:07 +03:00
unknown
c9a0e4ad5d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl2274.2
2004-12-13 14:19:20 +00:00
unknown
c4dc0c2583 flush_read_lock_kill-master.opt:
don't make non-debug builds fail the testsuite


mysql-test/t/flush_read_lock_kill-master.opt:
  don't make non-debug builds fail the testsuite
2004-12-13 14:21:59 +01:00
unknown
7abd5fddc3 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-12-13 15:08:52 +02:00
unknown
46364ddb19 WL#2274 - INSERT..SELECT..UPDATE
UPDATE clause conflicts with SELECT for use of item_list field.
  Alter UPDATE clause to use new lex field update_list
  Tests included


mysql-test/r/insert_update.result:
  WL#2274
    New tests for INSERT..SELECT..UPDATE
mysql-test/t/insert_update.test:
  WL#2274
    New tests for INSERT..SELECT..UPDATE
sql/mysql_priv.h:
  Remove function - insert_select_precheck()
sql/sql_class.h:
  WL#2274
    New constructor for class select_insert
sql/sql_insert.cc:
  WL#2274
    Move code into mysql_prepare_insert
    Add checks as param values may be NULL
sql/sql_lex.cc:
  WL#2274
    initialize lex->update_list
sql/sql_lex.h:
  WL#2274
    New field in LEX: update_list
sql/sql_parse.cc:
  WL#2274
    INSERT..UPDATE clause now populates lex->update_list
    Remove redundant function: insert_select_precheck()
sql/sql_prepare.cc:
  WL#2274
    invoke insert_precheck() instead of insert_select_precheck()
sql/sql_yacc.yy:
  WL#2274
    Enable INSERT..SELECT..UPDATE syntax
    New rule - insert_update_list, to populate lex->update_list
2004-12-13 12:26:28 +00:00
unknown
0e21e51188 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-13 12:24:35 +01:00
unknown
be19c6f721 bug #7230
+ fixed testcase


mysql-test/ndb/basic.result:
  fixed testcase
ndb/include/debugger/EventLogger.hpp:
  bug #7230
2004-12-13 11:45:45 +01:00
unknown
f738015fe9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ref-4.1
2004-12-13 01:32:49 +02:00
unknown
a9457c573d fixed optimized SOME subquery
mysql-test/r/subselect.result:
  correct results of SOME subquery
sql/item_cmpfunc.cc:
  some comments added
  fixed optimized SOME subquery
2004-12-13 01:21:14 +02:00
unknown
5ae35e327a Fix test results that may change from run to run
Added comments (from code review on pull)


mysql-test/r/heap.result:
  Fix results that may change from run to run
mysql-test/r/ps_5merge.result:
  Fix wrong result
mysql-test/t/heap.test:
  Make results predictable
sql/sql_show.cc:
  Add comments
  Fixed typo
2004-12-12 19:54:26 +02:00
unknown
47c3901518 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-12-12 18:44:15 +02:00
unknown
7d2e580cad First commit to mysql-5.0 tree to include MySQL Federated Storage Handler. This includes both the source and header files, test (results, test, require), and modifications to server and handler base files, and autoconf modifications to properly build federated handler.
configure.in:
  inclusion of federated handler autoheader macro
mysql-test/mysql-test-run.sh:
  allow usage of replication tests for federated handler
sql/Makefile.am:
  inclusion of federated header and source file
sql/field.h:
  overloaded method val_str() to work with fields in 'old_data' in 'update_row()'
sql/handler.cc:
  added code to include federated handler
sql/handler.h:
  add db type for federated
sql/mysql_priv.h:
  added code for federated handler
sql/mysqld.cc:
  added code for federated handler
sql/set_var.cc:
  added code for federated handler
2004-12-11 12:03:51 -08:00
unknown
35217aeade Merge fix for BUG#6976 from 4.0 2004-12-11 20:13:43 +03:00
unknown
b18e8c92bc Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/dbdata/psergey/mysql-4.0-bug6976
2004-12-11 20:02:45 +03:00
unknown
b5c119e7c0 Fix for BUG#6976:
In Item_ref::Item_ref set maybe_null (and other fields fix_fields sets) to be the 
same as in (*ref), because Item_ref::fix_fields() will not be called.  Previously 
maybe_null was 0 always and this produced a bogus state where 
maybe_null==0 && is_null() == true 
which broke evaluation for some upper-level Items, like AND and OR.


mysql-test/r/group_by.result:
  Test for BUG#6976
mysql-test/t/group_by.test:
  Test for BUG#6976
sql/item.cc:
  Comment added
sql/item.h:
  Fix for BUG#6976:
    in Item_ref::Item_ref(Item**...) fix all fields because fix_fields() will not be called.
2004-12-11 19:59:09 +03:00
unknown
3ce0df5937 new reference which refer to current value not to result used for resolving outer
refernces if subqueri is not in HAVING clause (BUG#7079)
  and the same used for subquery transformetion


mysql-test/r/subselect.result:
  reference on changable fields from subquery
mysql-test/t/subselect.test:
  reference on changable fields from subquery
sql/item.cc:
  new reference which refer to current value not to result used
sql/item.h:
  new reference which refer to current value not to result used
sql/item_subselect.cc:
  new reference which refer to current value not to result used
2004-12-11 17:13:19 +02:00
unknown
0a3590f6d0 Post-merge fixes 2004-12-11 16:36:12 +03:00
unknown
c77391b94f Fix for BUG#5837 merged from 4.0
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
2004-12-11 15:55:50 +03:00
unknown
8e4251dd85 Fix for BUG#5837 - attempt 3.
Call mark_as_null_row in join_read_const and join_read_system.


mysql-test/r/multi_update.result:
  Testcase for BUG#5837
mysql-test/t/multi_update.test:
  Testcase for BUG#5837
sql/table.h:
  Added comments
2004-12-11 15:51:52 +03:00
unknown
35aaf2222d getting rid of now() is tests 2004-12-11 09:39:29 +01:00
unknown
90ce7aea5f Fix results file for insert_select test with embedded server. (Bug #7167)
mysql-test/r/insert_select.result.es:
  add output to embedded server results
2004-12-10 23:50:09 +01:00