Commit graph

1336 commits

Author SHA1 Message Date
unknown
910c125bb6 Updates for multi-byte character sets
(Note: test 'union' fails, but Sanja promised to fix this)


include/m_ctype.h:
  Changed prototype for strntod() to inform the user that source may be modified.
include/m_string.h:
  Moved my_vsnprintf to strings library
include/my_sys.h:
  Moved my_vsnprintf to strings library
libmysql/Makefile.shared:
  Moved my_vsnprintf to strings library
mysql-test/r/alter_table.result:
  Moved my_vsnprintf to strings library
mysql-test/r/create.result:
  Moved my_vsnprintf to strings library
mysql-test/r/ctype_many.result:
  Moved my_vsnprintf to strings library
mysql-test/r/fulltext.result:
  Moved my_vsnprintf to strings library
mysql-test/r/innodb.result:
  Moved my_vsnprintf to strings library
mysql-test/r/merge.result:
  Moved my_vsnprintf to strings library
mysql-test/r/select.result:
  Moved my_vsnprintf to strings library
mysql-test/r/show_check.result:
  Moved my_vsnprintf to strings library
mysql-test/r/type_blob.result:
  Moved my_vsnprintf to strings library
mysql-test/r/type_enum.result:
  Moved my_vsnprintf to strings library
mysql-test/r/type_ranges.result:
  Moved my_vsnprintf to strings library
mysql-test/r/type_set.result:
  Moved my_vsnprintf to strings library
mysys/Makefile.am:
  Moved my_vsnprintf to strings library
sql/field.cc:
  Fixed for character set handling
sql/field.h:
  Fixed for character set handling
sql/item.cc:
  Fixed for character set handling
sql/item.h:
  Fixed for character set handling
sql/item_func.cc:
  Fixed for character set handling
sql/item_func.h:
  Fixed for character set handling
sql/item_strfunc.cc:
  Fixed for character set handling
sql/item_sum.cc:
  Fixed for character set handling
sql/item_sum.h:
  Fixed for character set handling
sql/item_timefunc.cc:
  Fixed for character set handling
sql/mysqld.cc:
  Update to use new test_if_int()
sql/opt_range.cc:
  Fixed for character set handling
sql/procedure.h:
  Fixed for character set handling
sql/sql_class.cc:
  Fixed for character set handling
sql/sql_string.cc:
  Added multi byte support to append.
  Added set_latin1()
sql/sql_string.h:
  Added set_latin1()
sql/sql_update.cc:
  Cosmetic changes
strings/Makefile.am:
  Moved my_vsnprintf to strings library
strings/ctype-simple.c:
  Code review + cleanup
strings/ctype-utf8.c:
  Fixed strntod()
strings/my_vsnprintf.c:
  Added support for %#d and %#u
2003-01-14 14:28:36 +02:00
unknown
50989ef203 Charset loading has been moved to /string library 2003-01-14 13:36:22 +04:00
unknown
c6ad5a4ad2 xml.c has been moved to /strings from /mysys
This is to reuse code to generate charset related C files
from ther descriptions written in XML files
2003-01-10 17:01:55 +04:00
unknown
f00289c431 xml.c:
new file
2003-01-10 16:34:53 +04:00
unknown
49fc3a76e0 euc_kr, koi8_r and koi8_u have been renamed so that now
all charset names don't have "_" sign.
2003-01-09 17:39:02 +04:00
unknown
f28bd4e4b9 ctype.c:
koi8_ru -> koi8_r
  koi8_ukr -> koi8_u
  usa7 -> ascii


strings/ctype.c:
  koi8_ru -> koi8_r
  koi8_ukr -> koi8_u
  usa7 -> ascii
2003-01-05 17:35:45 +04:00
unknown
9cb8b57c25 koi8_ru -> koi8_r
charset.conf -> charset.xml
bug fix


mysql-test/r/ctype_many.result:
  koi8_ru -> koi8_r
mysql-test/t/ctype_many.test:
  koi8_ru -> koi8_r
mysys/charset.c:
  charset.conf -> charset.xml
sql/share/Makefile.am:
  charset.conf -> charset.xml
