Commit graph

3708 commits

Author SHA1 Message Date
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
unknown
2c62a868a6 new SELECT_LEX structure
mysql-test/r/derived.result:
  derived table bug test
mysql-test/t/derived.test:
  derived table bug test
sql/mysql_priv.h:
  new mysql_new_select call & layout fixing
sql/sql_class.h:
  passing unit as parameter of Table_ident constructor
sql/sql_lex.cc:
  new SELECT_LEX structure methods
sql/sql_lex.h:
  new SELECT_LEX structure definition
sql/table.h:
  fixed layout
2002-05-07 00:04:16 +03:00
unknown
234dc3a35e Index number argument
Fix in test results


heap/hp_rfirst.c:
  Index number argument
heap/hp_rlast.c:
  Index number argument
heap/hp_test2.c:
  Index number argument
include/heap.h:
  Index number argument
mysql-test/r/heap_btree.result:
  Test results fix
sql/ha_heap.cc:
  Index number argument
2002-04-29 13:53:29 +05: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
unknown
139a73cade RB-Tree indexes support in HEAP tables
Renamed _hp_func  ->  hp_func
mi_key_cmp moved to /mysys/my_handler.c
New tests for HEAP tables


heap/_check.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/_rectest.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/heapdef.h:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_block.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_clear.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_close.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_create.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_delete.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_hash.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_open.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_panic.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_rename.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_rfirst.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_rkey.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_rlast.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_rnext.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_rprev.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_rrnd.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_rsame.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_scan.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_test1.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_test2.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_update.c:
  RB-tree index
  Renamed _hp_func -> hp_func
heap/hp_write.c:
  RB-tree index
  Renamed _hp_func -> hp_func
include/Makefile.am:
  New include
include/heap.h:
  RB-Tree index
include/my_tree.h:
  new search functions
  new custom_arg argument
include/myisam.h:
  Removed MI_KEYSEG
isam/isamlog.c:
  Add custom_arg
isam/pack_isam.c:
  Add custom_arg
myisam/ft_nlq_search.c:
  Add custom_arg
myisam/ft_parser.c:
  Add custom_arg
myisam/ft_stopwords.c:
  Add custom_arg
myisam/mi_search.c:
  Remove mi_key_cmp
myisam/mi_write.c:
  Add custom_arg
myisam/myisamdef.h:
  Remove mi_key_cmp
myisam/myisamlog.c:
  Add custom_arg
myisam/myisampack.c:
  Add custom_arg
mysys/Makefile.am:
  New file my_handler.c
mysys/tree.c:
  custom_arg
  new search functions
sql/ha_heap.cc:
  RBTree
sql/ha_myisam.cc:
  RBTree
sql/item_sum.cc:
  custom_arg
sql/sql_analyse.cc:
  custom_arg
sql/sql_class.h:
  custom_arg
sql/sql_table.cc:
  Remove duplicate code
sql/sql_yacc.yy:
  UNDEF by default
sql/table.cc:
  Remove dirty hack
2002-04-25 13:36:55 +05:00
unknown
0e4445850d Exhange HA_AUTO_KEY and HA_SPATIAL values: FRM stores only 8bit flags 2002-04-18 17:35:26 +05:00
unknown
c7e72e8d55 Fix to use Monty's changes in frm format
Enable latin1 by default


configure.in:
  Always compile latin1
sql/ha_myisam.cc:
  Fix for "SHOW KEYS FROM table" and various key types
sql/sql_show.cc:
  Fix to use Monty's changes in frm format
sql/sql_table.cc:
  Fix to use Monty's changes in frm format
sql/structs.h:
  Fix to use Monty's changes in frm format
sql/table.cc:
  Fix to use Monty's changes in frm format
2002-04-18 14:08:38 +05:00
unknown
e8b6c9646e Fix for AsText() spatial function
sql/item_strfunc.cc:
  Fix for the case when argument args[0] and result str are the same strings
2002-04-18 11:53:59 +05:00
unknown
48297dbfcf Fix for problem that GROUP BY and DISTINCT didn't work for UTF8 2002-04-17 17:27:13 +05:00
unknown
804af496a1 Some charsets require special hash function
New file ctype-win1250ch, I forgot to commit it in my previous changes 


