Commit graph

2952 commits

Author SHA1 Message Date
unknown
38fad33321 Split raid C function to separate file to make things more portable.
Fixed some portability things in my_gethostbyname_r
Portability fix for type_decimal.test


BUILD/SETUP.sh:
  Fixes for gcc 3.1
extra/resolveip.c:
  Cleanup
include/my_net.h:
  Portability fix for SCO
mysql-test/t/type_decimal.test:
  Portability fix for FreeBSD
mysys/Makefile.am:
  Portability fix for OSF1
mysys/raid.cc:
  Portability fix for OSF1
2002-05-27 10:02:00 +03:00
unknown
e3b5fd8696 Portability fix for OSF1
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-05-27 09:29:26 +03:00
unknown
e640e2e2c0 merge
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
2002-05-26 22:57:08 +03:00
unknown
c1f3be5bb5 Heap table code cleanup 2002-05-23 19:26:16 +05:00
unknown
a8652e9957 Fixed problem in fulltest testcase
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
2002-05-22 18:51:21 +03:00
unknown
6a97c5912f Removed GNU getopt from MySQL distribution (replaced by my_getopt)
BitKeeper/deleted/.del-getopt.c~a2dce359c5c071b1:
  Delete: mysys/getopt.c
BitKeeper/deleted/.del-getopt1.c~e441714775f50c8f:
  Delete: mysys/getopt1.c
2002-05-22 18:16:54 +03:00
unknown
a34e76c66a Fixes for gcc 3.1
Fixed bug in new code for regexp LIKE NULL


BUILD/SETUP.sh:
  Fixes for gcc 3.1
BUILD/compile-solaris-sparc-debug:
  Fixes for gcc 3.1
BUILD/compile-solaris-sparc-purify:
  Fixes for gcc 3.1
BUILD/compile-solaris-sparc:
  Fixes for gcc 3.1
Docs/manual.texi:
  Fixed typo
include/violite.h:
  Fixes for gcc 3.1
mysql-test/r/func_concat.result:
  Updated test results
sql/item_cmpfunc.cc:
  Fixed bug in new code for regexp LIKE NULL
2002-05-21 20:35:58 +03:00
unknown
c811538f89 BTREE heap key structure is now the same as MyISAM
_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
2002-05-21 21:54:08 +05:00
unknown
4d094257db merge with 3.23.51
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mysql_fix_extensions.sh:
  Delete: scripts/mysql_fix_extensions.sh
Build-tools/Do-rpm:
  Auto merged
Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/charset.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/raid.cc:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
2002-05-16 18:20:49 +03:00
unknown
d2b95cd7ab New my_gethostbyname_r() handling
Changed some status variable names
Fix bug in GRANT ... PASSWORD string


Docs/manual.texi:
  Update of variable names
include/my_net.h:
  New my_gethostbyname_r() handling
include/my_pthread.h:
  New my_gethostbyname_r() handling
libmysql/Makefile.shared:
  New my_gethostbyname_r() handling
libmysql/libmysql.c:
  New my_gethostbyname_r() handling
mysys/Makefile.am:
  New my_gethostbyname_r() handling
mysys/my_pthread.c:
  New my_gethostbyname_r() handling
mysys/my_thr_init.c:
  New my_gethostbyname_r() handling
sql/hostname.cc:
  New my_gethostbyname_r() handling
sql/mini_client.cc:
  New my_gethostbyname_r() handling
sql/mysqld.cc:
  change some status variable names
sql/sql_acl.cc:
  Fix bug in GRANT ... PASSWORD string
2002-05-16 16:32:51 +03:00
unknown
89617526c8 Changed GET_STRALC to GET_STR_ALLOC
mysys/my_getopt.c:
  Changed GET_STRALC to GET_STR_ALLOC
  Added error checking for my_strdup()
2002-05-15 20:24:00 +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
unknown
c5bfcc9d7f Features made for Schlund plus several bug fixes.
Read a manual for more detail
2002-05-15 13:50:38 +03:00
unknown
21c1e5be44 - Added new type GET_STRALC to my_getopt.
- Fixed some bugs, wrongly freed pointers, in some clients.
- Removed unneccessary code.
- Fixed some other minor bugs and added some options into
  variables category, which had accidently been left out earlier.


client/mysql.cc:
  Fixed some wrong freed pointers. Removed unneccessary code.
  Changed some types from GET_STR to GET_STRALC.
