Commit graph

5604 commits

Author SHA1 Message Date
unknown
f712a3d8d9 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100


sql/sql_select.cc:
  Auto merged
2005-01-26 09:09:53 +01:00
unknown
360d32f201 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-4000
2005-01-26 09:07:25 +01:00
unknown
235edc2144 order_by.result, order_by.test:
Added test case for bug #7672 that existed only in 4.0.


mysql-test/t/order_by.test:
  Added test case for bug #7672 that existed only in 4.0.
mysql-test/r/order_by.result:
  Added test case for bug #7672 that existed only in 4.0.
2005-01-25 23:13:36 -08:00
unknown
8deafa8037 order_by.result, order_by.test:
Added a test case for bug #7672.
sql_yacc.yy:
  Fixed bug #7672.
  Made queries of the form (SELECT ...) ORDER BY ... to
  be equivalent to SELECT ... ORDER BY ...


sql/sql_yacc.yy:
  Fixed bug #7672.
  Made queries of the form (SELECT ...) ORDER BY ... to
  be equivalent to SELECT ... ORDER BY ...
mysql-test/t/order_by.test:
  Added a test case for bug #7672.
mysql-test/r/order_by.result:
  Added a test case for bug #7672.
2005-01-25 14:30:38 -08:00
unknown
d8f3934148 Change 'mysql' client to output XML like the 'mysqldump'
tool does, with the column names as attributes on <field>
elements, instead of trying to use the column name as the
element name. Also fix some encoding issues. (Bug #7811)


client/mysql.cc:
  Quote > and " in XML output, and use <field name="XXX"></field>
  instead of <XXX></XXX>, to make the output more like
  mysqldump --xml and avoid having to turn XXX into a sensible
  element name.
2005-01-25 14:25:40 -08:00
unknown
d9ac7c80fc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-25 11:10:07 -08:00
unknown
91827782dd Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


sql/sql_select.cc:
  Auto merged
2005-01-25 19:37:15 +01:00
unknown
026dacc1ac Some minor fixes.
mysql-test/mysql-test-run.sh:
  Less restricted permissions.
mysql-test/r/rpl_rotate_logs.result:
  If the path where mysql-test-run was run was symlinked, this test could
  fail. This is a fix.
mysql-test/t/rpl_rotate_logs.test:
  If the path where mysql-test-run was run was symlinked, this test could
  fail. This is a fix.
2005-01-25 20:08:16 +02:00
unknown
2622ed76f3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0


sql/set_var.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2005-01-25 09:35:57 -08:00
unknown
a2fdebaa8d Some bug fixes and a feature add to mysql-test-run
client/mysql.cc:
  Fixed Bug#981  ".mysql_history is lost if mysql clinent exit when out of space"
client/mysqlbinlog.cc:
  Fix for mysqlbinlog, mysql_close() needs to be called.
libmysql/Makefile.shared:
  Added use of my_rename()
mysql-test/mysql-test-run.sh:
  Added possibility to add file t/testname.disabled. This will disable a
  test with same base name. Additionally, if the .disabled file contains text,
  it will be appended as a comment after the test during run.
2005-01-25 18:32:09 +02:00
unknown
f332605b1f tT replaced with T1 to be more predictable. 2005-01-25 16:42:16 +04:00
unknown
4992049337 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-25 13:39:19 +04:00
unknown
b00551a282 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-25 10:33:07 +01:00
unknown
c889ba5ea3 Merge gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
into gw.mysql.r18.ru:/usr/home/ram/work/5.0


mysql-test/r/lowercase_table2.result:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-01-25 13:05:15 +04:00
unknown
1e9a367f1f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged
2005-01-25 10:05:14 +01:00
unknown
bb762b50a3 backported ndb_mgm options from 5.0
changed ndb_restore test somewhat to fisrt make the tables in myisam


mysql-test/mysql-test-run.sh:
  backported ndb_mgm options from 5.0
mysql-test/ndb/ndbcluster.sh:
  backported ndb_mgm options from 5.0
mysql-test/r/ndb_restore.result:
  changed ndb_restore test somewhat to fisrt make the tables in myisam
mysql-test/t/ndb_restore.test:
  changed ndb_restore test somewhat to fisrt make the tables in myisam
2005-01-25 10:03:27 +01:00
unknown
b2ca597426 Merge
mysql-test/mysql-test-run.sh:
  SCCS merged
2005-01-25 09:53:39 +01:00
unknown
d31a16d9b2 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


sql/set_var.cc:
  Auto merged
2005-01-25 09:47:01 +01:00
unknown
37c4eadb46 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0


sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-01-25 11:42:50 +03:00
unknown
27d28a2987 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-25 09:06:11 +01:00
unknown
b6ad6a12a0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261


sql/sql_table.cc:
  Auto merged
2005-01-25 11:06:12 +04:00
unknown
b7b042689c Test case (bug #7261: Alter table loses temp table with lower_case_table_names=2). 2005-01-25 10:58:30 +04:00
unknown
7b9468da2d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 07:23:07 +01:00
unknown
c312cf2762 Merge
BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2005-01-24 13:48:48 -08:00
unknown
712f3f677b merged
mysql-test/t/ctype_cp932.test:
  Change mode to -rw-rw-r--
mysql-test/t/ctype_eucjpms.test:
  Change mode to -rw-rw-r--
BitKeeper/etc/ignore:
  Added libmysqld/ha_federated.cc to the ignore list
2005-01-24 21:30:21 +01:00
unknown
409ddae4b8 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-24 11:31:21 -08:00
unknown
4332ac91cd Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


tests/mysql_client_test.c:
  Auto merged
2005-01-24 19:45:15 +01:00
unknown
a82fd1eaec merged
BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
tests/client_test.c:
  Auto merged
2005-01-24 19:41:42 +01:00
unknown
b3e4667136 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-24 19:23:53 +01:00
unknown
ccbc6f0573 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-24 19:15:44 +01:00
unknown
cc18b5f72a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl


mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-24 16:57:57 +01:00
unknown
0af8f70108 mysql_client_test.test, mysql-test-run.sh:
Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
mysql-test-run.sh:
  Renamed client_test to mysql_client_test
  Support --embedded-server test on installed server
mysql_client_test.test:
  Renamed client_test to mysql_client_test
  Use env var CLIENT_TEST with full name, it differs when run with --embedded-server
  Rename: mysql-test/t/client_test.test -> mysql-test/t/mysql_client_test.test


mysql-test/mysql-test-run.sh:
  Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
mysql-test/t/mysql_client_test.test:
  Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
2005-01-24 16:56:17 +01:00
unknown
e9db02074f Additional fix for WL#1629: SHOW with WHERE(discussed with PeterG)
- Do not allow a column list as part of SHOW WITH WHERE task.
 - The WHERE clause must accept field names which are
   valid in SHOW, not INFORMATION_SCHEMA names.


mysql-test/r/information_schema.result:
  The test correction
mysql-test/t/information_schema.test:
  The test correction
sql/sql_base.cc:
  Process field translation table for 'show' commands
sql/sql_parse.cc:
  schema_table_seformed is always true for 'show' commands
sql/sql_show.cc:
  - Do not allow a column list as part of SHOW WITH WHERE task.
  - The WHERE clause must accept field names which are
    valid in SHOW, not INFORMATION_SCHEMA names.
sql/sql_yacc.yy:
  Do not allow a column list as part of SHOW WITH WHERE task
sql/table.h:
  A new 'schema_table_reformed' variable in table_list
  If schema_table_reformed is true select items should be 
  translated using field translation table
2005-01-24 18:44:54 +03:00
unknown
38e664cf64 fixed way of forward reference detection to support literal constant (BUG#8025)
mysql-test/r/subselect.result:
  Forward reference detection
mysql-test/t/subselect.test:
  Forward reference detection
sql/item.cc:
  now forward reference is detected via ref_pointer_array, because some literal constants are 'fixed' just after creation
sql/sql_base.cc:
  fill ref_pointer_array with zerows for forward reference detection.
2005-01-24 17:17:19 +02:00
unknown
ba3b78d968 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysys/mf_keycache.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-01-24 15:50:13 +01:00
unknown
9182786918 check that row elements have the same dimention that SELECT list elements in comporison between rows and subqueries added (BUG#8022)
mysql-test/r/subselect.result:
  Comparison subquery and row with nested rows
mysql-test/t/subselect.test:
  Comparison subquery and row with nested rows
sql/item_subselect.cc:
  check that row elements have the same dimention that SELECT list elements
2005-01-24 15:56:57 +02:00
unknown
d514a06a86 fixed column number fetchinmg for subqueries. (BUG#8020)
fixed cols() method call (it have to be called only after fix_fields())


mysql-test/r/subselect.result:
  Comparison subquery with * and row
mysql-test/t/subselect.test:
  Comparison subquery with * and row
sql/item_cmpfunc.h:
  initialization allowed_arg_cols for autodetection
sql/item_func.cc:
  support of allowed_arg_cols autodetection by first argument
sql/item_func.h:
  commant
sql/item_subselect.cc:
  correct column number fetching for subqueries
sql/sql_lex.h:
  method to check that UNION is prepared
2005-01-24 14:25:44 +02:00
unknown
8827dbd4eb ndb_restore.result, mysql-test-run.sh:
added ndb_restore test
ndb_restore.result, ndb_restore.test:
  new file


mysql-test/mysql-test-run.sh:
  added ndb_restore test
mysql-test/r/ndb_restore.result:
  added ndb_restore test
2005-01-24 13:06:27 +01:00
unknown
0312a01721 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-24 10:48:52 +01:00
unknown
84e7a86d4e Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100


sql/sql_select.cc:
  Auto merged
2005-01-24 10:47:52 +01:00
unknown
343e9bbd34 mysql-test-run.sh:
backported access to ndb_mgm from 5.0


mysql-test/mysql-test-run.sh:
  backported access to ndb_mgm from 5.0
2005-01-24 10:47:51 +01:00
unknown
d7d7741e5b Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-4000


sql/sql_select.cc:
  Auto merged
2005-01-24 10:08:45 +01:00
unknown
1850f74925 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/sql_select.cc:
  Auto merged
2005-01-23 21:58:24 +02:00
unknown
539b6d59b0 Manual merge
mysql-test/r/select_found.result:
  Auto merged
2005-01-22 03:12:44 -08:00
unknown
d3db70de4c Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-22 02:42:54 -08:00
unknown
25c2d1adb0 select_found.result, select_found.test:
Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.


sql/sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.
mysql-test/t/select_found.test:
  Added a test case for bug #7945.
mysql-test/r/select_found.result:
  Added a test case for bug #7945.
2005-01-22 02:40:27 -08:00
unknown
5b5f5071ea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-21 17:50:58 +01:00
unknown
5d4f4a8131 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-21 14:57:57 +01:00
unknown
7a13309132 merge bug##7943: Wrong prefix lengths reported on UTF-8 columns
mysql-test/r/ctype_mb.result:
  Auto merged
sql/sql_show.cc:
  merge
2005-01-21 16:55:17 +04:00
unknown
33f6fe7514 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-01-21 14:54:27 +02:00