strings/ctype-simple.c:
  Bug fix
2003-01-05 17:34:24 +04:00
unknown
a10b6c3a06 Many files:
PRIMARY flag for built-in charsets


strings/ctype-big5.c:
  PRIMARY flag for built-in charsets
strings/ctype-bin.c:
  PRIMARY flag for built-in charsets
strings/ctype-euc_kr.c:
  PRIMARY flag for built-in charsets
strings/ctype-gb2312.c:
  PRIMARY flag for built-in charsets
strings/ctype-gbk.c:
  PRIMARY flag for built-in charsets
strings/ctype-sjis.c:
  PRIMARY flag for built-in charsets
strings/ctype-tis620.c:
  PRIMARY flag for built-in charsets
strings/ctype-ujis.c:
  PRIMARY flag for built-in charsets
strings/ctype-utf8.c:
  PRIMARY flag for built-in charsets
strings/ctype.c:
  PRIMARY flag for built-in charsets
2003-01-05 16:44:39 +04:00
unknown
9c2e873c0b cp1250 2003-01-05 15:31:26 +04:00
unknown
94873871e2 ctype-win1250ch.c:
cp1250_czech
  ,


strings/ctype-win1250ch.c:
  cp1250_czech
  ,
2003-01-05 15:30:02 +04:00
unknown
782295137b Some changes to separate charset and collation terms 2003-01-04 14:12:20 +04:00
unknown
2261105194 - fixes to properly make a "make distclean" (some files were not removed)
(There are probably some more to fix)


libmysql/Makefile.shared:
   - clean up the vio_* and ctype-* symlinks that are created by link_source
     (thanks to Christian Hammers from Debian for the patch)