client/mysqladmin.c:
  Fixed some wrong freed pointers. Removed unneccessary code.
  Changed some types from GET_STR to GET_STRALC.
client/mysqlcheck.c:
  Fixed some wrong freed pointers. Removed unneccessary code.
  Changed some types from GET_STR to GET_STRALC.
client/mysqldump.c:
  Fixed some wrong freed pointers. Removed unneccessary code.
  Changed some types from GET_STR to GET_STRALC.
client/mysqlimport.c:
  Removed unneccessary code.
  Fixed a bug in option --ignore-lines
client/mysqlshow.c:
  Removed unneccessary code.
include/my_getopt.h:
  Added new type, GET_STRALC. The name stands for GET STRING ALLOC,
  which means that the struct member value and u_max_value are
  strings that must be alloced and freed when used.
  The normal GET_STR works similarly otherwise, except that it's
  arguments are just pointers to strings, not alloced ones.
mysys/my_getopt.c:
  Added support for GET_STRALC
2002-05-14 21:41:55 +03:00
unknown
716ed1168f 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
unknown
9f8a75a168 Fixed some bugs in my_getopt.c, added functionality for new GET_*
types, migrated mysqld.cc to use my_getopt.


include/my_getopt.h:
  
  Added missing types; GET_INT, GET_UINT, GET_ULONG, GET_ULL
mysys/my_getopt.c:
  - Fixed a bug in processing short options; variable value was set
    wrongly after processing it in get_one_option(), when it needed
    to be done before it.
  - Fixed a bug in setting variable values; if type was OPT_ARG,
    a call without argument destroyed the default value
  - Added functionality for new GET_* types.
sql/mysqld.cc:
  Changed mysqld.cc to use my_getopt.
2002-05-07 20:35:06 +03:00
unknown
7c510b93c6 Reworked the RPM spec file and added several fixes to make the
build scripts work again.


BUILD/compile-pentium-max:
  Added "--with-embedded-server" to have the libmysqld files included
  in the source distribution when using "make dist"
Build-tools/Do-linux-build:
  Only use the "--with-other-libc" parameter, if another libc actually
  exists, since this will also force static linking, which does not work
  together with OpenSSL
Makefile.am:
  Removed hard-coded file name for TAR, let configure do this instead
  (many systems actually ship GNU tar installed as "tar" instead of
  "gtar")
configure.in:
  Added check for GNU tar named "gtar", fall back to "tar" if "gtar"
  was not found (and hope, that it's a GNU tar as well - this should
  probably be checked more properly)
include/Makefile.am:
  Added "my_semaphore.h" to pkginclude_HEADERS since it was missing
  from the distribution
strings/Makefile.am:
  Added "longlong2str.c" since it was missing from the distribution
support-files/mysql.server.sh:
  Added LSB-compatible header info to make init script more portable
support-files/mysql.spec.sh:
  - Use more RPM macros (e.g. infodir, mandir) to make the spec
    file more portable
  - reorganized the installation of documentation files: let RPM
    take care of this
  - reorganized the file list: actually install man pages along
    with the binaries of the respective subpackage
  - don't include libmysqld.a in the devel subpackage as well, if we
    have a special "embedded" subpackage
  - reworked the package descriptions
2002-05-03 12:31:25 +02:00
unknown
23bf368966 Fixed problems with DECIMAL() type on overflow.
Docs/manual.texi:
  Changlog
configure.in:
  Change to version 3.23.51
  Fix for OSF1
include/mysqld_error.h:
  Added copyright message
isam/pack_isam.c:
  Added copyright message
mysql-test/r/type_decimal.result:
  New test results
mysql-test/t/type_decimal.test:
  New test results
strings/Makefile.am:
  Added mising file
2002-05-02 18:04:21 +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
c4016459fa Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/slave.cc:
  Auto merged
2002-04-28 21:27:21 +00:00
unknown
7abf67c5e9 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
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
0a03601fab merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-identity.result~e41453a364242503:
  Auto merged
BitKeeper/deleted/.del-identity.test~326f469b59105404:
  Auto merged
include/my_pthread.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/pars/pars0opt.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2002-04-25 01:16:42 +03:00
unknown
2ebd90b830 my_alloc.h included in installation 2002-04-20 00:00:29 +03: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
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
b83e6fe1ad Small fix for HP-UX 10.20 with DCE threads
Also --with-libwrap is tested on Linux just fine.


