Commit graph

3311 commits

Author SHA1 Message Date
unknown
bbde41e9f7 Fix for crash in the case of non-string fields 2002-03-20 17:33:10 +04:00
unknown
474e64081b Fixed that selected default charset was not compiled in some cases 2002-03-20 16:53:43 +04:00
unknown
1fd84d3477 Configure.in/Makefile.in charset related things are now earier to maintain
Fixes in charset related C++ code


configure.in:
  Make things to be easier managable
include/m_ctype.h:
  Hide some functions under conditional compilation
libmysql/Makefile.shared:
  Make things to be easier managable
sql/item_func.cc:
  Fixed that private member is not available in this context
sql/item_strfunc.cc:
  Fixed that private member is not available in this context
strings/Makefile.am:
  Make charset things to be easier managable
  Some fixes in charset C++ code
strings/ctype-big5.c:
  Hide some functions under conditional compilation
strings/ctype-czech.c:
  Hide some functions under conditional compilation
strings/ctype-euc_kr.c:
  Hide some functions under conditional compilation
strings/ctype-gb2312.c:
  Hide some functions under conditional compilation
strings/ctype-gbk.c:
  Hide some functions under conditional compilation
strings/ctype-latin1_de.c:
  Hide some functions under conditional compilation
strings/ctype-mb.c:
  Hide some functions under conditional compilation
strings/ctype-sjis.c:
  Hide some functions under conditional compilation
strings/ctype-tis620.c:
  Hide some functions under conditional compilation
strings/ctype-ujis.c:
  Hide some functions under conditional compilation
2002-03-19 20:03:10 +04:00
unknown
af87d92aa2 Some changes from 4.0.
Take a look their for details
2002-03-19 14:23:11 +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
unknown
53bd33c676 making full-text working with UNION's 2002-03-15 14:21:06 +02:00
unknown
1b7471a431 remove default_charset_info
sql/field.h:
  New function to get charset
2002-03-14 23:03:15 +04:00
unknown
9a0253ffb2 Removed some default_charset_info 2002-03-14 22:10:56 +04:00
unknown
8959b690fe Hash now supports several charsets 2002-03-14 21:44:42 +04:00
unknown
ee1ef8c58c use String->charset instead of default_charset_info
client/mysql.cc:
  default_charset_info -> system_charset_info
include/m_ctype.h:
  Remove old ctype
mysys/charset.c:
  Initialize fields after dynamic charset loading
sql/sql_parse.cc:
  default_charset_info -> system_charset_info
2002-03-14 20:52:48 +04:00
unknown
68375e0f00 New ctype functions/macros to support many charsets at a time
client/mysql.cc:
  new ctypes
client/mysqldump.c:
  new ctypes
client/mysqltest.c:
  new ctypes
client/sql_string.cc:
  new ctypes
client/sql_string.h:
  new ctypes
extra/mysql_install.c:
  new ctypes
extra/replace.c:
  new ctypes
extra/resolve_stack_dump.c:
  new ctypes
extra/resolveip.c:
  new ctypes
heap/hp_hash.c:
  new ctypes
include/m_ctype.h:
  new ctypes
include/my_sys.h:
  new ctypes
isam/_key.c:
  new ctypes
isam/_search.c:
  new ctypes
libmysql/Makefile.shared:
  new ctypes
libmysql/libmysql.c:
  new ctypes
myisam/ft_dump.c:
  new ctypes
myisam/ft_parser.c:
  new ctypes
myisam/mi_test1.c:
  new ctypes
mysys/charset.c:
  new ctypes
mysys/default.c:
  new ctypes
mysys/getvar.c:
  new ctypes
mysys/hash.c:
  new ctypes
mysys/mf_casecnv.c:
  new ctypes
mysys/mf_dirname.c:
  new ctypes
mysys/mf_format.c:
  new ctypes
mysys/mf_iocache2.c:
  new ctypes
mysys/mf_soundex.c:
  new ctypes
mysys/mf_wfile.c:
  new ctypes
mysys/my_error.c:
  new ctypes
mysys/my_getwd.c:
  new ctypes
mysys/my_init.c:
  new ctypes
mysys/my_vsnprintf.c:
  new ctypes
mysys/typelib.c:
  new ctypes
sql/convert.cc:
  new ctypes
sql/des_key_file.cc:
  new ctypes
sql/field.cc:
  new ctypes
sql/field.h:
  new ctypes
sql/field_conv.cc:
  new ctypes
sql/filesort.cc:
  new ctypes
sql/ha_innodb.cc:
  new ctypes
sql/hostname.cc:
  new ctypes
sql/init.cc:
  new ctypes
sql/item.cc:
  new ctypes
sql/item_func.cc:
  new ctypes
sql/item_strfunc.cc:
  new ctypes
sql/item_sum.cc:
  new ctypes
sql/item_timefunc.cc:
  new ctypes
sql/key.cc:
  new ctypes
sql/log.cc:
  new ctypes
sql/mysql_priv.h:
  new ctypes
