Commits · e640e2e2c030d61080ce50fc7510606b8f83bc22 · Kirill Smelkov / mariadb

26 May, 2002 2 commits

merge · e640e2e2

unknown authored May 26, 2002


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/item_strfunc.h:
  merge layout fixing
sql/sql_update.cc:
  merge layout fixing

e640e2e2

added depended subselect processing · 02d8b9ba

unknown authored May 26, 2002


mysql-test/r/subselect.result:
  depended subselect test
mysql-test/t/subselect.test:
  depended subselect test
sql/item.cc:
  resolving field names in depended queries
sql/item_subselect.cc:
  move optimization just before execution, because we can't optimize inner depended subselect if have not optimized outer subselect
sql/item_subselect.h:
  move optimization just before execution
sql/sql_lex.h:
  some inline methods to hide internal SELECT_LEX structures
sql/sql_select.cc:
  fixed error

02d8b9ba

23 May, 2002 1 commit
- Heap table code cleanup · c1f3be5b
  unknown authored May 23, 2002
  
  c1f3be5b
22 May, 2002 2 commits

Fixed key algorithm handling · e494b724
unknown authored May 22, 2002
```
sql/sql_string.cc:
  Portability fix
```
e494b724

Fixed problem in fulltest testcase · a8652e99

unknown authored May 22, 2002


include/my_base.h:
  Fix to ensure that old tables works in 4.1
myisam/mi_open.c:
  cleanup
mysys/my_handler.c:
  Fixed problem in fulltest testcase
sql/spatial.cc:
  cleanup
sql/sql_table.cc:
  cleanup

a8652e99

21 May, 2002 1 commit

BTREE heap key structure is now the same as MyISAM · c811538f

unknown authored May 21, 2002

_mi_compare_text -> mi_compate_text
Changes according Monty's suggestions


heap/heapdef.h:
  BTREE heap key structure is now the same as MyISAM
heap/hp_delete.c:
  BTREE heap key structure is now the same as MyISAM
heap/hp_hash.c:
  BTREE heap key structure is now the same as MyISAM
heap/hp_open.c:
  BTREE heap key structure is now the same as MyISAM
heap/hp_rfirst.c:
  BTREE heap key structure is now the same as MyISAM
heap/hp_rkey.c:
  BTREE heap key structure is now the same as MyISAM
heap/hp_rlast.c:
  BTREE heap key structure is now the same as MyISAM
heap/hp_rnext.c:
  BTREE heap key structure is now the same as MyISAM
heap/hp_rprev.c:
  BTREE heap key structure is now the same as MyISAM
heap/hp_write.c:
  BTREE heap key structure is now the same as MyISAM
include/heap.h:
  BTREE heap key structure is now the same as MyISAM
include/my_handler.h:
  Removed hp_rb_key_cmp()
  _mi_compare_text -> mi_compate_text
include/my_tree.h:
  Fixed typo
myisam/ft_boolean_search.c:
  _mi_compare_text -> mi_compate_text
myisam/ft_nlq_search.c:
  _mi_compare_text -> mi_compate_text
myisam/ft_parser.c:
  _mi_compare_text -> mi_compate_text
myisam/ft_stopwords.c:
  _mi_compare_text -> mi_compate_text
myisam/ft_update.c:
  _mi_compare_text -> mi_compate_text
mysys/my_handler.c:
  Removed hp_rb_key_cmp()
  _mi_compare_text -> mi_compate_text
mysys/tree.c:
  BTREE heap key structure is now the same as MyISAM
sql/ha_heap.cc:
  BTREE heap key structure is now the same as MyISAM

c811538f

20 May, 2002 3 commits

Bug fix: charset was not initialized · 1b49cd8c
unknown authored May 20, 2002

1b49cd8c
Fix for bug mentioned by Peter and Sanja · 1afa4558
unknown authored May 20, 2002
```
sql/sql_table.cc:
  Remove debug output
```
1afa4558

unknown authored May 20, 2002

CREATE DATABASE name DEFAULT CHARACTER SET charsetname;
CREATE DATABASE name (fieldname CHAR(n) CHARACTER SET charsetname);
Changes affect query parsing ONLY and do not have other effect yet.
 


sql/sql_lex.h:
  Charset related synax changes
sql/sql_yacc.yy:
  Charset related synax changes

3f50440f

17 May, 2002 1 commit
- Now string values are created and filled with charset field · 8bee96ab
  unknown authored May 17, 2002
```
SELECT func(charset2) FROM t ORDER BY 1 works in correct charset
```
  8bee96ab
14 May, 2002 1 commit

Now several character sets can live in the same table, · b043f066

unknown authored May 14, 2002

However some hacks were used while waiting for new FRM file


sql/field.h:
  Added function to set Field charset
sql/filesort.cc:
  Temporarily workaround, It seems charset should be passed in argument
sql/ha_heap.cc:
  Set correct key charset from Field information
sql/table.cc:
  Dirty hack to distinguish columns charsets while waiting for Monty to rewrite FRM file
