database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity
180,922 Commits 3,270 Branches 1,096 Tags
e9d9ca8c44c96e5943c0175177b3377a65b2d76f
Commit Graph

7139 Commits

Author SHA1 Message Date
monty@hundin.mysql.fi
0c5c517db6 Fixed some compilation problems in last changeset 2002-05-16 23:35:09 +03:00
unknown
9ef4edccc2 Fix bug in SELECT SQL_CALC_FOUND_ROWS 
Docs/manual.texi:
  Update of new GRANT options
libmysql/manager.c:
  Use new my_gethostbyname_r() functions
mysql-test/r/select_found.result:
  new test case
mysql-test/t/select_found.test:
  new test case
sql/mysqld.cc:
  Change names of some status variables
 2002-05-16 16:06:57 +03:00
monty@hundin.mysql.fi
5080d64c6b Fix bug in SELECT SQL_CALC_FOUND_ROWS 2002-05-16 16:06:57 +03:00
unknown
5a8763b3f8 resolve changes 
sql/sql_parse.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2002-05-15 14:11:27 +03:00
Sinisa@sinisa.nasamreza.org
961f98f1d0 resolve changes 2002-05-15 14:11:27 +03:00
unknown
c5bfcc9d7f Features made for Schlund plus several bug fixes. 
Read a manual for more detail
 2002-05-15 13:50:38 +03:00
Sinisa@sinisa.nasamreza.org
d65671f778 Features made for Schlund plus several bug fixes. 
Read a manual for more detail
 2002-05-15 13:50:38 +03:00
unknown
716ed1168f Sergei's MyODBC fix 2002-05-12 23:01:45 -03:00
miguel@hegel.local
3facae335e Sergei's MyODBC fix 2002-05-12 23:01:45 -03:00
unknown
044cbe42ac simple subselects ported to new select_lex structures 
include/mysqld_error.h:
  simple subselects
libmysqld/Makefile.am:
  simple subselects
sql/Makefile.am:
  simple subselects
sql/item.h:
  simple subselects
sql/item_strfunc.h:
  simple subselects
sql/share/czech/errmsg.txt:
  simple subselects
sql/share/danish/errmsg.txt:
  simple subselects
sql/share/dutch/errmsg.txt:
  simple subselects
sql/share/english/errmsg.txt:
  simple subselects
sql/share/estonian/errmsg.txt:
  simple subselects
sql/share/french/errmsg.txt:
  simple subselects
sql/share/german/errmsg.txt:
  simple subselects
sql/share/greek/errmsg.txt:
  simple subselects
sql/share/hungarian/errmsg.txt:
  simple subselects
sql/share/italian/errmsg.txt:
  simple subselects
sql/share/japanese/errmsg.txt:
  simple subselects
sql/share/korean/errmsg.txt:
  simple subselects
sql/share/norwegian-ny/errmsg.txt:
  simple subselects
sql/share/norwegian/errmsg.txt:
  simple subselects
sql/share/polish/errmsg.txt:
  simple subselects
sql/share/portuguese/errmsg.txt:
  simple subselects
sql/share/romanian/errmsg.txt:
  simple subselects
sql/share/russian/errmsg.txt:
  simple subselects
sql/share/slovak/errmsg.txt:
  simple subselects
sql/share/spanish/errmsg.txt:
  simple subselects
sql/share/swedish/errmsg.txt:
  simple subselects
sql/share/ukrainian/errmsg.txt:
  simple subselects
sql/sql_class.cc:
  simple subselects
sql/sql_class.h:
  simple subselects
sql/sql_lex.cc:
  simple subselects
sql/sql_select.cc:
  simple subselects
sql/sql_select.h:
  simple subselects
sql/sql_union.cc:
  simple subselects
sql/sql_yacc.yy:
  simple subselects
 2002-05-12 23:46:42 +03:00
bell@sanja.is.com.ua
e077890b04 simple subselects ported to new select_lex structures 2002-05-12 23:46:42 +03:00
unknown
6ff06df233 new SELECT_LEX structures used for storing global ORDER BY, global LIMIT & limit counters 
mysql-test/r/union.result:
  correct result of union explain command
 2002-05-08 23:14:40 +03:00
bell@sanja.is.com.ua
ead6f225a4 new SELECT_LEX structures used for storing global ORDER BY, global LIMIT & limit counters 2002-05-08 23:14:40 +03:00
unknown
7abf67c5e9 init_dynamic_array MyODBC compatibility fix 2002-04-28 21:22:37 +00:00
serg@serg.mysql.com
900788b2a1 init_dynamic_array MyODBC compatibility fix 2002-04-28 21:22:37 +00:00
unknown
3adee5046d MI_KEYSEG -> HA_KEYSEG 
_mi_key_cmp -> ha_key_cmp


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2002-04-25 15:10:29 +05:00
ram@gw.udmsearch.izhnet.ru
b8a12a8cec MI_KEYSEG -> HA_KEYSEG 
_mi_key_cmp -> ha_key_cmp
 2002-04-25 15:10:29 +05:00