configure.in:
  Small fix for HP-UX 10.20 with DCE threads
include/my_pthread.h:
  Small fix for HP-UX 10.20 with DCE threads
mysys/my_pthread.c:
  Small fix for HP-UX 10.20 with DCE threads
2002-04-16 21:19:00 +03:00
unknown
667da1396b Fixed pthread_cond_timedwait() for HPUX and DCE threads
Cleanup of LIBWRAP handling


Docs/manual.texi:
  Changelog
include/my_pthread.h:
  Fixed pthread_cond_timedwait() for HPUX and DCE threads
mysys/my_pthread.c:
  Fixed pthread_cond_timedwait() for HPUX and DCE threads
sql/item_func.cc:
  Fixed the GET_LOCK() works with HPUX and DCE threads
sql/mysqld.cc:
  Cleanup of LIBWRAP handling
sql/sql_parse.cc:
  Safety fix
2002-04-16 16:29:14 +03: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
02ebecfc23 query cache code can be excluded from server
sql/mysqld.cc:
  fake query_cache_size parameter if query cache code excluded from server
2002-04-15 16:00:05 +03:00
unknown
b54d2759d9 collision resolving 2002-04-13 20:08:00 +03: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
f095ef5dc2 allocated bigger blocks if it needed
include/my_sys.h:
  memory root structures definition put in one file
include/mysql.h:
  memory root structures definition put in one file
2002-04-13 12:08:12 +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
38cd4fdeb2 Merged in some changes made to MySQL clients by other
developers before pushing my_getopt.


client/mysqladmin.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/client_priv.h:
  Merged in previous changes for new client_priv.h (my_getopt)
2002-04-03 13:33:25 +03:00
unknown
a2e75474b5 Changed mysql, mysqladmin, mysqlshow, mysqldump, mysqlimport,
mysqlcheck and myisamchk to use new my_getopt struct.


client/client_priv.h:
  Changes for my_getopt
client/mysql.cc:
  Uses new my_getopt
client/mysqladmin.c:
  Uses new my_getopt
client/mysqlcheck.c:
  Uses new my_getopt
client/mysqldump.c:
  Uses new my_getopt
client/mysqlimport.c:
  Uses new my_getopt
client/mysqlshow.c:
  Uses new my_getopt
include/my_getopt.h:
  Added GET_BOOL type
include/sslopt-case.h:
  This is shouldn't be needed anymore.
include/sslopt-longopts.h:
  Uses new my_getopt
myisam/myisamchk.c:
  Uses new my_getopt
mysys/my_getopt.c:
  Some bug fixes and small feature adds to my_getopt
sql/mysqld.cc:
  mysqld.cc will be changed next. sslopt-* had to be removed
  temporarily.
2002-04-02 20:29:53 +03:00
unknown
a8a63101d0 Fix for HAVE_QUERY_CACHE
Remove not used flag CLIENT_CHANGE_USER


Docs/manual.texi:
  Cleanup examples
acconfig.h:
  Fix for HAVE_QUERY_CACHE
configure.in:
  Fix for HAVE_QUERY_CACHE
include/my_global.h:
  Fix for HAVE_QUERY_CACHE
include/mysql_com.h:
  Remove not used flag CLIENT_CHANGE_USER
libmysqld/libmysqld.c:
  Fix new prototypes
2002-04-02 19:10:55 +03:00
unknown
c95270b8c4 Cleanups
Don't use DBUG library for struct st_my_thread_var to make code less complicated.


Docs/manual.texi:
  Cleanup
acinclude.m4:
  Search after openssl in /usr/local
client/mysql.cc:
  Fix prompt
client/mysqladmin.c:
  Cleanup
client/mysqltest.c:
  Cleanup
include/my_pthread.h:
  Move thread variables to the right location
include/my_sys.h:
  Move thread variables to the right location
include/mysql.h:
  Clean up client prototypes
libmysql/libmysql.c:
  Clean up client prototypes
mysys/my_static.h:
  Cleanup
mysys/my_thr_init.c:
  Don't use DBUG library for struct st_my_thread_var to make code less complicated
sql/item_cmpfunc.cc:
  Small optimization
sql/net_pkg.cc:
  Cleanup
sql/sql_parse.cc:
  Allow VARCHAR(0)
2002-04-02 17:54:57 +03:00
unknown
b68daf5c83 Big5 conversion routines
include/m_ctype.h:
  Add conversion routines prototypes