sql/mysqld.cc:
  new ctypes
sql/opt_range.cc:
  new ctypes
sql/procedure.cc:
  new ctypes
sql/slave.cc:
  new ctypes
sql/sql_acl.cc:
  new ctypes
sql/sql_analyse.cc:
  new ctypes
sql/sql_base.cc:
  new ctypes
sql/sql_cache.cc:
  new ctypes
sql/sql_db.cc:
  new ctypes
sql/sql_handler.cc:
  new ctypes
sql/sql_lex.cc:
  new ctypes
sql/sql_parse.cc:
  new ctypes
sql/sql_show.cc:
  new ctypes
sql/sql_string.cc:
  new ctypes
sql/sql_string.h:
  new ctypes
sql/sql_table.cc:
  new ctypes
sql/sql_yacc.yy:
  new ctypes
sql/table.cc:
  new ctypes
sql/time.cc:
  new ctypes
strings/Makefile.am:
  new ctypes
strings/ctype-big5.c:
  new ctypes
strings/ctype-czech.c:
  new ctypes
strings/ctype-gbk.c:
  new ctypes
strings/ctype-latin1_de.c:
  new ctypes
strings/ctype-sjis.c:
  new ctypes
strings/ctype-tis620.c:
  new ctypes
strings/ctype.c:
  new ctypes
strings/str2int.c:
  new ctypes
strings/strto.c:
  new ctypes
tools/mysqlmanager.c:
  new ctypes
2002-03-12 21:37:58 +04:00
unknown
003b294967 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
2002-03-09 14:22:41 +02:00
unknown
c10827ba04 Take a look at comments in 4.0 2002-03-09 14:21:34 +02:00
unknown
591a8bdcd0 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
2002-03-07 17:09:08 +04:00
unknown
9a072af95a New fiedls in CHARSET_INFO strucutre
include/m_ctype.h:
  Adding new functions into CHARSET_INFO structure
strings/ctype.c:
  Temporary fill these new fields with NULL
2002-03-07 17:05:44 +04:00
unknown
bb22c94698 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
2002-03-07 14:20:07 +02:00
unknown
6265e94c35 Same patches as for 4.0. See there for details 2002-03-07 14:19:18 +02:00
unknown
220eeadc3d Extend String class with CHARSET_INFO field 2002-03-07 15:23:24 +04:00
unknown
654db69b82 Regex library is switched to use new ctype tools
to allow usage of many character sets at a time.


include/m_ctype.h:
  Added condition to simplify migrating from old ctype
  Added new style toupper, tolower which accepts charset in first argument
regex/debug.c:
  Added charset argument
regex/debug.ih:
  added charset argument
regex/engine.c:
  added charset argument
regex/engine.ih:
  added charset arguent
regex/main.c:
  added charset argument
regex/regcomp.c:
  added CHARSET_INFO field
regex/regcomp.ih:
  Added charset argument
regex/regex.h:
  Added #include <m_ctype.h> for CHARSET_INFO
  Added charset argument for regcomp()
regex/regex2.h:
  New charset argument for ISWORD()
regex/regexec.c:
  New charset argument
regex/reginit.c:
  Move to new style ctype. 
  However still needs fixes:
    instead of single static cclass variable,
    each charset must have it's own variable.
sql/item_cmpfunc.cc:
  Pass charset field into regcomp()
  This will be fixed tommorow to use String->charset
    instead of default_charset_info
2002-03-06 20:04:13 +04:00
unknown
325c22a784 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
2002-03-06 17:47:50 +04:00
unknown
0cc0dbc1ed Charsets related things are prepared by configure in new way.
This is to simplify maintaining charsets, especially changing
CHARSET_INFO structure.


acconfig.h:
  New defines for charsets
configure.in:
  New way to build charsets
include/m_ctype.h:
  Prototypes, moved from ctype_autoconf.c
libmysql/Makefile.shared:
  Removed ctype_autoconf.c and ctype_extra_sources.c from target dependancies
strings/Makefile.am:
  The same with above
strings/conf_to_src.c:
  Remove unnecessary comment
strings/ctype-czech.c:
   Fix for possible bugs that prototypes was not included
strings/ctype-euc_kr.c:
   Fix for possible bugs that prototypes was not included
strings/ctype-gb2312.c:
   Fix for possible bugs that prototypes was not included
strings/ctype-ujis.c:
   Fix for possible bugs that prototypes was not included
strings/ctype.c:
  Move tables from ctype_extra_sources.c and hide them under #ifdefs
2002-03-06 17:44:43 +04:00
unknown
336fcc224e small bug fix, read more about it in 4.0 2002-03-06 14:56:54 +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
unknown
c66afc4d7c New armscii8 charset
configure.in:
  Added armscii8
sql/share/charsets/Index:
  A
2002-03-04 15:31:22 +04:00
unknown
f36c72c633 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2002-03-01 14:13:13 +02:00
unknown
f739974c5e Porting from mysql-4.0.
Read comments there if you are interested ..


