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

1721 Commits

Author SHA1 Message Date
bell@sanja.is.com.ua
b9dccb34dd fixed support of used_tables() and const_item() in subqueries
(BUG#1444)
2003-10-17 00:36:01 +03:00
unknown
724a6c3c6d subqueries made printable
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)


mysql-test/r/subselect.result:
  new explains
mysql-test/r/union.result:
  new explains
mysql-test/t/subselect.test:
  new explains
mysql-test/t/union.test:
  new explains
sql/item.cc:
  fixed printability of Items in SELECT list
sql/item.h:
  fixed printability of Items in SELECT list
sql/item_cmpfunc.cc:
  fixed print()
sql/item_cmpfunc.h:
  fixed print()
sql/item_subselect.cc:
  subqueries made printable
sql/item_subselect.h:
  subqueries made printable
sql/mysql_priv.h:
  union option made looks like options
sql/sql_derived.cc:
  now this link is used
sql/sql_lex.cc:
  subqueries made printable
sql/sql_lex.h:
  subqueries made printable
  new EXPLAIN parameter support
sql/sql_parse.cc:
  new EXPLAIN parameter
sql/sql_select.cc:
  debug output
  new EXPLAIN parameter support
sql/sql_select.h:
  new EXPLAIN parameter support
sql/sql_yacc.yy:
  new EXPLAIN parameter support
  SELECT printability support
2003-10-16 15:54:47 +03:00
bell@sanja.is.com.ua
a7bdd19707 subqueries made printable
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)
2003-10-16 15:54:47 +03:00
unknown
2c951d4cfa Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1


sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
2003-10-07 17:42:59 +03:00
bell@laptop.sanja.is.com.ua
7921834334 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1
2003-10-07 17:42:59 +03:00
unknown
d1ab51eb94 fixed error detection 2003-10-07 16:26:46 +03:00
bell@laptop.sanja.is.com.ua
862ff0ed1c fixed error detection 2003-10-07 16:26:46 +03:00
unknown
fae46f7c9f merge
sql/item_subselect.h:
  Auto merged
2003-10-07 16:22:48 +03:00
bell@laptop.sanja.is.com.ua
efae22f617 merge 2003-10-07 16:22:48 +03:00
unknown
4d9cbc266a after merge fix 2003-10-07 13:31:44 +03:00
bell@laptop.sanja.is.com.ua
09c139ac37 after merge fix 2003-10-07 13:31:44 +03:00
unknown
890f427fa7 merge
sql/item_subselect.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2003-10-07 11:24:38 +03:00
monty@narttu.mysql.fi
b31a79df3e merge 2003-10-07 11:24:38 +03:00
unknown
451cd9e37c merge
sql/sql_yacc.yy:
  Auto merged
2003-10-07 08:51:09 +03:00
bell@laptop.sanja.is.com.ua
d5a7a6ec34 merge 2003-10-07 08:51:09 +03:00
unknown
1fd6a5700b merge 2003-10-07 07:51:14 +03:00
bell@laptop.sanja.is.com.ua
dfb7ca08dc merge 2003-10-07 07:51:14 +03:00
unknown
0059448152 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2003-10-07 01:31:16 +03:00
bell@laptop.sanja.is.com.ua
18bb43671d Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 01:31:16 +03:00
unknown
7df32ac6d5 after merge fix 2003-10-07 01:28:15 +03:00
bell@laptop.sanja.is.com.ua
ccaeb61f8b after merge fix 2003-10-07 01:28:15 +03:00
unknown
bae46f1220 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/item_subselect.cc:
  Auto merged
2003-10-07 00:34:43 +03:00
monty@narttu.mysql.fi
8c0b7d5d97 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-10-07 00:34:43 +03:00
unknown
bd3beb8383 fixed error names
mysql-test/r/row.result:
  fixed error message as it was suggested by Peter Gulutzan