sql/init.cc:
  Fix for small bug
2002-03-29 19:54:21 +04:00
unknown
4fd893e5d3 charset<->unicode conversion tables and routines
some warnings fixes


include/m_ctype.h:
  New charset conversion fields in CHARSET_INFO
mysys/hash.c:
  Fix for "unused argument" warning
strings/ctype-big5.c:
  Fix for "unused argument" warning
strings/ctype-czech.c:
  Fix for "unused argument" warning
strings/ctype-euc_kr.c:
  Fix for "unused argument" warning
strings/ctype-gb2312.c:
  Fix for "unused argument" warning
strings/ctype-gbk.c:
  Fix for "unused argument" warning
strings/ctype-latin1_de.c:
  Fix for "unused argument" warning
strings/ctype-simple.c:
  8bit<->unicode convertion routines
strings/ctype-sjis.c:
  Fix for "unused argument" warning
strings/ctype-tis620.c:
  Fix for "unused argument" warning
strings/ctype-ujis.c:
  Fix for "unused argument" warning
strings/ctype-utf8.c:
  Fix for "unused argument" warning
strings/ctype.c:
  8bit <-> unicode conversion tables
2002-03-29 16:06:06 +04:00
unknown
437b0b0e87 New UTF8 charset
strings/ctype-big5.c:
  New format for mb char functions
strings/ctype-euc_kr.c:
  New format for mb char functions
strings/ctype-gb2312.c:
  New format for mb char functions
strings/ctype-gbk.c:
  New format for mb char functions
strings/ctype-sjis.c:
  New format for mb char functions
strings/ctype-ujis.c:
  New format for mb char functions
2002-03-28 17:31:46 +04:00
unknown
ef261914d3 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0


sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-03-26 22:23:51 -07:00
unknown
079a551ca7 coverted my_thread_init() /end to use my_malloc()/my_free() to help track
down replication corruption


dbug/dbug.c:
  fixed DBUG_ macros to not crash if my_thread_init() had not been called
include/my_sys.h:
  keep track of shutdown, main, and signal threads for safemalloc
mysys/my_static.h:
  keep track of thread in safemalloc blocks
mysys/my_thr_init.c:
  use my_malloc()/my_free() in my_thread_init()
mysys/safemalloc.c:
  keep track of threads
  do not fuss if main,signal, or shutdown thread still has allocated blocks 
   when we call TERMINATE() as some blocks are freed later and there is no
   easy way to make TERMINATE() wait for those threads
sql/mysqld.cc:
  keep track of signal, main, and shutdown threads
2002-03-26 22:19:23 -07:00
unknown
e82a6417c4 merge (remove conflicting zip files)
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-ChangeLog:
  Delete: zlib/ChangeLog
BitKeeper/deleted/.del-descrip.mms:
  Delete: zlib/descrip.mms
BitKeeper/deleted/.del-zlib.def:
  Delete: zlib/os2/zlib.def
BitKeeper/deleted/.del-example.c:
  Delete: zlib/example.c
BitKeeper/deleted/.del-faq:
  Delete: zlib/faq
BitKeeper/deleted/.del-gzio.c:
  Delete: zlib/gzio.c
BitKeeper/deleted/.del-index:
  Delete: zlib/index
BitKeeper/deleted/.del-infblock.c:
  Delete: zlib/infblock.c
BitKeeper/deleted/.del-infblock.h:
  Delete: zlib/infblock.h
BitKeeper/deleted/.del-infcodes.c:
  Delete: zlib/infcodes.c
BitKeeper/deleted/.del-infcodes.h:
  Delete: zlib/infcodes.h
BitKeeper/deleted/.del-inffast.c:
  Delete: zlib/inffast.c
BitKeeper/deleted/.del-Make_vms.com:
  Delete: zlib/Make_vms.com
BitKeeper/deleted/.del-inffast.h:
  Delete: zlib/inffast.h
BitKeeper/deleted/.del-inffixed.h:
  Delete: zlib/inffixed.h
BitKeeper/deleted/.del-inflate.c:
  Delete: zlib/inflate.c
BitKeeper/deleted/.del-inftrees.c:
  Delete: zlib/inftrees.c
BitKeeper/deleted/.del-inftrees.h:
  Delete: zlib/inftrees.h
BitKeeper/deleted/.del-infutil.c:
  Delete: zlib/infutil.c