BitKeeper/etc/ignore:
  Added sql/sql_yacc.yy.orig to the ignore list
2002-02-28 22:01:41 +02:00
unknown
04f02d3e0c Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
2002-02-28 17:29:41 +04:00
unknown
94958d062b Several new OpenGIS functions
Fixes in GeomFromText() to accept an new optional
   argument respobsible for SRID. This is for more
   OpenGIS conformance and PostGIS compatibility
   to simplify migrating from PgSQL to MySQL


sql/gen_lex_hash.cc:
  Changed max_allowed_array
sql/lex.h:
  Added several symbols for new OpenGIS SQL functions
sql/sql_yacc.yy:
  new OpenGIS functions (spatial constructors)
2002-02-28 17:28:36 +04:00
unknown
ba288f41ed Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
2002-02-28 14:07:58 +02:00
unknown
143a179f3c Porting surgical changes from 4.0 to 4.1 2002-02-28 14:05:47 +02:00
unknown
c9ad5d907b Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
2002-02-28 14:30:04 +04:00
unknown
0ab62691ec These files must be ignored being symlinked from /sql
BitKeeper/etc/ignore:
  Added libmysqld/gstream.cc libmysqld/spatial.cc to the ignore list
2002-02-28 14:28:42 +04:00
unknown
87f0c55786 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
2002-02-23 14:19:58 +02:00
unknown
b9aebaa0ac Small addition to SHOW GRANTS 2002-02-23 14:18:41 +02:00
unknown
1e468e3bd7 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-02-22 15:30:28 +04:00
unknown
32a08516c9 Added GIS extension
BitKeeper/etc/ignore:
  Added myisam/rt_test myisam/sp_test to the ignore list
2002-02-22 15:24:42 +04:00
unknown
b569a092e9 Merge work.mysql.com:/home/bk/mysql-4.0
into work.mysql.com:/home/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-02-22 11:52:18 +01:00
unknown
64cad5180d Various fixups to correct DocBook output of manual.
Docs/Support/docbook-fixup.pl:
  Added new regex for XREFs, to have them in correct English-grammar.
  Minor fixup to removed node catcher from earlier change.
Docs/manual.texi:
  Fixup of Texinfo @ref/@xref/@pxref usage in appropriate locations.
2002-02-22 12:04:59 +10:00
unknown
123d359fd9 Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.bitbike.com:/home/arjen/mysql-4.0
2002-02-22 08:45:06 +10:00
unknown
230242182d Added MySQLfront to list of progs, for fairness; until all others are in the portals too. 2002-02-22 08:42:55 +10:00
unknown
229959ac22 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
2002-02-21 14:11:20 +02:00
unknown
2224fe9680 Fixing some bugs in UNION's 2002-02-21 14:10:11 +02:00
unknown
22f2f67430 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-02-21 13:41:15 +02:00
unknown
c0b5bf5e14 some UNION bug fixes.. 2002-02-21 13:40:22 +02:00
unknown
3d5dc65dfd This ChangeSet adds RTREE support into myisam library.
RTREEs will be used for GIS extension in MySQL


myisam/.cvsignore:
  Added sp_test and rt_test
myisam/Makefile.am:
  Added RTREE files
myisam/mi_create.c:
  Added RTREE/SPATIAL initialization
myisam/mi_delete.c:
  Switched to use virual function, instead of mi_ck_delete() direct call
myisam/mi_key.c:
  Added sp_make_key() call in the case of SPATIAL index type
myisam/mi_open.c:
  Added some new initialization actions which depend on key_alg being used: RTREE or BTREE
myisam/mi_range.c:
  Rtree estimation
myisam/mi_rkey.c:
  rtree
myisam/mi_rnext.c:
  rtree
myisam/mi_rnext_same.c:
  rtree
myisam/mi_static.c:
  New search flags for bounding rectungles
myisam/mi_test1.c:
  one now should always specify key_alg during keyinfo initializing: BTREE or RTREE
myisam/mi_test2.c:
  Added key_alg initializing
myisam/mi_test3.c:
  Added key_alg initialization
myisam/mi_update.c:
  Switched to virtual functions, instead of mi_ck_delete/mi_ck_write direct call
myisam/mi_write.c:
  Virtual function instead of mi_ck_write() direct call
myisam/myisamdef.h:
  Rtree additions
2002-02-20 14:11:21 +04:00
unknown
c9c61df68e Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.bitbike.com:/home/arjen/mysql-4.0
2002-02-20 11:43:25 +10:00
unknown
e86a88f2a2 Windows shutdown procedure further clarified, added NT workaround.
Fixed typo.
2002-02-20 11:39:26 +10:00
unknown
b87d6ee9d7 RTREE related fixes
include/myisam.h:
  These two new fields are initialized to either rtree or btree routines
2002-02-19 20:27:03 +04:00
unknown
809d419145 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
2002-02-19 15:32:44 +02:00
unknown
e07c92cd95 small bug fix for 2.95.4 2002-02-19 15:32:11 +02:00