Commit graph

18171 commits

Author SHA1 Message Date
unknown
e5cddec6c5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-03-31 05:01:22 +02:00
unknown
f0148b21c3 Remove result.es files and support for them, which requires splitting
up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508).


BitKeeper/deleted/.del-drop_temp_table.result.es~bc4cfb1ee1257458:
  Delete: mysql-test/r/drop_temp_table.result.es
BitKeeper/deleted/.del-insert_select.result.es~ae7eb9891d6c07c4:
  Delete: mysql-test/r/insert_select.result.es
BitKeeper/deleted/.del-myisam-blob.result.es~d498dae7d9f1a6d4:
  Delete: mysql-test/r/myisam-blob.result.es
BitKeeper/deleted/.del-packet.result.es~6e71c3b634806185:
  Delete: mysql-test/r/packet.result.es
BitKeeper/deleted/.del-query_cache.result.es~246ad731a517d9ab:
  Delete: mysql-test/r/query_cache.result.es
BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079:
  Delete: mysql-test/r/select.result.es
BitKeeper/deleted/.del-type_blob.result.es~a4a0d4454b2d0218:
  Delete: mysql-test/r/type_blob.result.es
BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04:
  Delete: mysql-test/r/type_float.result.es
BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978:
  Delete: mysql-test/r/type_ranges.result.es
mysql-test/mysql-test-run.sh:
  Remove support for special result extension -- bad idea!
mysql-test/t/ps_1general.test:
  Explain --replace_result
mysql-test/r/insert_select.result:
  Update results
mysql-test/r/select.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_float.result:
  Update results
mysql-test/r/type_ranges.result:
  Update results
mysql-test/t/drop_temp_table.test:
  Skip this test with embedded server
mysql-test/t/insert_select.test:
  Move binlog test to new file
mysql-test/t/select.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_blob.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_float.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_ranges.test:
  Replace grants column from 'show full columns'
sql/sql_select.cc:
  Fix conditional around query_cache_abort() call.
2005-03-30 17:32:44 -08:00
unknown
f485db429a A fix for Bug#9443 "mysql_client_test fails on linux and some solaris
platforms": yet another issue with floating pointer comparisons.
The fix uses the workaround with volatiles.


sql/item_cmpfunc.cc:
  A fix for the failing mysql_client_test on some Intel platforms
  when compiled with optimization.
  We don't use -ffloat-store compileation as it may slow all
  floating point operations.
2005-03-31 03:44:51 +04:00
unknown
e12f1a4453 ndb - CSC#4927: ordered index + long pk, second half
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  ACC_LOCKREQ - element may have moved after lock request was made
2005-03-30 22:17:11 +02:00
unknown
30c8512954 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-4.1
2005-03-30 23:09:19 +03:00
unknown
56b2de98f3 postmerge fixes
mysql-test/r/metadata.result:
  postmerge change
sql/item.cc:
  work around about varchar in 4.1
2005-03-30 23:08:03 +03:00
unknown
3d03f0ae1b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-30 21:16:13 +02:00
unknown
504ab8d4f4 merge
sql/sql_parse.cc:
  Auto merged
2005-03-30 22:11:08 +03:00
unknown
cc3cadb7f4 Fix 'Bootstrap' to bypass a problem with "bk changes" by changing the directory before calling the command.
Build-tools/Bootstrap:
  Bypass a BK problem with "bk changes": It stopped delivering changeset comments when
  1) it encountered a single, unbroken line with about 1k characters  AND
  2) it was applied not to the current directory but to a named BK root directory.
  
  As 1) cannot be changed post-factum (and might happen again),
  the "bk changes" command is now preceded by a "cd $REPO".
  
  Do some renaming of variables used around the "bk changes" call to improve documentation.
2005-03-30 20:39:37 +02:00
unknown
890aa5b258 Portability fix (avoid bash-ism).
support-files/mysql.server.sh:
  Replace a non-portable "for" loop (bash style, fails on BSD) by an equivalent "while" loop.
  Note that the "stop" method is still wrong, as it does not wait for file removal.
2005-03-30 18:38:54 +02:00
unknown
0630d62f2d Ensure 'texi2html' is taken from the Docs tree, not to miss any corrections. 2005-03-30 17:59:36 +02:00
unknown
c1338937dd Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced
2005-03-30 14:33:55 +02:00
unknown
ed4022bdd1 Merge neptunus.(none):/home/msvensson/mysql/bug8807
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced


mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
2005-03-30 14:30:32 +02:00
unknown
5ac4670bf7 Fix for BUG#9213: GROUP BY returns wrong query results:
Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen.  


mysql-test/r/group_by.result:
  Testcase for BUG#9213
mysql-test/t/group_by.test:
  Testcase for BUG#9213
sql/table.h:
  Added comments about TABLE::used_keys
2005-03-30 15:57:42 +04:00
unknown
af2ab040cc BUG#8807 Select crash server
- Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare.


mysql-test/include/ps_query.inc:
  Adde new test case
mysql-test/r/ps_2myisam.result:
  Update test result
mysql-test/r/ps_3innodb.result:
  Update test result
mysql-test/r/ps_4heap.result:
  Update test result
mysql-test/r/ps_5merge.result:
  Update test result
mysql-test/r/ps_6bdb.result:
  Update test result
mysql-test/r/ps_7ndb.result:
  Update test result
sql/item.cc:
  Add function Item_param::fix_fields, which will mark any subselects they are part of as not being a constant expression unless the param value is specified, ie. it will be not be constant during prepare phase.
sql/item.h:
  Adde Item_param::fix_fields
sql/item_subselect.h:
  Make Item_param::fix_field friend of Item_subselect
2005-03-30 12:14:37 +02:00
unknown
633a2468ec Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-03-30 14:51:23 +05:00
unknown
216ed8c7e2 A fix (bug #9401: type_timestamp segfaults mysqld)
sql/sql_select.cc:
  A fix (bug #9401: type_timestamp segfaults mysqld).
  1. create_tmp_field_from_field() is modified to take 'Item_ref *item' and 'char *name'
  instead of 'bool modify_item' and 'Item *item'.
  2. For Item_sum_min/max we should never modify item, so NULL is 
  passed as item to the create_tmp_field_from_field().
2005-03-30 14:43:56 +05:00
unknown
8af53376cf Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-30 14:11:17 +05:00
unknown
103dddfbd2 Remove .opt file for faster test running.
BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106:
  Delete: mysql-test/t/ctype_cp1251-master.opt
2005-03-30 14:10:27 +05:00
unknown
039519721c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-30 10:59:27 +02:00
unknown
98be74b77e Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-30 10:53:53 +02:00
unknown
fc7b19d480 merged 2005-03-30 10:52:28 +02:00
unknown
fe811dd892 don't strcmp db if it's a pattern 2005-03-30 10:43:24 +02:00
unknown
dddabc7edd Merge
mysql-test/r/metadata.result:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
mysql-test/r/union.result:
  SCCS merged
mysql-test/t/union.test:
  SCCS merged
2005-03-30 10:27:36 +03:00
unknown
dda97623a7 postreview changes
fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350)


mysql-test/r/subselect.result:
  added new subquery tests to make code covarage better
mysql-test/t/subselect.test:
  added new subquery tests to make code covarage better
sql/item_subselect.cc:
  fixed typo in comment
  removed unused code
  fixed bug with HAVING clause detectiuon (BUG#9350)
  postreview changes
2005-03-30 10:07:08 +03:00
unknown
57221d3d08 Eliminate most of the remaining hardcoded list of tests to skip
by adding check for embedded server within tests and splitting some
tests into multiple test files.


mysql-test/mysql-test-run.sh:
  Remove most of hardcoded list of tests to skip
mysql-test/r/ps_1general.result:
  Update results
mysql-test/r/timezone2.result:
  Update results
mysql-test/r/user_var.result:
  Update results
mysql-test/r/variables.result:
  Update results
mysql-test/t/mix_innodb_myisam_binlog.test:
  Disable test with embedded server
mysql-test/t/mysql_protocols.test:
  Disable test with embedded server
mysql-test/t/mysqlbinlog.test:
  Disable test with embedded server
mysql-test/t/mysqlbinlog2.test:
  Disable test with embedded server
mysql-test/t/mysqldump.test:
  Disable test with embedded server
mysql-test/t/packet.test:
  Disable test with embedded server
mysql-test/t/ps_1general.test:
  Move parts of test to new ps_grant
mysql-test/t/rename.test:
  Disable test with embedded server
mysql-test/t/show_check.test:
  Disable test with embedded server
mysql-test/t/system_mysql_db_fix.test:
  Disable test with embedded server
mysql-test/t/timezone2.test:
  Move part of test to timezone_grant
mysql-test/t/user_var.test:
  Move part of test to new user_var-binlog
mysql-test/t/variables.test:
  Move part of test to rpl_variables
2005-03-29 17:17:46 -08:00
unknown
dad034597e Merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Merge from 4.0
2005-03-30 02:49:21 +02:00
unknown
73e5f698a9 Do-compile:
Added option --with-big-tables


Build-tools/Do-compile:
  Added option --with-big-tables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-30 02:41:08 +02:00
unknown
4c24806006 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-30 02:31:23 +02:00
unknown
655d97ee12 Do-compile:
Added option --with-blackhole


Build-tools/Do-compile:
  Added option --with-blackhole
2005-03-30 02:28:41 +02:00
unknown
baf121de4f Clean up InnoDB testing with embedded server.
BitKeeper/deleted/.del-innodb.result.es~ba2a97747fd41a3a:
  Delete: mysql-test/r/innodb.result.es
mysql-test/mysql-test-run.sh:
  Remove innodb tests from list of tests automatically skipped
  with embedded server
mysql-test/r/innodb.result:
  Update results
mysql-test/t/innodb-deadlock.test:
  Skip with embedded server
mysql-test/t/innodb-lock.test:
  Skip with embedded server
mysql-test/t/innodb.test:
  Move test of replace delayed to new test file, add to --replace_result
  to clean up path
2005-03-29 16:10:43 -08:00
unknown
ff9a1bd225 Shift skipping of some tests with embedded server from within
mysql-test-run to the tests themselves.


mysql-test/t/bdb-deadlock.test:
  Don't run this test with embedded server
mysql-test/mysql-test-run.sh:
  Remove tests from being skipped with embedded server
mysql-test/t/connect.test:
  Skip test under embedded server
mysql-test/t/flush_block_commit.test:
  Skip test under embedded server
mysql-test/t/grant.test:
  Skip test under embedded server
mysql-test/t/grant2.test:
  Skip test under embedded server
mysql-test/t/grant_cache.test:
  Skip test under embedded server
2005-03-29 15:50:16 -08:00
unknown
3e2f7ed4f5 Fedora now defines read(2)/write(2) as macros.
Argh!
2005-03-29 23:31:56 +02:00
unknown
ce3253cfd1 typo fixed 2005-03-29 23:03:36 +02:00
unknown
2c4a99d084 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/ps_7ndb.result:
  Auto merged
2005-03-29 20:16:35 +02:00
unknown
328781c959 Merge
configure.in:
  Auto merged
acinclude.m4:
  SCCS merged
2005-03-29 19:25:55 +02:00
unknown
1a960df7ab Post-review fix: Drop the duplicate assignment. 2005-03-29 18:55:47 +02:00
unknown
1d3e1bdbbe Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 18:53:44 +02:00
unknown
01ba6b1d09 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 18:48:31 +02:00
unknown
344e0a2d78 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-29 17:56:34 +02:00
unknown
34cebb7176 Introduce "configure" support for a new '-with-big-tables' option that can replace
the current way of passing '-DBIG_TABLES' to the compilers.

This is needed even in 4.0, as 'Do-compile-all' must use this new approach for
all "max" builds in 4.0, 4.1, and up.


acinclude.m4:
  Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option 
  and set the CPP symbol 'BIG_TABLES' accordingly.
configure.in:
  Call the new 'MYSQL_CHECK_BIG_TABLES' macro.
2005-03-29 16:34:33 +02:00
unknown
a7b6b20c1e New test result 2005-03-29 15:36:02 +02:00
unknown
9dc90a162d Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started 2005-03-29 15:15:28 +02:00
unknown
fd5c0aff66 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-29 14:56:11 +02:00
unknown
f38d7d6d8d update results 2005-03-29 13:57:15 +02:00
unknown
0b45706c3b ctype-utf8.c, ctype-sjis.c:
Safer and mode readable way.


strings/ctype-sjis.c:
  Safer and mode readable way.
strings/ctype-utf8.c:
  Safer and mode readable way.
2005-03-29 16:23:44 +05:00
unknown
db5bb0c46c ctype-big5.c:
More readable and safer way.


strings/ctype-big5.c:
  More readable and safer way.
2005-03-29 16:19:31 +05:00
unknown
7bd6ddc046 Better error message.
Bugs#9057: Incorrect errormsg for too-large char field in table definition
2005-03-29 15:43:00 +05:00
unknown
dfc8b3aecc Remove redundant my_security_attr_free() from
handle_connections_shared_memory (double free spotted by Monty).


sql/mysqld.cc:
  Remove excessive my_security_attr_free()
2005-03-29 14:30:34 +04:00
unknown
2c546db390 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 12:08:14 +02:00