include/m_ctype.h:
  Some charsets require special hash function
mysys/hash.c:
  Some charsets require special hash function
strings/ctype-utf8.c:
  Some charsets require special hash function
strings/ctype.c:
  Some charsets require special hash function
2002-04-17 15:57:18 +05:00
unknown
08665a17e0 New win1250ch charset 2002-04-17 14:16:26 +05:00
unknown
32ac1ef044 Some fixes after merging changes from 4.0
include/hash.h:
  Monty forgot to add H in left part of macros
mysys/hash.c:
  I wonder how it happened that my_bool disappeared
sql/sql_acl.cc:
  Somebody forgot )
sql/sql_class.h:
  I wonder how it happened that this line disappeared
sql/sql_table.cc:
  small typo
sql/sql_yacc.yy:
  Having ; is more compatible
2002-04-16 18:21:53 +05:00
unknown
7be6a76520 Somebody made a bug here: one line disappeared 2002-04-15 20:01:16 +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
unknown
54373c16f8 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-04-12 22:23:46 +03:00
unknown
caf41c9e43 merge
client/mysql.cc:
  Auto merged
2002-04-12 21:53:41 +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
unknown
3a9fa2ac8a Merge work.mysql.com:/home/bk/mysql-4.0
into george.bitbike.com:/home/arjen/mysql-4.0
2002-04-13 04:21:08 +10:00
unknown
783217fd2c manual.texi:
Some more column width fraction fixups.
  Filled out a table with proper number of columns.
  Some typo/style fixes.
  Zapped inaccurate uninformative roadmap table.


Docs/manual.texi:
  Some more column width fraction fixups.
  Filled out a table with proper number of columns.
  Some typo/style fixes.
  Zapped inaccurate uninformative roadmap table.
2002-04-13 04:19:57 +10:00
unknown
87ece1faac Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-04-12 16:01:56 +03:00
unknown
b0bd0c047d Adding some things according to Monty's correct observations 2002-04-12 16:01:09 +03:00
unknown
a58fbde1d2 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2002-04-12 15:26:54 +03:00
unknown
7b98065934 manual.texi:
Little fixups.


Docs/manual.texi:
  Little fixups.
2002-04-12 20:16:06 +10:00
unknown
1342c941c2 avoidance of caching mysqldump queries 2002-04-12 12:44:26 +03:00
unknown
f04a35e71b manual.texi:
Auch typo fix (tnx Paul!)


Docs/manual.texi:
  Auch typo fix (tnx Paul!)
2002-04-12 18:43:24 +10:00
unknown
d10eb32a38 manual.texi:
Fixed caps.


Docs/manual.texi:
  Fixed caps.
2002-04-11 21:31:16 +10:00
unknown
eb785a8f34 manual.texi:
Licensing and various other fixups (Zak & Arjen).


Docs/manual.texi:
  Licensing and various other fixups (Zak & Arjen).
2002-04-11 21:17:43 +10:00
unknown
4fadbd9ce7 errmsg.txt:
Translated new error message to Dutch.


sql/share/dutch/errmsg.txt:
  Translated new error message to Dutch.
2002-04-11 14:27:41 +10:00
unknown
84e1ffd271 manual.texi:
Multitable column fixups remainder: ch.4-9, all appendices.
  Fixed a few minor formatting errors.


Docs/manual.texi:
  Multitable column fixups remainder: ch.4-9, all appendices.
  Fixed a few minor formatting errors.