strings/Makefile.am:
   - remove ctype_autonf.c on "make distclean" (it's generated by "configure")
2002-12-27 17:37:55 +01:00
unknown
9ff43be81e Use of new num->str functions
fix in ucs2 charset


sql/field.cc:
  Use of new num->str functions
sql/item_sum.cc:
  Use of new num->str functions
strings/ctype-utf8.c:
  Fix
2002-12-11 15:29:23 +04:00
unknown
6cdf5c6543 sql/sql_string.cc@1.39
New num->str functions
strings/ctype-simple.c@1.16
    New num->str functions
strings/ctype-utf8.c@1.18
    New num->str functions


sql/sql_string.cc:
  New num->str functions
strings/ctype-simple.c:
  New num->str functions
strings/ctype-utf8.c:
  New num->str functions
2002-12-11 15:26:49 +04:00
unknown
c8a50df16c Preparing for charset dependant int10_to_str 2002-12-11 12:30:05 +04:00
unknown
6d33f73416 Merge with 4.0.6
BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
heap/hp_delete.c:
  Auto merged
heap/hp_scan.c:
  Auto merged
include/my_base.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/uniques.cc:
  Auto merged
strings/strto.c:
  Auto merged
vio/vio.c:
  Auto merged
BitKeeper/triggers/post-commit:
  Add changeset to commit messages
sql-bench/crash-me.sh:
  Use version from 4.0
sql-bench/server-cfg.sh:
  Use version from 4.0
2002-12-05 19:38:42 +02:00
unknown
591b058518 Removed copying of parameters as this leads to memory leaks in embedded server.
Fixed 'not initialized' memory error.


mysql-test/mysql-test-run.sh:
  Updates to be able to more easily use --valgrind
mysql-test/r/alter_table.result:
  Added missing drop table
mysql-test/t/alter_table.test:
  Added missing drop table
sql/field.cc:
  Simple optimizations
sql/ha_innodb.cc:
  Remove copying of parameters as this leads to memory leaks in MySQL.
  Should be instead fixed by, in embedded server, make a temporary copy of
  all parameters and free them on server-end
sql/log.cc:
  Simple optimization
sql/mysql_priv.h:
  Move external reference to struct to include file
sql/mysqld.cc:
  Added safety asserts
sql/sql_class.cc:
  Fixed non fatal 'not initialized memory reference error' in thread init
sql/sql_udf.cc:
  Clear current_thd for global thread
strings/strto.c:
  Simple optimization
2002-12-05 03:40:33 +02:00
unknown
641c7ff9dd UCS2 fixes 2002-11-29 14:04:36 +04:00
unknown
4b0a6e6bcd my_strntod_ucs2 and my_strntol_ucs2 fixes 2002-11-29 13:29:48 +04:00
unknown
e761be558d New functions 2002-11-28 11:04:26 +04:00
unknown
080b5c6057 new string-to-number functions
include/m_ctype.h:
  Typo fix
sql/field.cc:
  Use new string-to-number functions
strings/ctype-bin.c:
  Use new string-to-number functions
strings/ctype-simple.c:
  Use new string-to-number functions
strings/ctype-utf8.c:
  Use new string-to-number functions
2002-11-27 18:08:31 +04:00
unknown
4b021e6ea9 Preparing to use better string-to-number functions to avoid c_ptr() call,
wich is slower and is not ucs2 compatible
2002-11-27 15:47:39 +04:00
unknown
c6ce7b3fbe removed redundant -I include-dirs 2002-11-26 14:01:08 +01:00
unknown
33fc0d53b5 Merge with 4.0
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Auto merged
BitKeeper/etc/config:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
include/myisam.h:
  Auto merged
include/violite.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/tree.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hash_filo.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/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/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/share/norwegian-ny/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
sql/ha_myisam.cc:
  Merge with 4.0
  Removed some commented code
sql/sql_db.cc:
  Merge with 4.0
  Optimized the logging of the drop db call a bit
sql/sql_update.cc:
  Added comment
2002-11-21 15:56:48 +02:00
unknown
2ef5ec316c - Applied required modifications for automake 1.5
- "make distcheck" needs to be fixed


BitKeeper/etc/ignore:
  Added autom4te.cache/output.0 autom4te.cache/requests autom4te.cache/traces.0 bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests bdb/dist/autom4te.cache/traces.0 innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests innobase/autom4te.cache/traces.0 to the ignore list
acinclude.m4:
   - removed libtool.m4 (is part of libtool 1.4)
config.guess:
   - applied diffs from config.guess of automake 1.5
config.sub:
   - applied diffs from config.sub of automake 1.5
configure.in:
   - renamed "AM_PROG_LIBTOOL" -> "AC_PROG_LIBTOOL"
   - added "AM_PROG_AS" for automake 1.5
dbug/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
extra/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
heap/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
install-sh:
   - applied diffs from install.sh of automake 1.5
isam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysql_r/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
ltconfig:
   - small correction for new libtool
ltmain.sh:
   - applied diffs from ltmain.sh of libtool 1.4.2
merge/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
missing:
   - applied diffs from missing of automake 1.5
myisam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
myisammrg/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
mysys/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
   - added $(EXEEXT) to test_charset
regex/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
sql/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
strings/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
   - removed @CHARSET_SRCS@
vio/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
2002-11-17 16:45:21 +01:00
unknown
5a264eb9a7 move like_range into CHARSET_INFO structure 2002-11-15 11:44:23 +04:00
unknown
e7bbe3aa0b New wildcmp() function in CHARSET_INFO structure 2002-11-14 16:07:29 +04:00
unknown
81d428bd5a Preparing to embed string to number conversion functions into charset structure 2002-11-13 17:13:29 +04:00
unknown
a464676f64 my_snprintf() doesn't support things like %04X so use vsprintf() instead 2002-11-13 15:00:25 +04:00
unknown
84b95682cf USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
Bug fix in ctype-utf8.c


sql/item_strfunc.cc:
  USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
sql/item_strfunc.h:
  USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
sql/procedure.h:
  USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
strings/ctype-utf8.c:
  Bug fix
2002-11-11 18:43:33 +04:00
unknown
f4ba3d9058 For coding convenuence cs->mbmaxlen is now 1 for 8bit charsets 2002-11-11 13:10:39 +04:00
unknown
446a5b0ad5 my_snprintf_ucs2 bug fix 2002-11-10 17:44:36 +04:00
unknown
992075e209 New field snprintf() in CHARSET_INFO structure 2002-11-10 16:14:39 +04:00
unknown
c88b910208 Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
client/mysqlbinlog.cc:
  Portability fix
configure.in:
  Added use of ASFLAGS (For Solaris with Forte 5.0)
include/my_global.h:
  Portability fix
include/myisam.h:
  Portability fix
include/queues.h:
  Portability fix
innobase/include/ut0ut.h:
  Portability fix
innobase/log/log0log.c:
  Portability fix
innobase/rem/rem0cmp.c:
  Portability fix
innobase/trx/trx0sys.c:
  Portability fix
isam/pack_isam.c:
  Portability fix
myisam/ft_boolean_search.c:
  Portability fix
myisam/mi_dynrec.c:
  Code change to go around bug in Forte 5.0
myisam/sort.c:
  Portability fix
mysys/my_aes.c:
  Portability fix
scripts/Makefile.am:
  Support for ASFLAGS
scripts/mysqlbug.sh:
  Support for ASFLAGS
sql/field.cc:
  Portability fix
sql/filesort.cc:
  Portability fix
sql/gen_lex_hash.cc:
  Portability fix
sql/ha_innodb.cc:
  Portability fix
  Changed SHOW INNODB STATUS to return error instead of writing message to log file.
sql/ha_isammrg.cc:
  Portability fix
sql/ha_myisam.cc:
  Portability fix
sql/ha_myisammrg.cc:
  Portability fix
sql/hash_filo.h:
  Portability fix
sql/hostname.cc:
  Portability fix
sql/item_cmpfunc.h:
  Indentation change
sql/item_func.cc:
  Portability fix
sql/item_func.h:
  Portability fix
sql/log.cc:
  Portability fix
sql/log_event.cc:
  Portability fix
sql/mysql_priv.h:
  Portability fix
sql/mysqld.cc:
  Portability fix
  Fixed bug with rpl_recovery_rank command line option on 64 bit systems
sql/opt_range.cc:
  Portability fix
sql/repl_failsafe.cc:
  Portability fix
sql/slave.cc:
  Portability fix
sql/slave.h:
  Portability fix
sql/sql_acl.cc:
  Portability fix
sql/sql_base.cc:
  Portability fix
sql/sql_cache.cc:
  Portability fix
sql/sql_cache.h:
  Portability fix
sql/sql_class.cc:
  Portability fix
sql/sql_delete.cc:
  Portability fix
sql/sql_insert.cc:
  Portability fix
sql/sql_manager.cc:
  Portability fix
sql/sql_parse.cc:
  Portability fix
BUILD/compile-solaris-sparc-forte:
  C
sql/sql_udf.cc:
  Portability fix
sql/sql_update.cc:
  Portability fix
strings/Makefile.am:
  Portability fix
strings/bmove_upp-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/str_test.c:
  Cleanup
strings/strappend-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strend-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strmake-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strmov-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strnmov-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strstr-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strxmov-sparc.s:
  Fixes to make this more portable, but it's still not usable on 64 bit systems :(
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-11-07 03:54:00 +02:00
unknown
615f358129 Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-10-31 11:35:35 +02:00
unknown
9d765f756d 30 % faster longlong10_to_str function 2002-10-31 11:27:52 +02:00
unknown
fdff4a9983 date and time fields now have charset arg in constructor
my_charset_latin1


include/m_ctype.h:
  my_charset_latin1 is now visible all around the program
sql/field.cc:
  date and time fields now have charset arg in constructor
sql/field.h:
  date and time fields now have charset arg in constructor
sql/item_timefunc.h:
  date and time fields now have charset arg in constructor
strings/ctype.c:
  my_charset_latin1 is now visible all around the program
2002-10-30 17:09:37 +04:00
unknown
6f043c359c - replaced all occurences of HPUX with HPUX10 (to be prepared for eventual
differences in HPUX11)


acconfig.h:
   - fixed typo
configure.in:
   - replaced HPUX -> HPUX10
   - added -DHPUX11 (not being used yet) to hpux11 workarounds
include/my_global.h:
   - replaced HPUX -> HPUX10
include/my_net.h:
   - replaced HPUX -> HPUX10
include/my_pthread.h:
   - replaced HPUX -> HPUX10
libmysql/libmysql.c:
   - replaced HPUX -> HPUX10
mysys/my_append.c:
   - replaced HPUX -> HPUX10
mysys/my_copy.c:
   - replaced HPUX -> HPUX10
mysys/my_pthread.c:
   - replaced HPUX -> HPUX10
mysys/my_redel.c:
   - replaced HPUX -> HPUX10
mysys/thr_alarm.c:
   - replaced HPUX -> HPUX10
sql/mini_client.cc:
   - replaced HPUX -> HPUX10
sql/mysqld.cc:
   - replaced HPUX -> HPUX10
strings/do_ctype.c:
   - replaced HPUX -> HPUX10
2002-10-24 14:30:25 +02:00
unknown
b75c3dac19 Preparing to use my_charset_bin instead of binary_flag 2002-10-23 18:20:45 +05:00
unknown
efe61a86bf ctype-bin.c:
max_sort_char is 255 for binary


strings/ctype-bin.c:
  max_sort_char is 255 for binary
2002-10-23 16:06:04 +05:00
unknown
426cb615a6 ctype.c, Makefile.am, Makefile.shared:
binary charset
ctype-bin.c:
  new file


libmysql/Makefile.shared:
  binary charset
strings/Makefile.am:
  binary charset
strings/ctype.c:
  binary charset
2002-10-23 15:40:22 +05:00
unknown
65c4fdc007 merged
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
2002-10-14 11:36:48 +00:00
unknown
72174d5b82 Move hash_sort and hash_caseup into CHARSET_INFO for all charsets 2002-10-10 16:52:22 +05:00
unknown
b9bb3534f1 Some reorganization to use less memory as well as to hide some implementation
aspects into *.c files from *.h files. Some steps to get closer to generating
*.c files from *.conf files again.
2002-10-10 15:52:32 +05:00
unknown
edb8ae0f38 Simple charsets now have strncoll() field too 2002-10-09 15:40:57 +05:00
unknown
aecdd6993e merge with work
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  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/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
myisam/rt_test.c:
  Merge
myisam/sp_key.c:
  Merge
myisam/sp_test.c:
  Merge
mysql-test/r/create.result:
  Merge
sql/share/english/errmsg.txt:
  Merge
sql/sql_yacc.yy:
  Merge
2002-10-02 13:45:16 +03:00
unknown
5a28c2caca Fixes and code cleanups after merge with 4.0.3
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22


BitKeeper/deleted/.del-README~3449730baf983117:
  Delete: mysql-test/t/README
BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe:
  Delete: libmysqld/sql_error.cc
BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6:
  Delete: libmysqld/sql_prepare.cc
Docs/manual.texi:
  Updated variable list
client/mysql.cc:
  Show warning count to user.
client/mysqltest.c:
  Add warnings to test results
configure.in:
  New shared library version number
include/errmsg.h:
  Indentation cleanup
include/mysql.h:
  Removed MYSQL_ERROR
  Indentaion cleanups
include/mysql_com.h:
  Changed functions to returns true/false to my_bool.
include/mysqld_error.h:
  New error messages
isam/pack_isam.c:
  Indentation change
libmysql/Makefile.am:
  Fix of wrong merge
libmysql/Makefile.shared:
  Indentation cleanup
libmysql/errmsg.c:
  Removed not used errors
libmysql/libmysql.c:
  Change functions to return 1 on error (not -1)
  Change type of functions that returns 0/1 to my_bool
  Lot of code optimizations.
  Lot of changes for prepared statements. This now handles sending of binary data to server.
  Receving of binary data is not yet done (will have to wait until server code for this is ready)
  mysql_warning_count and mysql_warnings() implemented.
libmysql/libmysql.def:
  Added mysql_warnings and mysql_warning_count
libmysql/manager.c:
  Fixed wrong testing of result from my_connect()
libmysqld/lib_sql.cc:
  Removed global variable THR_NET
  Change basic net functions to use THD instead of NET
  GRANT handling now uses read/write locks instead of mutex
libmysqld/libmysqld.c:
  Changed functions to be my_bool
myisam/ft_boolean_search.c:
  Trivial code cleanup
myisam/ft_stopwords.c:
  Trivial code cleanup
myisam/mi_check.c:
  Update to 4.1 structures
myisam/myisampack.c:
  Trivial code cleanup
myisam/rt_key.c:
  Code cleanup
myisam/rt_test.c:
  Code cleanup
  Removed compiler warnings
myisam/sp_key.c:
  Indentation changes
myisam/sp_test.c:
  Removed compiler warnings
mysql-test/README:
  Updated to reflect the new --external flag.
mysql-test/mysql-test-run.sh:
  --local (start new server) is now default.
  Use --external to test against external server.
mysql-test/r/rollback.result:
  Updated for 4.1 warnings
mysql-test/r/rpl_log.result:
  Update for 4.1
mysql-test/t/rollback.test:
  Updated for 4.1 warnings
mysql-test/t/rpl_log_pos.test:
  Portability fix
mysys/hash.c:
  Indentation change
mysys/my_error.c:
  Indentation change
mysys/tree.c:
  Updated file description
sql/field.cc:
  Fixed bugs introduced by merge
  Use my_sprintf instead of sprintf() + strlen()
sql/field.h:
  Add CHARSET_INFO to field structure
sql/gstream.h:
  Indentation changes.
  Added GPL copyright header
sql/ha_innodb.cc:
  Updated parameters for net functions.
sql/item.cc:
  Updates of Item_param
  Indentation changes
sql/item.h:
  Removed size_of() function from item.
sql/item_func.cc:
  Update function usage for 4.1
  Added get_system_var()
sql/item_func.h:
  Indentation change
sql/item_strfunc.cc:
  Removed not needed inclusion of gstream.h
  Update to use system variables (from 4.0)
sql/item_sum.h:
  Removed size_of() functions from item.
sql/item_timefunc.cc:
  Change sprintf() + strlen() -> my_sprintf()
  Added length parameter to ->append()
sql/item_timefunc.h:
  Removed size_of() functions from item.
sql/item_uniq.h:
  Removed size_of() functions from item.
sql/lex.h:
  Removed SQL_ERROR_COUNT variable
sql/log.cc:
  Change sprintf() + strlen() -> my_sprintf()
sql/log_event.cc:
  Change sprintf() + strlen() -> my_sprintf()
sql/mini_client.cc:
  Added check that one always specifies a length to mc_mysql_query()
sql/mysql_priv.h:
  New prototypes
  Change of NET -> THD parameter for net functions.
sql/mysqld.cc:
  New startup options:  'max_prepared_statements', 'max_error_count'
  Updated usage of net functions.
sql/net_pkg.cc:
  Change basic net functions to use THD instead of NET
  (needed to be able to handle 4.0 and 4.1 protocols)
  Lots of function comments
sql/net_serv.cc:
  Change int return values -> my_bool
  Updated net_write_command() to take an extra header block to be added to the packet.
  (This made the prepared statement code much nicer and more efficient)
sql/repl_failsafe.cc:
  Update net functions to use THD instead of NET
sql/set_var.cc:
  Added @@error_count and @@warning_count variables.
  Updated to 4.1 function usage
sql/set_var.h:
  Added @@error_count and @@warning_count variables.
sql/share/czech/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/english/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/greek/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/hungarian/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/japanese/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/korean/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/norwegian-ny/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/norwegian/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/polish/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/romanian/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/slovak/errmsg.txt:
  Removed Warning: from warning error messages.
sql/share/swedish/errmsg.txt:
  Removed Warning: from warning error messages.
sql/slave.cc:
  Change basic net functions to use THD instead of NET
  skip_load_data_file recoded to fit new client/server protocol
sql/spatial.h:
  Added copyright header
  Indentation cleanups
sql/sql_acl.cc:
  Change basic net functions to use THD instead of NET
  GRANT handling now uses read/write locks instead of mutex
sql/sql_analyse.cc:
  Change basic net functions to use THD instead of NET
  sprintf() + strlen() -> my_sprintf()
sql/sql_base.cc:
  More DBUG statements
sql/sql_class.cc:
  Change basic net functions to use THD instead of NET
  warning and prepared statement handling
sql/sql_class.h:
  Change basic net functions to use THD instead of NET
  warning and prepared statement handling
sql/sql_db.cc:
  Code cleanup & optimization.
sql/sql_delete.cc:
  Change basic net functions to use THD instead of NET
sql/sql_derived.cc:
  Change basic net functions to use THD instead of NET
sql/sql_do.cc:
  Change basic net functions to use THD instead of NET
sql/sql_error.cc:
  Big rewrite of error handling.
sql/sql_handler.cc:
  Change basic net functions to use THD instead of NET
sql/sql_insert.cc:
  Change basic net functions to use THD instead of NET
sql/sql_lex.cc:
  Change basic net functions to use THD instead of NET
sql/sql_lex.h:
  Added param_count to st_select_lex_node
sql/sql_list.h:
  Removed not needed error list.
sql/sql_load.cc:
  Change basic net functions to use THD instead of NET
sql/sql_parse.cc:
  Change basic net functions to use THD instead of NET
  Added alloc_query() to be able to chare query initialization code with
  prepared statements.
  Update of warning handling.
  Added create_select_for_variable() (for SHOW COUNT(*) WARNINGS)
sql/sql_prepare.cc:
  Initial prepared statement handling
sql/sql_rename.cc:
  Change basic net functions to use THD instead of NET
sql/sql_repl.cc:
  Change basic net functions to use THD instead of NET
sql/sql_select.cc:
  Small code cleanups
  Added missing initialization of error that caused some queries that returned an empty result set to fail
sql/sql_select.h:
  Ensure that JOIN.error is properly initialized
sql/sql_show.cc:
  Change basic net functions to use THD instead of NET
  A lot of optimization
sql/sql_table.cc:
  Change basic net functions to use THD instead of NET
  Indentaion cleanup
sql/sql_udf.cc:
  Change basic net functions to use THD instead of NET
sql/sql_union.cc:
  Change basic net functions to use THD instead of NET
sql/sql_update.cc:
  Change basic net functions to use THD instead of NET
sql/sql_yacc.yy:
  Change basic net functions to use THD instead of NET
  Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
sql/structs.h:
  Moved structures to files where they was used
sql/table.cc:
  Don't accept empty database names
sql/uniques.cc:
  Indentation cleanup
sql/unireg.cc:
  Change basic net functions to use THD instead of NET
sql/unireg.h:
  Added defaults for warnings and prepared statements
strings/ctype-simple.c:
  optimization
tests/client_test.c:
  Fixed wrong paramaters to printf()
2002-10-02 13:33:08 +03:00
unknown
9311345ecc - Applied required modifications for automake 1.5
- some additional small fixes
 - added "depcomp" for automake 1.5


acinclude.m4:
   - Removed AC_SYS_LARGEFILE (is in autoconf since v2.50)
config.guess:
   - applied diffs from config.guess of automake 1.5
config.sub:
   - applied diffs from config.sub of automake 1.5
configure.in:
   - adapted for automake 1.5
   - added AM_PROG_AS
   - replaced MYSQL_SYS_LARGEFILE with AC_SYS_LARGEFILE (is in
     autoconf since v2.50)
dbug/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
extra/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
heap/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
include/my_global.h:
   - fix for PPC64
install-sh:
   - applied diffs from install-sh of automake 1.5
isam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysql_r/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysqld/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
ltconfig:
   - small correction for new libtool
ltmain.sh:
   - applied diffs from ltmain.sh of libtool 1.4.2
merge/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
missing:
   - applied diffs from missing of automake 1.5
myisam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
myisammrg/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
mysys/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
regex/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
sql/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
strings/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
tools/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
vio/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
2002-10-01 21:57:10 +02:00
unknown
ce5696e25d UTF8 now works with up to 3 byte sequences only 2002-09-27 14:59:03 +05:00
unknown
9421f1dae9 Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395:
  Auto merged
BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31:
  Auto merged
Docs/manual.texi:
  Auto merged
SSL/cacert.pem:
  Auto merged
SSL/client-cert.pem:
  Auto merged
SSL/client-key.pem:
  Auto merged
SSL/server-cert.pem:
  Auto merged
SSL/server-key.pem:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/isamlog.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_dump.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
myisam/ft_test1.c:
  Auto merged
myisam/ft_update.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_static.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/mi_test2.c:
  Auto merged
myisam/mi_test3.c:
  Auto merged
myisam/mi_update.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/my_error.c:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/convert.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/key.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/time.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
strings/ctype-latin1_de.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
  merge with 4.0.3
BitKeeper/triggers/post-commit:
  merge with 4.0.3
client/mysql.cc:
  merge with 4.0.3 + simple optimsation
client/mysqltest.c:
  merge with 4.0.3 (Indentation change)
configure.in:
  merge with 4.0.3
extra/resolve_stack_dump.c:
  merge with 4.0.3 (Indentation change)
include/Makefile.am:
  merge with 4.0.3
include/myisam.h:
  merge with 4.0.3 (Indentation change)
include/mysql.h:
  merge with 4.0.3 (removed not used structure)
include/mysqld_error.h:
  merge with 4.0.3
libmysql/Makefile.shared:
  merge with 4.0.3
libmysql/libmysql.c:
  merge with 4.0.3 (Indentation change)
libmysqld/Makefile.am:
  merge with 4.0.3
myisam/ft_boolean_search.c:
  merge with 4.0.3 (Indentation change)
myisam/ft_nlq_search.c:
  merge with 4.0.3 (Indentation change)
myisam/mi_check.c:
  merge with 4.0.3
myisam/mi_search.c:
  merge with 4.0.3
myisam/mi_unique.c:
  merge with 4.0.3
mysys/Makefile.am:
  merge with 4.0.3
mysys/mf_casecnv.c:
  merge with 4.0.3
sql-bench/server-cfg.sh:
  Removed 8000 max row limit for Innodb
sql/Makefile.am:
  merge with 4.0.3
sql/field.cc:
  Indentation cleanup
  Changed sprintf -> my_sprintf
sql/field.h:
  merge with 4.0.3
sql/ha_heap.cc:
  merge with 4.0.3 (Indentation change)
sql/item.h:
  merge with 4.0.3 (Indentation change)
sql/item_cmpfunc.cc:
  merge with 4.0.3
sql/item_cmpfunc.h:
  Removed size_of() from items
  Indentation cleanup
sql/item_create.cc:
  merge
sql/item_create.h:
  merge
sql/item_func.cc:
  Added comments
  Changed string functions to use character set of first string argument as default return characterset
  Simple optimizations.
  Removed return of uninitalized variable.
sql/item_func.h:
  merge
sql/item_strfunc.cc:
  merge with 4.0.3 (Indentation change)
sql/item_strfunc.h:
  removed size_of()
sql/item_uniq.h:
  removed size_of()
sql/lex.h:
  merge with 4.0.3 (Indentation change)
sql/log_event.cc:
  Add ` around database in 'use database' in binary log.
sql/mysql_priv.h:
  merge with 4.0.3
sql/mysqld.cc:
  merge with 4.0.3 (Indentation change)
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/share/ukrainian/errmsg.txt:
  merge
sql/sql_acl.cc:
  merge with 4.0.3
sql/sql_base.cc:
  More comments
  Fixed bug in send_fields() when using convert
sql/sql_class.cc:
  merge
sql/sql_class.h:
  Merge with 4.0.3
  Moved max_error_count and max_warning_count to variables struct.
sql/sql_delete.cc:
  merge with 4.0.3 (Indentation change)
sql/sql_lex.h:
  merge with 4.0.3
sql/sql_parse.cc:
  Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT.
  (Should be retrived from variables)
sql/sql_select.cc:
  merge with 4.0.3
sql/sql_show.cc:
  merge with 4.0.3
sql/sql_union.cc:
  merge with 4.0.3
sql/sql_update.cc:
  merge with 4.0.3
sql/sql_yacc.yy:
  merge with 4.0.3
  Indentation cleanup
sql/structs.h:
  merge with 4.0.3
sql/table.cc:
  merge with 4.0.3
sql/table.h:
  merge with 4.0.3
2002-08-30 12:40:40 +03:00