1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-21 21:22:27 +03:00
Commit Graph

8938 Commits

Author SHA1 Message Date
e10d81448d Moved some old test and added a new test to only be run with mysql-test-run --big
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files


BitKeeper/etc/ignore:
  added tools/mysqltestmanager
client/mysqltest.c:
  Ensure that BIG_TEST is always set to 0 or 1
  Fix the 'eval' also honors 'require'
mysql-test/mysql-test-run.sh:
  Enlarge InnoDB table space for --big tests
mysql-test/r/heap.result:
  Fix after adding more optimzation for filsort
mysql-test/r/sum_distinct.result:
  Move 'slow' part of test to sum_distinct-big.test
mysql-test/t/heap.test:
  Ensure that results are indpendent of optimizer
mysql-test/t/sum_distinct.test:
  Move 'slow' part of test to sum_distinct-big.test
sql/filesort.cc:
  Use 'sort with data' also on temporary files and with INSERT ... SELECT
sql/ha_innodb.h:
  Remove HA_FAST_KEY_READ to enable buffered-record-reads after filesort
sql/handler.h:
  More comments
sql/mysql_priv.h:
  A bit smaller limit for cache for buffered-records-read (after testing)
sql/records.cc:
  Don't use buffered-record-reads if ref_length > MAX_REFLENGTH
  Fixed warning from valgrind in 'sum_distinct'
sql/sql_select.cc:
  Ensure that tempory tables has query_id set for all fields
  (Required for sort-with-data to work on temp files)
2005-04-07 19:24:14 +03:00
606f0a1335 Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
6f0f3b0733 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-07 19:30:14 +05:00
1fa01e6245 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-07 19:25:13 +05:00
d9151b75c3 A small fix to Makefile.am 2005-04-07 13:20:15 +03:00
b2ff4e9ce5 Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
state" to sp-error.test.

According to Per-Erik all SP related tests which should result in error
should go into sp-error.test and not in sp.test, because we want to be
able to run sp.test using normal client.


mysql-test/r/sp-error.result:
  Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state" to sp-error.test.
mysql-test/r/sp.result:
  Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state" to sp-error.test.
mysql-test/t/sp-error.test:
  Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state" to sp-error.test.
mysql-test/t/sp.test:
  Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state" to sp-error.test.
2005-04-07 11:57:47 +04:00
91eccfc2ea Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg9566
2005-04-07 10:41:07 +04:00
188b8af60c Fix for bug #9566 "explicit LOCK TABLE and store procedures result in
illegal state".

We should not assume that mysql.proc table does not exist if we are
unable to open it under LOCK TABLES or in prelocked mode (and
remember this fact by setting mysql_proc_table_exists to zero).


mysql-test/r/sp.result:
  Added test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state"
mysql-test/t/sp.test:
  Added test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state"
sql/sp.cc:
  db_find_routine_aux():
    We should not assume that mysql.proc table does not exist if we are
    unable to open it under LOCK TABLES or in prelocked mode since this
    condition may be transient.
2005-04-07 01:40:29 +04:00
0ec06cabbd Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-06 23:13:29 +02:00
1fcebd5549 after merge fix
mysql-test/r/user_var.result:
  after merge fixes - old (erroneous) results restored.
  Should be corrected when the fix is applied
mysql-test/t/user_var.test:
  after merge fixes - old (erroneous) results restored.
  Should be corrected when the fix is applied
2005-04-06 23:12:10 +02:00
3960c84f12 manually merged
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually


BitKeeper/etc/logging_ok:
  auto-union
include/m_ctype.h:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/include/btr0pcur.h:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/tools/desc.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
  ul
ndb/include/ndbapi/NdbScanOperation.hpp:
  ul
ndb/src/ndbapi/NdbIndexOperation.cpp:
  ul
ndb/src/ndbapi/NdbOperationDefine.cpp:
  ul
ndb/src/ndbapi/NdbOperationSearch.cpp:
  ul
ndb/src/ndbapi/NdbScanOperation.cpp:
  ul
sql/field.cc:
  manually merged, because bk messed it up
sql/sql_yacc.yy:
  merged
2005-04-06 21:19:20 +02:00
86655591bc Added missing file to Makefile.am 2005-04-06 21:55:34 +03:00
231f705cc2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-04-06 19:18:47 +02:00
7503894ab5 Fixed errors found during review
mysql-test/r/drop.result:
  Made error message smaller to not get into trouble with clients with smaller error buffers
  The proper way to fix this is to generate a separate warning for each not found table if there was more than one table in the DROP
  but