unknown
fdc446d0c6 merge 
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-pentium-debug:
  Auto merged
acconfig.h:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
heap/hp_rfirst.c:
  Auto merged
heap/hp_rnext.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/my_vsnprintf.c:
  Auto merged
sql/convert.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
strings/Makefile.am:
  Auto merged
 2002-04-13 15:34:39 +03:00
monty@hundin.mysql.fi
b5a145d872 merge 2002-04-13 15:34:39 +03:00
unknown
6326ec9944 Update for BTREE keys in HEAP tables 
Split handler->option_flag() to handler->table_flags() and handler->index_flags()


Docs/manual.texi:
  Updated standard binary options
include/my_base.h:
  Update for BTREE keys in HEAP tables
libmysql/net.c:
  merge with net_serv.cc
mysql-test/r/func_misc.result:
  Update for new behaviour of inet_ntoa
sql/field.cc:
  Update for BTREE keys in HEAP tables
sql/field.h:
  Update for BTREE keys in HEAP tables
sql/filesort.cc:
  Update for BTREE keys in HEAP tables
sql/ha_berkeley.h:
  Update for BTREE keys in HEAP tables
sql/ha_heap.h:
  Update for BTREE keys in HEAP tables
sql/ha_innodb.h:
  Update for BTREE keys in HEAP tables
sql/ha_isam.cc:
  Update for BTREE keys in HEAP tables
sql/ha_isam.h:
  Update for BTREE keys in HEAP tables
sql/ha_isammrg.h:
  Update for BTREE keys in HEAP tables
sql/ha_myisam.cc:
  Update for BTREE keys in HEAP tables
sql/ha_myisam.h:
  Update for BTREE keys in HEAP tables
sql/ha_myisammrg.h:
  Update for BTREE keys in HEAP tables
sql/handler.cc:
  Update for BTREE keys in HEAP tables
sql/handler.h:
  Update for BTREE keys in HEAP tables
sql/log.cc:
  Update for BTREE keys in HEAP tables
sql/net_serv.cc:
  Update for BTREE keys in HEAP tables
sql/opt_range.cc:
  Update for BTREE keys in HEAP tables
sql/opt_sum.cc:
  Update for BTREE keys in HEAP tables
sql/records.cc:
  Update for BTREE keys in HEAP tables
sql/sql_class.h:
  Update for BTREE keys in HEAP tables
sql/sql_handler.cc:
  Update for BTREE keys in HEAP tables
sql/sql_insert.cc:
  Update for BTREE keys in HEAP tables
sql/sql_select.cc:
  Update for BTREE keys in HEAP tables
sql/sql_show.cc:
  Update for BTREE keys in HEAP tables
sql/sql_table.cc:
  Update for BTREE keys in HEAP tables
sql/structs.h:
  Update for BTREE keys in HEAP tables
sql/table.cc:
  Update for BTREE keys in HEAP tables
sql/unireg.cc:
  Update for BTREE keys in HEAP tables
 2002-04-12 21:35:46 +03:00
monty@tik.mysql.fi
056175a1ce Update for BTREE keys in HEAP tables 
Split handler->option_flag() to handler->table_flags() and handler->index_flags()
 2002-04-12 21:35:46 +03:00
unknown
5560713590 Merge 
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
readline/Makefile.am:
  Auto merged
sql/convert.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
 2002-04-02 19:46:26 +03:00
monty@hundin.mysql.fi
6e247490dc Merge 2002-04-02 19:46:26 +03:00
unknown
d2771b82a4 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2002-04-02 14:59:40 +00:00
serg@serg.mysql.com
fa5717b950 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2002-04-02 14:59:40 +00:00
unknown
8bf63614de fts+const_tables bug fixed 2002-04-02 14:56:40 +00:00
serg@serg.mysql.com
8d8a133d51 fts+const_tables bug fixed 2002-04-02 14:56:40 +00:00
unknown
36b38aa503 merge with 3.23.50 
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
configure.in:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/range.test:
  Auto merged
scripts/mysqldumpslow.sh:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/share/Makefile.am:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
Docs/manual.texi:
  merge
client/mysql.cc:
  merge
client/mysqldump.c:
  merge
innobase/buf/buf0buf.c:
  merge
innobase/os/os0file.c:
  merge
innobase/row/row0mysql.c:
  merge
mysql-test/r/range.result:
  merge
sql/ha_innodb.cc:
  merge
sql/log_event.h:
  merge
sql/mysqld.cc:
  merge