sql/table.h:
  New field: table default character set

b043f066

13 May, 2002 5 commits
- HEAP tables bug (by Ramil request) · bf872799
  unknown authored May 13, 2002
  
  bf872799
- new error messages in new translation · 3a6483fe
  unknown authored May 13, 2002
  
  3a6483fe
- Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · a5350c6d
  unknown authored May 13, 2002
```
into sanja.is.com.ua:/home/bell/mysql/work-select_lex-4.1
```
  a5350c6d
- Added charset information · 492611f1
  unknown authored May 13, 2002
  
  492611f1
- New Serbian error.txt · 9017573d
  unknown authored May 13, 2002
  
  9017573d
12 May, 2002 1 commit

simple subselects ported to new select_lex structures · 044cbe42

unknown authored May 12, 2002


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

044cbe42

09 May, 2002 3 commits

total table list managment is changed · b69d8dab

unknown authored May 09, 2002


sql/sql_lex.cc:
  tabllist creation routine moved to SELECT_LEX_UNION class & made recursive
sql/sql_lex.h:
  list creation routine moved to SELECT_LEX_UNION class
sql/sql_parse.cc:
  list creation routine moved to SELECT_LEX_UNION class
  anonymous union used for storing TABLE*/TABLE_LIST*
sql/sql_union.cc:
  anonymous union used for storing TABLE*/TABLE_LIST*
sql/table.h:
  anonymous union used for storing TABLE*/TABLE_LIST*

b69d8dab

removed fake description (EXPLAIN) of first table for last SELECT_LEX with... · 510a4d1d

unknown authored May 09, 2002

removed fake description (EXPLAIN) of first table for last SELECT_LEX with global parameters, because now it is absent

510a4d1d

merge · f0503007

unknown authored May 09, 2002


mysql-test/r/derived.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
sql/sql_yacc.yy:
  mergin: new code contain this bug fixing

f0503007

08 May, 2002 1 commit
- new SELECT_LEX structures used for storing global ORDER BY, global LIMIT & limit counters · 6ff06df2
  unknown authored May 08, 2002
```
mysql-test/r/union.result:
  correct result of union explain command
```
  6ff06df2
06 May, 2002 4 commits

new SELECT_LEX structure · 2c62a868

unknown authored May 07, 2002


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

2c62a868

Merge abelkin@work.mysql.com:/home/bk/mysql-4.1 · 779b7a2a
unknown authored May 06, 2002
```
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
```
779b7a2a

fixed bug in derived tables if derived tables more than 1 · d822b0d5

unknown authored May 06, 2002


mysql-test/r/derived.result:
  added test of found bug in derived tables
mysql-test/t/derived.test:
  added test of found bug in derived tables

d822b0d5

Use keyseg charset instead of default_charset_info · 7d9572c2
unknown authored May 06, 2002

7d9572c2

29 Apr, 2002 1 commit

Index number argument · 234dc3a3

unknown authored Apr 29, 2002

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

234dc3a3

25 Apr, 2002 2 commits

MI_KEYSEG -> HA_KEYSEG · 3adee504

unknown authored Apr 25, 2002

_mi_key_cmp -> ha_key_cmp


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

3adee504

RB-Tree indexes support in HEAP tables · 139a73ca

unknown authored Apr 25, 2002

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

139a73ca

18 Apr, 2002 3 commits

Exhange HA_AUTO_KEY and HA_SPATIAL values: FRM stores only 8bit flags · 0e444585
unknown authored Apr 18, 2002

0e444585

Fix to use Monty's changes in frm format · c7e72e8d

unknown authored Apr 18, 2002

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

c7e72e8d

Fix for AsText() spatial function · e8b6c964

unknown authored Apr 18, 2002


sql/item_strfunc.cc:
  Fix for the case when argument args[0] and result str are the same strings

e8b6c964

17 Apr, 2002 3 commits

Fix for problem that GROUP BY and DISTINCT didn't work for UTF8 · 48297dbf
unknown authored Apr 17, 2002

48297dbf

Some charsets require special hash function · 804af496

unknown authored Apr 17, 2002

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

804af496

New win1250ch charset · 08665a17
unknown authored Apr 17, 2002

08665a17

16 Apr, 2002 1 commit

Some fixes after merging changes from 4.0 · 32ac1ef0

unknown authored Apr 16, 2002


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

32ac1ef0

15 Apr, 2002 1 commit
- Somebody made a bug here: one line disappeared · 7be6a765
  unknown authored Apr 15, 2002
  
  7be6a765
13 Apr, 2002 1 commit

merge · fdc446d0

unknown authored Apr 13, 2002


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

fdc446d0

12 Apr, 2002 3 commits

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · 54373c16
unknown authored Apr 12, 2002
```
Docs/manual.texi:
  Auto merged
```
54373c16
merge · caf41c9e
unknown authored Apr 12, 2002
```
client/mysql.cc:
  Auto merged
```
caf41c9e

Update for BTREE keys in HEAP tables · 6326ec99

unknown authored Apr 12, 2002

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

6326ec99