mysql-test/r/kill.result:
  Portablity fix
mysql-test/t/kill.test:
  Portablity fix
mysys/my_sync.c:
  Fixed possible compiler warning
sql/records.cc:
  Fixed possible compiler warning
sql/share/errmsg.txt:
  Made error message smaller to not get into trouble with clients with smaller error buffers
sql/sql_class.cc:
  Don't put code in comments
sql/sql_show.cc:
  Cleanup
2005-04-06 19:43:35 +03:00
1655e97fd2 Merge
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_rewrite_db.result:
  Auto merged
2005-04-06 18:19:05 +02:00
2dea7f2b9d Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-06 21:05:45 +05:00
d958b6361b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-04-06 17:23:34 +03:00
080c8ab39b Fixed errors descovered by valgrind 2.4
Added suppression file for some valgrind warnings that are not real errors


mysql-test/mysql-test-run.sh:
  Added suppression of some valgrind warnings that are not real errors
mysql-test/r/heap.result:
  Cleanup old tests and added new tests
mysql-test/t/heap.test:
  Cleanup old tests and added new tests
mysys/default.c:
  Removed duplicate fn_format()
scripts/make_binary_distribution.sh:
  Added valgrind suppress file
sql/ha_federated.cc:
  Ensure that 'socket' is initialized properly
sql/ha_heap.cc:
  Ensure that with_auto_increment is initialized properly
sql/mysqld.cc:
  Ensure that create_time is initialized for cached threads
sql/sql_parse.cc:
  Indentation fix
strings/decimal.c:
  Fixed wrong tests
2005-04-06 17:22:21 +03:00
57fa327069 Small fixes done while reviewing pushed code
mysql-test/r/innodb-replace.result:
  Added proper cleanup for test
mysql-test/t/innodb-replace.test:
  Added proper cleanup for test
sql/share/english/errmsg.txt:
  Don't extend the possible length of error message too much for common errors are MySQL 4.0 clients has a limit of 200 characters
2005-04-06 16:52:41 +03:00
d5b7547597 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-04-06 13:45:14 +02:00
e3e9ccc527 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg


mysql-test/r/row.result:
  Auto merged
sql/item.cc:
  Auto merged
2005-04-06 15:51:24 +05:00
acd0dbd270 Stupid error message for 'insert "aaa"' into decimal column fixed
mysql-test/r/row.result:
  test result fixed
sql/item.cc:
  error message for the case of bad decimal value added
  duplicated code removed
2005-04-06 15:49:55 +05:00
1216986050 Makefile.am:
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed


mysql-test/mysql-test-run.pl:
  Embedded result files no longer needed
mysql-test/r/rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test/t/rpl_rewrite_db.test:
  Added missing database cleanup
mysql-test/Makefile.am:
  Include the Perl version of mysql-test-run
2005-04-06 12:20:55 +02:00
31d15c3f76 Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-04-06 14:13:06 +05:00
e73f1239dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-06 10:56:02 +02:00
566460ac64 Update tests after merge of bug fix.
mysql-test/r/null.result:
  Update results
mysql-test/r/show_check.result:
  Update results
mysql-test/r/strict.result:
  Update results
mysql-test/t/null.test:
  Fix default for smallint column.
mysql-test/t/show_check.test:
  Fix default for bool column.
2005-04-05 20:55:06 -07:00
5cdec5d6ba Merge
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/limit.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/rpl000001.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/t/strict.test:
  SCCS merged
2005-04-05 19:45:34 -07:00
21836cc19f Remove references to result.es files
mysql-test/Makefile.am:
  Remove result.es references
scripts/make_binary_distribution.sh:
  Remove result.es refernece
2005-04-05 13:01:42 -07:00
86fbe98343 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-04-05 21:31:54 +02:00
e897f10fb8 Merge neptunus.(none):/home/msvensson/mysql/bug6762-1.2152.20.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-05 21:30:24 +02:00
2db55537b7 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
2005-04-05 07:59:11 -07:00
5ec69db745 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-05 16:01:29 +02:00
377bdbd33b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-05 16:01:28 +02:00
f3281e7b33 Additional fix for BUG#5907: Traditional mode: invalid value can be inserted via a stored procedure
... make the handler catch too.


mysql-test/r/strict.result:
  Updated corrected result for BUG#5907.
mysql-test/t/strict.test:
  Corrected test for BUG#5907.