sql/sql_base.cc:
  merge
sql/sql_load.cc:
  merge
 2002-03-27 01:56:10 +02:00
monty@hundin.mysql.fi
727e507bca merge with 3.23.50 2002-03-27 01:56:10 +02:00
unknown
8f2f159750 Fix for bug in WHERE key='j' or key='J' 
Docs/manual.texi:
  Changelog
myisam/myisampack.c:
  Delete tmp file on error.
mysql-test/r/range.result:
  Updated test case
mysql-test/t/range.test:
  Updated test case
 2002-03-22 14:03:42 +02:00
monty@hundin.mysql.fi
ed040fe21e Fix for bug in WHERE key='j' or key='J' 2002-03-22 14:03:42 +02:00
unknown
38e14c0371 Fixed problem with WHERE key=const ORDER BY key DESC 
Docs/manual.texi:
  Changelog
myisam/ft_boolean_search.c:
  Portability fix
sql/ha_myisam.cc:
  Cleanup
sql/sql_union.cc:
  cleanup
 2002-03-15 21:30:50 +02:00
monty@hundin.mysql.fi
f0e835ac09 Fixed problem with WHERE key=const ORDER BY key DESC 2002-03-15 21:30:50 +02:00
unknown
8e1ab145b3 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2002-03-15 14:21:43 +02:00
Sinisa@sinisa.nasamreza.org
d8b085b92b Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
 2002-03-15 14:21:43 +02:00
unknown
53bd33c676 making full-text working with UNION's 2002-03-15 14:21:06 +02:00
Sinisa@sinisa.nasamreza.org
5e092e2fc6 making full-text working with UNION's 2002-03-15 14:21:06 +02:00
unknown
3b2e1fd276 Making full-text queries working with UNION's 2002-03-15 14:11:11 +02:00
Sinisa@sinisa.nasamreza.org
ec80dec9b0 Making full-text queries working with UNION's 2002-03-15 14:11:11 +02:00
unknown
8959b690fe Hash now supports several charsets 2002-03-14 21:44:42 +04:00
bar@gw.udmsearch.izhnet.ru
c60a29f0ee Hash now supports several charsets 2002-03-14 21:44:42 +04:00
unknown
873963d4ca merge 
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
 2002-03-06 23:41:18 +02:00
monty@hundin.mysql.fi
e9ba8d58fe merge 2002-03-06 23:41:18 +02:00
unknown
1a7c7d763c Fixes done in 4.0 repository. For comments see the corresponding ones 
in 4.0.
 2002-03-05 16:12:11 +02:00
Sinisa@sinisa.nasamreza.org
0e7c34920d Fixes done in 4.0 repository. For comments see the corresponding ones 
in 4.0.
 2002-03-05 16:12:11 +02:00
unknown
a02a98c401 several bug fixes and tests 
mysql-test/mysql-test-run.sh:
  Fix for LOAD DATA LOCAL ...
mysql-test/r/select_found.result:
  Added result for a new test of combo of options for FOUND_ROWS and
  BUFFER_RESULT
mysql-test/t/select_found.test:
  Added test for combo of options for BUFFER_RESULT and FOUND_ROWS
sql/sql_select.cc:
  Added fix for combo of options for BUFFER_RESULT and FOUND_ROWS
 2002-03-05 14:22:32 +02:00
Sinisa@sinisa.nasamreza.org
1086e7c52f several bug fixes and tests 2002-03-05 14:22:32 +02:00
unknown
df663f5072 merge 
sql/sql_acl.cc:
  Auto merged
Docs/manual.texi:
  Merge
sql/sql_select.cc:
  Merge
 2002-03-02 13:59:26 +02:00
monty@tik.mysql.fi
cb3499b7de merge 2002-03-02 13:59:26 +02:00
unknown
ad4fcb8a01 Fix sorting of NULL values (Should always be first) 
Fix problem with HAVING and MAX() IS NOT NULL


Docs/manual.texi:
  Changelog & NULL usage with ORDER BY
client/mysqldump.c:
  Cleanup disable keys
mysql-test/r/distinct.result:
  Fix results after ORDER BY with NULL fix
mysql-test/r/group_by.result:
  Fix results after ORDER BY with NULL fix
mysql-test/r/having.result:
  Testcase for bug with HAVING
mysql-test/t/distinct.test:
  Test for DISTINCT + ORDER BY DESC bug
mysql-test/t/having.test:
  Test of HAVING and MAX IS NOT NULL
sql/filesort.cc:
  Fix sorting of NULL values (Should always be first)
sql/item.h:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/item_sum.h:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.cc:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.h:
  Fix sorting of NULL values
sql/sql_select.cc:
  Fix sorting of ORDER BY ... DESC on NULL values.
 2002-03-02 09:51:24 +02:00