mysql-test/r/subselect.result:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/czech/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/danish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/dutch/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/english/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/estonian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/french/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/german/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/greek/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/hungarian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/italian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/japanese/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/korean/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/norwegian-ny/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/norwegian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/polish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/portuguese/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/romanian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/russian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/serbian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/slovak/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/spanish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/swedish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/ukrainian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
2003-10-06 22:35:05 +03:00
bell@laptop.sanja.is.com.ua
e527f268d5 fixed error names 2003-10-06 22:35:05 +03:00
unknown
ff8c8fa1ef Merge
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-10-06 20:55:06 +03:00
bell@laptop.sanja.is.com.ua
e1b53fdd42 Merge 2003-10-06 20:55:06 +03:00
unknown
45b96bb8af thd pointer storing moved to fix_fields() (WL#1254) (SCRUM)
sql/item_subselect.cc:
  thd pointer storing moved to fix_fields()
sql/item_subselect.h:
  thd pointer storing moved to fix_fields()
sql/sql_yacc.yy:
  thd pointer storing moved to fix_fields()
2003-10-02 22:19:41 +03:00
bell@laptop.sanja.is.com.ua
9db4024b8d thd pointer storing moved to fix_fields() (WL#1254) (SCRUM) 2003-10-02 22:19:41 +03:00
unknown
3b3b0d3a3d Don't print warnings about 'setrlimit' if --warnings is not given
Code review/cleanup of sub subselect_uniquesubquery_engine


sql/ha_myisam.cc:
  Removed unnecessary casts
sql/item_subselect.cc:
  Safety fix (reset engine)
  Code review/cleanup of sub subselect_uniquesubquery_engine
  Remove 'end_exec'. (Should be done on query end, not in the middle)
sql/item_subselect.h:
  Removed end_exec();
sql/mysqld.cc:
  Don't print warnings about 'setrlimit' if --warnings is not given
2003-09-29 12:39:38 +03:00
monty@narttu.mysql.fi
6905d7963e Don't print warnings about 'setrlimit' if --warnings is not given
Code review/cleanup of sub subselect_uniquesubquery_engine
2003-09-29 12:39:38 +03:00
unknown
cd8508d371 Merging 4.1 -> 5.0
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f:
  Auto merged
BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-09-24 11:29:38 +02:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
unknown
eb76a9b6ec code cleanup: removed unused constructors and methods
sql/item_subselect.cc:
  removed unused constructors
sql/item_subselect.h:
  removed unused constructors & methods
2003-09-20 18:31:56 +03:00
bell@laptop.sanja.is.com.ua
ddd019cc79 code cleanup: removed unused constructors and methods 2003-09-20 18:31:56 +03:00
unknown
e3b11b1de7 renamed join_types (as was suggested by Peter Gulutzan) 2003-09-14 09:40:57 +03:00
bell@sanja.is.com.ua
46b8c3ea8b renamed join_types (as was suggested by Peter Gulutzan) 2003-09-14 09:40:57 +03:00
unknown
d17cfa9caa removing additional IN subquery condition
fixed IN optimisation bug


mysql-test/r/subselect.result:
  test of IN optimisation bug
mysql-test/t/subselect.test:
  test of IN optimisation bug
sql/item_subselect.cc:
  fixed IN optimisation bug
sql/mysql_priv.h:
  constant for additional IN subquery condition detecting
sql/mysqld.cc:
  constant for additional IN subquery condition detecting
sql/sql_select.cc:
  removing additional IN subquery condition
2003-09-08 21:58:09 +03:00
bell@sanja.is.com.ua
813d81c726 removing additional IN subquery condition
fixed IN optimisation bug
2003-09-08 21:58:09 +03:00
unknown
57c9756b69 fixed row union processing
mysql-test/r/subselect.result:
  row union test
mysql-test/t/subselect.test:
  row union test
2003-09-07 20:35:10 +03:00
bell@sanja.is.com.ua
a02094ef10 fixed row union processing 2003-09-07 20:35:10 +03:00
unknown
834cfbd190 enum renamed (asked for compilation under windows) 2003-08-28 13:21:30 +03:00
bell@laptop.sanja.is.com.ua
ec8d6d05de enum renamed (asked for compilation under windows) 2003-08-28 13:21:30 +03:00
unknown
55e776d145 Post-merge fixes. 2003-08-26 17:41:40 +02:00
pem@mysql.telia.com
08e5a7e135 Post-merge fixes. 2003-08-26 17:41:40 +02:00
unknown
138f0adf2d Merge 4.1 into 5.0
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/insert.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2003-08-26 11:51:09 +02:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
unknown
12b769418a Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2003-08-23 13:33:02 +03:00
bell@laptop.sanja.is.com.ua
f77f46d8eb Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-08-23 13:33:02 +03:00
unknown
8c93e8ceb6 merge
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-08-20 22:17:57 +03:00