BitKeeper/deleted/.del-infutil.h:
  Delete: zlib/infutil.h
BitKeeper/deleted/.del-maketree.c:
  Delete: zlib/maketree.c
BitKeeper/deleted/.del-minigzip.c:
  Delete: zlib/minigzip.c
BitKeeper/deleted/.del-readme:
  Delete: zlib/readme
BitKeeper/deleted/.del-Makefile.riscos:
  Delete: zlib/Makefile.riscos
BitKeeper/deleted/.del-trees.c:
  Delete: zlib/trees.c
BitKeeper/deleted/.del-trees.h:
  Delete: zlib/trees.h
BitKeeper/deleted/.del-uncompr.c:
  Delete: zlib/uncompr.c
BitKeeper/deleted/.del-zconf.h:
  Delete: zlib/zconf.h
BitKeeper/deleted/.del-zlib.3:
  Delete: zlib/zlib.3
BitKeeper/deleted/.del-zlib.dsp:
  Delete: zlib/zlib.dsp
BitKeeper/deleted/.del-zlib.h:
  Delete: zlib/zlib.h
BitKeeper/deleted/.del-zlib.html:
  Delete: zlib/zlib.html
BitKeeper/deleted/.del-zutil.c:
  Delete: zlib/zutil.c
BitKeeper/deleted/.del-zutil.h:
  Delete: zlib/zutil.h
BitKeeper/deleted/.del-adler32.c:
  Delete: zlib/adler32.c
BitKeeper/deleted/.del-Makefile.pup:
  Delete: zlib/amiga/Makefile.pup
BitKeeper/deleted/.del-Makefile.sas:
  Delete: zlib/amiga/Makefile.sas
BitKeeper/deleted/.del-README.contrib:
  Delete: zlib/contrib/README.contrib
BitKeeper/deleted/.del-visual-basic.txt:
  Delete: zlib/contrib/visual-basic.txt
BitKeeper/deleted/.del-gvmat32.asm:
  Delete: zlib/contrib/asm386/gvmat32.asm
BitKeeper/deleted/.del-gvmat32c.c:
  Delete: zlib/contrib/asm386/gvmat32c.c
BitKeeper/deleted/.del-mkgvmt32.bat:
  Delete: zlib/contrib/asm386/mkgvmt32.bat
BitKeeper/deleted/.del-zlibvc.def:
  Delete: zlib/contrib/asm386/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp:
  Delete: zlib/contrib/asm386/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw:
  Delete: zlib/contrib/asm386/zlibvc.dsw
BitKeeper/deleted/.del-algorithm.txt:
  Delete: zlib/algorithm.txt
BitKeeper/deleted/.del-match.s:
  Delete: zlib/contrib/asm586/match.s
BitKeeper/deleted/.del-readme.586:
  Delete: zlib/contrib/asm586/readme.586
BitKeeper/deleted/.del-match.s~1:
  Delete: zlib/contrib/asm686/match.s
BitKeeper/deleted/.del-readme.686:
  Delete: zlib/contrib/asm686/readme.686
BitKeeper/deleted/.del-zlib.mak:
  Delete: zlib/contrib/delphi/zlib.mak
BitKeeper/deleted/.del-zlibdef.pas:
  Delete: zlib/contrib/delphi/zlibdef.pas
BitKeeper/deleted/.del-d_zlib.bpr:
  Delete: zlib/contrib/delphi2/d_zlib.bpr
BitKeeper/deleted/.del-d_zlib.cpp:
  Delete: zlib/contrib/delphi2/d_zlib.cpp
BitKeeper/deleted/.del-readme.txt:
  Delete: zlib/contrib/delphi2/readme.txt
BitKeeper/deleted/.del-zlib.bpg:
  Delete: zlib/contrib/delphi2/zlib.bpg
BitKeeper/deleted/.del-compress.c:
  Delete: zlib/compress.c
BitKeeper/deleted/.del-zlib.bpr:
  Delete: zlib/contrib/delphi2/zlib.bpr
BitKeeper/deleted/.del-zlib.cpp:
  Delete: zlib/contrib/delphi2/zlib.cpp
BitKeeper/deleted/.del-zlib.pas:
  Delete: zlib/contrib/delphi2/zlib.pas
BitKeeper/deleted/.del-zlib32.bpr:
  Delete: zlib/contrib/delphi2/zlib32.bpr