2002-04-11 03:25:39 +10:00
unknown
1ef9c16a86 manual.texi:
multitable column fractions fixed ch.1-3 (for O'Reilly).


Docs/manual.texi:
  multitable column fractions fixed ch.1-3 (for O'Reilly).
2002-04-11 00:16:41 +10:00
unknown
1894f1e0fa manual.texi, manual.de.texi:
@Node name change Parenthesis -> Parentheses (from Paul DuBois)


Docs/manual.de.texi:
  @Node name change Parenthesis -> Parentheses (from Paul DuBois)
Docs/manual.texi:
  @Node name change Parenthesis -> Parentheses (from Paul DuBois)
2002-04-10 20:38:01 +10:00
unknown
bf71588304 manual.texi Change note mod, 4.0.2.
Docs/manual.texi:
  Change note mod, 4.0.2.
2002-04-09 09:32:43 -05:00
unknown
753a501df0 Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-04-09 09:28:17 -05:00
unknown
8c08e31c2f manual.texi Change note mods, 3.22.27 and below.
manual.texi	modify a few @xref{}s.
manual.texi	missing @code{}.


Docs/manual.texi:
  Change note mods, 3.22.27 and below.
2002-04-09 09:27:00 -05:00
unknown
732f4bf541 manual.texi:
Text cleanup (by Colin Faber).


Docs/manual.texi:
  Text cleanup (by Colin Faber).
2002-04-09 19:29:23 +10:00
unknown
c2a95d9b10 logging_ok:
Logging to logging@openlogging.org accepted
manual.texi:
  'migration' not a keyword.


Docs/manual.texi:
  'migration' not a keyword.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-04-09 17:53:38 +10:00
unknown
fc79f8e68a fixed bug in truncating temp tables
fixed compilation problem on FreeBSD
added test for truncating temporary tables


mysql-test/r/truncate.result:
  truncate test
mysql-test/t/truncate.test:
  truncate test update
mysys/safemalloc.c:
  fixed FreeBSD compilation problem
sql/sql_delete.cc:
  fixed bug in truncating temporary tables
2002-04-08 18:20:24 -06:00
unknown
40a2774087 Fix for INET_NTOA(N) when N >= 2^32
Docs/manual.texi:
  SCO updates
client/mysql.cc:
  Don't die on SIGQUIT
2002-04-06 18:47:54 +03:00
unknown
d85cacfa63 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-04-05 23:08:33 -07:00
unknown
a28f2ca67d safemalloc cleanup. Maybe it will now compile on FreeBSD. I still not have
access to a FreeBSD box, though.


mysys/my_static.h:
  cleanup
mysys/safemalloc.c:
  cleanup
sql/mysqld.cc:
  initialize some safemalloc variables in main()
2002-04-05 23:07:25 -07:00
unknown
4930cfdde2 manual.texi Removed duplicated item from 4.1 to-do list.
Docs/manual.texi:
  Removed duplicated item from 4.1 to-do list.
2002-04-05 09:34:19 -06:00
unknown
ded46e0b4d Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0
2002-04-05 08:47:05 -06:00
unknown
91c373fc72 fixes to make it compile and pass the test suite again after the last
accidental push of broken code.


client/mysqladmin.c:
  fixed crash in free_defaults()
libmysql/Makefile.shared:
  added my_getopt to libmysqlclient
mysys/my_getopt.c:
  fixed bug in parsing -O var=val
2002-04-04 21:36:24 -07:00
unknown
a9085c717f Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-04-04 11:36:03 -06:00
unknown
59e0e7fc25 manual.texi fix typos, grammar in LOAD DATA LOCAL section
manual.texi	minor tweaks
manual.texi	VARCHAR(0) is legal now.


Docs/manual.texi:
  fix typos, grammar in LOAD DATA LOCAL section
2002-04-04 11:34:49 -06:00
unknown
36701f1840 fix for SQL_CALC_FOUND_ROWS in UNION's 2002-04-03 17:52:31 +03:00
unknown
576530f771 Merged some sslopt-* include files, that will be removed in the near
future, in mysqld.cc.


sql/mysqld.cc:
  Added support for SSL. This is just temporary solution
  and will be fixed to use my_getopt, when mysqld.cc is changed.
2002-04-03 16:09:02 +03:00
unknown
adf9ce219c Merge work:/home/bk/mysql-4.0/ into hynda.mysql.fi:/home/my/bk/mysql-4.0 2002-04-03 15:44:59 +03:00
unknown
02f0a2f2eb Merge and two bug fixes in my_getopt.c
client/mysql.cc:
  merge
client/mysqldump.c:
  merge
myisam/myisamchk.c:
  merge
mysys/my_getopt.c:
  Fixed a bug with short options when type was GET_BOOL.
  Fixed a bug in my_print_help() function.
2002-04-03 15:44:20 +03:00
unknown
c9d04284c8 merge 2002-04-03 13:36:01 +03:00