sql/sp_head.cc:
  Make handlers catch certain bad data exceptions in strict mode too.
2005-04-05 15:49:10 +02:00
2c87b349d5 fix broken mix_innodb_myisam_binlog.test 2005-04-05 15:36:52 +02:00
99f5b6d1b7 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-05 06:36:16 -07:00
baa424eef3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-05 14:58:42 +02:00
46aad9633e Merge
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/handler.cc:
  SCCS merged
2005-04-05 13:23:11 +02:00
cd0a50bf34 remove the rest of isam/merge references
fix a race condition in TC_LOG_BINLOG::unlog


include/Makefile.am:
  remove the rest of isam/merge references
include/config-win.h:
  unused and abused macro removed
include/my_pthread.h:
  unused and abused macro removed
include/my_sys.h:
  MY_IGNORE_BADFD flag
include/mysql_embed.h:
  remove the rest of isam/merge references
mysql-test/r/replace.result:
  remove the rest of isam/merge references
mysql-test/t/replace.test:
  remove the rest of isam/merge references
mysql-test/t/xa.test:
  comment
mysys/my_sync.c:
  MY_IGNORE_BADFD flag
sql/handler.cc:
  remove the rest of isam/merge references
sql/log.cc:
  fix a race condition in TC_LOG_BINLOG::unlog
  preparation for binlog group commit
sql/mysql_priv.h:
  remove duplicates
sql/mysqld.cc:
  remove the rest of isam/merge references
sql/opt_range.cc:
  remove the rest of isam/merge references
sql/set_var.cc:
  hide unused variables. simplify sync_binlog code
sql/sql_base.cc:
  remove the rest of isam/merge references
sql/sql_class.h:
  cleanup
2005-04-05 13:17:49 +02:00
b419262fe4 Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
restore original 'lex->query_tables' table list after
   processing of information schema table
   remove unnecessary operations


mysql-test/r/ps.result:
  Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
mysql-test/t/ps.test:
  Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
sql/sql_lex.h:
  Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
sql/sql_show.cc:
  Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
2005-04-05 16:09:56 +05:00
4963a9c853 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/mysql-5.0
2005-04-05 15:13:07 +05:00
82091c8467 Fix for bug#7214: information_schema: unauthorized user can see metadata
the fix for 'columns' table only
    Rights check for 'routines' table is already done
    (see WL2131 Access control for SHOW ... PROCEDURE|FUNCTION ...)
    rename 'testtets' database to 'mysqltest' to keep number of
      DBs which created by mysql-test as small as possible


mysql-test/r/information_schema.result:
  Fix for bug#7214: information_schema: unauthorized user can see metadata
mysql-test/t/information_schema.test:
  Fix for bug#7214: information_schema: unauthorized user can see metadata
sql/sql_show.cc:
  Fix for bug#7214: information_schema: unauthorized user can see metadata
2005-04-05 15:12:15 +05:00
fccf177b15 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 11:23:17 +02:00
fddccb6ee9 Fix for bug #9571: Primary key creation causes server crash.
sql/unireg.cc:
  Fix for bug #9571: Primary key creation causes server crash.
  We should pass null_pos to the make_field() anyway,
  as we use it for bit fields.
2005-04-05 13:40:34 +05:00
66e6808ed0 Merge
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-04-04 23:03:56 -07:00
2cb2374b78 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
2005-04-05 06:12:41 +04:00
682baee231 Merge new tests
mysql-test/r/join_outer.result:
  Update results
mysql-test/t/join_outer.test:
  Merge
2005-04-04 18:29:18 -07:00
fe02ce98af Merge mysql.com:/home/jimw/my/mysql-4.1-8866
into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqltest.c:
  Auto merged
sql-common/client.c:
  Auto merged
2005-04-04 18:26:39 -07:00
47527f6ade Skip new test with embedded server
mysql-test/t/view_grant.test:
  Skip test with embedded server
2005-04-04 17:08:12 -07:00
754874fd00 Fix merge of tests that were split out of other test files
mysql-test/r/ctype_ucs_binlog.result:
  Update results
mysql-test/r/timezone_grant.result:
  Update results
mysql-test/r/user_var-binlog.result:
  Update results
mysql-test/t/ctype_ucs_binlog.test:
  Update binlog starting position
mysql-test/t/timezone_grant.test:
  Update error numbers
mysql-test/t/user_var-binlog.test:
  Update binlog starting position
2005-04-04 16:34:24 -07:00