BitKeeper/deleted/.del-zlib32.cpp:
  Delete: zlib/contrib/delphi2/zlib32.cpp
BitKeeper/deleted/.del-test.cpp:
  Delete: zlib/contrib/iostream/test.cpp
BitKeeper/deleted/.del-zfstream.cpp:
  Delete: zlib/contrib/iostream/zfstream.cpp
BitKeeper/deleted/.del-zfstream.h:
  Delete: zlib/contrib/iostream/zfstream.h
BitKeeper/deleted/.del-zstream.h:
  Delete: zlib/contrib/iostream2/zstream.h
BitKeeper/deleted/.del-zstream_test.cpp:
  Delete: zlib/contrib/iostream2/zstream_test.cpp
BitKeeper/deleted/.del-crc32.c:
  Delete: zlib/crc32.c
BitKeeper/deleted/.del-ChangeLogUnzip:
  Delete: zlib/contrib/minizip/ChangeLogUnzip
BitKeeper/deleted/.del-miniunz.c:
  Delete: zlib/contrib/minizip/miniunz.c
BitKeeper/deleted/.del-minizip.c:
  Delete: zlib/contrib/minizip/minizip.c
BitKeeper/deleted/.del-readme.txt~1:
  Delete: zlib/contrib/minizip/readme.txt
BitKeeper/deleted/.del-unzip.c:
  Delete: zlib/contrib/minizip/unzip.c
BitKeeper/deleted/.del-unzip.def:
  Delete: zlib/contrib/minizip/unzip.def
BitKeeper/deleted/.del-unzip.h:
  Delete: zlib/contrib/minizip/unzip.h
BitKeeper/deleted/.del-zip.c:
  Delete: zlib/contrib/minizip/zip.c
BitKeeper/deleted/.del-zip.def:
  Delete: zlib/contrib/minizip/zip.def
BitKeeper/deleted/.del-zip.h:
  Delete: zlib/contrib/minizip/zip.h
BitKeeper/deleted/.del-deflate.c:
  Delete: zlib/deflate.c
BitKeeper/deleted/.del-zlibvc.def~1:
  Delete: zlib/contrib/minizip/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp~1:
  Delete: zlib/contrib/minizip/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw~1:
  Delete: zlib/contrib/minizip/zlibvc.dsw
BitKeeper/deleted/.del-makefile.w32:
  Delete: zlib/contrib/untgz/makefile.w32
BitKeeper/deleted/.del-untgz.c:
  Delete: zlib/contrib/untgz/untgz.c
BitKeeper/deleted/.del-Makefile.b32:
  Delete: zlib/msdos/Makefile.b32
BitKeeper/deleted/.del-Makefile.bor:
  Delete: zlib/msdos/Makefile.bor
BitKeeper/deleted/.del-Makefile.dj2:
  Delete: zlib/msdos/Makefile.dj2
BitKeeper/deleted/.del-Makefile.emx:
  Delete: zlib/msdos/Makefile.emx
BitKeeper/deleted/.del-Makefile.msc:
  Delete: zlib/msdos/Makefile.msc
BitKeeper/deleted/.del-deflate.h:
  Delete: zlib/deflate.h
BitKeeper/deleted/.del-Makefile.tc:
  Delete: zlib/msdos/Makefile.tc
BitKeeper/deleted/.del-Makefile.w32:
  Delete: zlib/msdos/Makefile.w32
BitKeeper/deleted/.del-Makefile.wat:
  Delete: zlib/msdos/Makefile.wat
BitKeeper/deleted/.del-zlib.def~1:
  Delete: zlib/msdos/zlib.def
BitKeeper/deleted/.del-zlib.rc:
  Delete: zlib/msdos/zlib.rc
BitKeeper/deleted/.del-Makefile.emx~1:
  Delete: zlib/nt/Makefile.emx
BitKeeper/deleted/.del-Makefile.gcc:
  Delete: zlib/nt/Makefile.gcc
BitKeeper/deleted/.del-Makefile.nt:
  Delete: zlib/nt/Makefile.nt
BitKeeper/deleted/.del-zlib.dnt:
  Delete: zlib/nt/zlib.dnt
BitKeeper/deleted/.del-Makefile.os2:
  Delete: zlib/os2/Makefile.os2
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
Docs/manual.texi:
  merge
sql/ha_innodb.cc:
  merge
2002-03-27 06:44:23 +02: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