database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-06 05:42:06 +03:00
Code Activity
189,727 Commits 3,311 Branches 1,099 Tags
e7bab059b764bc58ee14e182b51f90c47a6c8e17
Commit Graph

1516 Commits

Author SHA1 Message Date
unknown
54396ee830 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1


sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_select.h:
  Auto merged
 2003-07-22 11:20:02 +03:00
bell@sanja.is.com.ua
695c71d1c1 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
 2003-07-22 11:20:02 +03:00
unknown
ca6c74b7ee merge 
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-07-22 11:18:51 +03:00
bell@sanja.is.com.ua
af41a59af7 merge 2003-07-22 11:18:51 +03:00
unknown
56b220b11e Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-07-18 18:06:45 +02:00
serg@serg.mylan
859a4cc116 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-07-18 18:06:45 +02:00
unknown
ed8be699fe new optimisation for ref_null (SCRUM) (WL#818) 
mysql-test/r/subselect.result:
  results of new optimisation
mysql-test/t/subselect.test:
  results of new optimisation
sql/item_cmpfunc.h:
  function type
sql/item_func.h:
  function type
sql/item_subselect.cc:
  new optimisation for ref_or_null
sql/item_subselect.h:
  new optimisation for ref_or_null
sql/sql_select.cc:
  new optimisation for ref_or_null
sql/sql_select.h:
  item_subselect.cc need safe_index_read
 2003-07-17 19:39:31 +03:00
bell@sanja.is.com.ua
7e34954b5e new optimisation for ref_null (SCRUM) (WL#818) 2003-07-17 19:39:31 +03:00
unknown
d5a6d17707 CASE stores first_expr and else_expr in args[] array now. 
This allowed to reuse a lot of code.
 2003-07-17 16:07:56 +05:00
bar@bar.mysql.r18.ru
8c06421c12 CASE stores first_expr and else_expr in args[] array now. 
This allowed to reuse a lot of code.
 2003-07-17 16:07:56 +05:00
unknown
eba0a3aaad merge 
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-07-16 13:58:11 +03:00
bell@sanja.is.com.ua
a6b1a6fe3a merge 2003-07-16 13:58:11 +03:00
unknown
5aa330863b Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-07-15 14:58:04 +02:00
serg@serg.mylan
737bade99c Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-07-15 14:58:04 +02:00
unknown
4b3eecf46b Item_func_field doesn't have a separate Item to store the first argument. 
It's now passed as args[0]. This fix allowed to resuse a lot of code.
 2003-07-15 17:33:00 +05:00
bar@bar.mysql.r18.ru
4b9c7f8336 Item_func_field doesn't have a separate Item to store the first argument. 
It's now passed as args[0]. This fix allowed to resuse a lot of code.
 2003-07-15 17:33:00 +05:00
unknown
d6b336359a Merge 4.1 into 5.0 (first pass). 
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-cron-build:
  Delete: netware/BUILD/cron-build
BitKeeper/deleted/.del-crontab:
  Delete: netware/BUILD/crontab
BitKeeper/triggers/post-commit:
  Auto merged
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
libmysqld/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
netware/BUILD/compile-AUTOTOOLS:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
netware/BUILD/compile-netware-START:
  Auto merged
netware/BUILD/compile-netware-all:
  Auto merged
netware/BUILD/compile-netware-debug:
  Auto merged
netware/BUILD/compile-netware-standard:
  Auto merged
netware/BUILD/mwasmnlm:
  Auto merged
netware/BUILD/mwccnlm:
  Auto merged
netware/BUILD/mwldnlm:
  Auto merged
netware/BUILD/nwbootstrap:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.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_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
 2003-07-08 17:50:23 +02:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
unknown
2cd6d8ec6b merge 
mysql-test/t/subselect.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2003-07-07 10:30:52 +03:00
bell@sanja.is.com.ua
7ad5331768 merge 2003-07-07 10:30:52 +03:00
unknown
4efcd17029 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.h:
  Auto merged
 2003-07-06 21:36:59 +02:00
serg@serg.mylan
40f4cee265 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-07-06 21:36:59 +02:00
unknown
aa1b02400e renamed enum Item_cast as it's not a 'class Item' child 2003-07-06 17:12:45 +02:00
serg@serg.mylan
e11efbddfa renamed enum Item_cast as it's not a 'class Item' child 2003-07-06 17:12:45 +02:00
unknown
a371a6e6ca Better arguments format to allow reuse more code 2003-07-04 19:56:32 +05:00
bar@bar.mysql.r18.ru
3fbc765b04 Better arguments format to allow reuse more code 2003-07-04 19:56:32 +05:00
unknown
3b09b2f000 New methods 
Item_func::agg_arg_collations()
  Item_func::arr_arg_collations_for_comparison()
 to aggregate argument collations.
It helps to reuse a lot of code.
 2003-07-04 18:12:23 +05:00
bar@bar.mysql.r18.ru
0c2041cfdf New methods 
Item_func::agg_arg_collations()
  Item_func::arr_arg_collations_for_comparison()
 to aggregate argument collations.
It helps to reuse a lot of code.
 2003-07-04 18:12:23 +05:00
unknown
fcc962edcc FIELD() now takes in account arguments collations 2003-07-03 19:24:38 +05:00
bar@bar.mysql.r18.ru
d1607a11fe FIELD() now takes in account arguments collations 2003-07-03 19:24:38 +05:00
unknown
29898afbdd Item tree iterator 
fixed dependence of items from reduced subquery
(SCRUM)


sql/item.cc:
  fixed dependence of items from reduced subquery
sql/item.h:
  fixed dependence of items from reduced subquery
  Item tree iterator
sql/item_cmpfunc.cc:
  Item tree iterator
sql/item_cmpfunc.h:
  Item tree iterator
sql/item_func.cc:
  Item tree iterator
sql/item_func.h:
  Item tree iterator
sql/item_row.cc:
  Item tree iterator
sql/item_row.h:
  Item tree iterator
sql/item_strfunc.h:
  Item tree iterator
sql/item_subselect.cc:
  Item tree iterator
 2003-07-02 13:12:18 +03:00
bell@sanja.is.com.ua
2ae8a00b2a Item tree iterator 
fixed dependence of items from reduced subquery
(SCRUM)
 2003-07-02 13:12:18 +03:00
unknown
585cec0564 after review changes (SCRUM) 
removed outer resolving flag (because of movingtransformation after fix_fields)


sql/item.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_cmpfunc.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_cmpfunc.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_func.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_func.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_row.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_row.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_strfunc.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_subselect.cc:
  after review changes
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_subselect.h:
  after review changes
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/mysql_priv.h:
  after review changes
sql/sql_base.cc:
  after review changes
sql/sql_lex.cc:
  after review changes
sql/sql_lex.h:
  after review changes
sql/sql_select.cc:
  after review changes
sql/sql_union.cc:
  after review changes
 2003-07-02 01:45:22 +03:00
bell@sanja.is.com.ua
5eaaf8e732 after review changes (SCRUM) 
removed outer resolving flag (because of movingtransformation after fix_fields)
 2003-07-02 01:45:22 +03:00
unknown
a3beaaa3af LEFT JOIN optimization: Change LEFT JOIN to normal join if possible 
mysql-test/r/select.result:
  Added test for LEFT JOIN optimization
mysql-test/t/select.test:
  Added test for LEFT JOIN optimization
sql/item.h:
  LEFT JOIN optimization
sql/item_cmpfunc.cc:
  LEFT JOIN optimization
sql/item_cmpfunc.h:
  LEFT JOIN optimization
sql/item_func.cc:
  LEFT JOIN optimization
sql/item_func.h:
  LEFT JOIN optimization
sql/item_strfunc.cc:
  LEFT JOIN optimization
sql/sql_base.cc:
  Heart of LEFT JOIN optimization
 2003-06-26 05:38:19 +03:00
monty@mashka.mysql.fi
7655f05dc2 LEFT JOIN optimization: Change LEFT JOIN to normal join if possible 2003-06-26 05:38:19 +03:00
unknown
15ee7b04da LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX() 
now process arguments according to standard SQL collation determation
rules.
 2003-06-25 15:07:20 +05:00
bar@bar.mysql.r18.ru
c6c4e8b8e1 LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX() 
now process arguments according to standard SQL collation determation
rules.
 2003-06-25 15:07:20 +05:00
unknown
64d7734f38 New class DTCollation (SQL:2003 calls it "declared type collation") 
It's a combination of collation and its derivation (precedence order)
 2003-06-24 15:11:07 +05:00
bar@bar.mysql.r18.ru
7371150f2d New class DTCollation (SQL:2003 calls it "declared type collation") 
It's a combination of collation and its derivation (precedence order)
 2003-06-24 15:11:07 +05:00
unknown
7a99669fbc Moved spatial functions to the sql/item_geofunc.cc file. 
BitKeeper/etc/ignore:
  Added libmysqld/item_geofunc.cc to the ignore list
 2003-05-30 15:22:34 +05:00
ram@mysql.r18.ru
a36d4212fc Moved spatial functions to the sql/item_geofunc.cc file. 2003-05-30 15:22:34 +05:00
unknown
36752387c1 Merged 4.1 into 5.0. 
client/mysql.cc:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-04-16 23:23:23 +02:00
pem@mysql.com
386b0b91b2 Merged 4.1 into 5.0. 2003-04-16 23:23:23 +02:00
unknown
75bdeb1b21 added compress/uncompress function 
sql/mysql_priv.h:
  added have_compress variable
sql/mysqld.cc:
  added have_compress variable
sql/set_var.cc:
  added have_compress variable
 2003-04-09 20:50:30 -04:00
vva@eagle.mysql.r18.ru
950fa7aa8a added compress/uncompress function 2003-04-09 20:50:30 -04:00
unknown
8db55dcf86 Merged 4.1 into 5.0. 
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2003-03-27 12:09:11 +01:00
pem@mysql.com
c77699ca93 Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01:00
unknown
4809dc7419 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into genie.(none):/home/hf/work/mysql-4.1.lck


sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
 2003-03-21 11:06:15 +04:00
hf@genie.(none)
43d3472642 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into genie.(none):/home/hf/work/mysql-4.1.lck
 2003-03-21 11:06:15 +04:00