summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* mergeunknown2002-04-1366-405/+4618
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * item_strfunc.cc:unknown2002-03-291-4/+4
| | | | | | | | | | | | | | | | Fix for possible bug when string length is more than 64K sql/item_strfunc.cc: Fix for possible bug when string length is more than 64K
| * Big5 conversion routinesunknown2002-03-291-1/+1
| | | | | | | | | | | | | | include/m_ctype.h: Add conversion routines prototypes sql/init.cc: Fix for small bug
| * add sql_derived.cc into compilationunknown2002-03-291-1/+1
| |
| * Now this syntax works too: CONVERT(string,charset_to,charset_from)unknown2002-03-293-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | where charset_to and charset_from are expressions. For example: CONVERT('test','latin2','cp1250') sql/item_strfunc.cc: Now this syntax works too: CONVERT(string,charset_to,charset_from) sql/item_strfunc.h: Now this syntax works too: CONVERT(string,charset_to,charset_from) sql/sql_yacc.yy: Now this syntax works too: CONVERT(string,charset_to,charset_from)
| * Charset convertion operator CONVERT( string USING charset)unknown2002-03-293-0/+90
| |
| * New UTF8 charsetunknown2002-03-282-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Derived tables !unknown2002-03-268-12/+175
| | | | | | | | | | | | | | | | | | | | | | mysql-test/r/union.result: small bug fixes in unions BitKeeper/etc/ignore: Added Docs/manual.texi.orig Docs/manual.texi.rej to the ignore list mysql-test/t/union.test: test for a bug fix in union's sql/sql_union.cc: bug fix for unions
| * filesort.cc:unknown2002-03-221-5/+3
| | | | | | | | | | | | | | | | Fixed that i mixed Field and Item in some cases sql/filesort.cc: Fixed that i mixed Field and Item in some cases
| * Added new method to set string's charsetunknown2002-03-202-0/+4
| | | | | | | | | | sql/item_cmpfunc.cc: Fix for IN, when String->charset is empty
| * Fix for crash in the case of non-string fieldsunknown2002-03-201-8/+15
| |
| * Configure.in/Makefile.in charset related things are now earier to maintainunknown2002-03-192-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Some changes from 4.0.unknown2002-03-192-7/+9
| | | | | | | | | | | | | | Take a look their for details
| * Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-03-153-7/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1 sql/sql_base.cc: Auto merged sql/sql_select.cc: Auto merged
| | * making full-text working with UNION'sunknown2002-03-153-7/+9
| | |
| * | remove default_charset_infounknown2002-03-143-12/+22
| | | | | | | | | | | | | | | sql/field.h: New function to get charset
| * | Hash now supports several charsetsunknown2002-03-1414-19/+28
| | |
| * | use String->charset instead of default_charset_infounknown2002-03-144-26/+28
| |/ | | | | | | | | | | | | | | | | | | | | 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
| * New ctype functions/macros to support many charsets at a timeunknown2002-03-1236-276/+359
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Take a look at comments in 4.0unknown2002-03-091-0/+7
| |
| * Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-03-071-3/+3
| |\ | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
| | * Same patches as for 4.0. See there for detailsunknown2002-03-071-3/+3
| | |
| * | Extend String class with CHARSET_INFO fieldunknown2002-03-072-10/+29
| | |
| * | Regex library is switched to use new ctype toolsunknown2002-03-061-2/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fixes done in 4.0 repository. For comments see the corresponding ones unknown2002-03-051-3/+3
| | | | | | | | | | | | | | in 4.0.
| * New armscii8 charsetunknown2002-03-042-0/+75
| | | | | | | | | | | | | | configure.in: Added armscii8 sql/share/charsets/Index: A
| * Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-03-011-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1 sql/sql_yacc.yy: Auto merged
| | * Porting from mysql-4.0.unknown2002-02-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Read comments there if you are interested .. BitKeeper/etc/ignore: Added sql/sql_yacc.yy.orig to the ignore list
| * | Merge abarkov@work.mysql.com:/home/bk/mysql-4.1unknown2002-02-283-8/+55
| |\ \ | | |/ | |/| | | | | | | | | | | | | into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
| | * Several new OpenGIS functionsunknown2002-02-283-8/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | Porting surgical changes from 4.0 to 4.1unknown2002-02-282-81/+85
| |/
| * Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-02-231-0/+7
| |\ | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
| | * Small addition to SHOW GRANTSunknown2002-02-231-0/+7
| | |
| * | Merge abarkov@work.mysql.com:/home/bk/mysql-4.1unknown2002-02-2229-47/+3670
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Added GIS extensionunknown2002-02-2229-47/+3670
| | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added myisam/rt_test myisam/sp_test to the ignore list
| | * small bug fix for 2.95.4unknown2002-02-191-1/+1
| | |
* | | mergeunknown2002-04-1229-142/+190
|\ \ \ | | | | | | | | | | | | | | | | client/mysql.cc: Auto merged
| * | | Update for BTREE keys in HEAP tablesunknown2002-04-1228-132/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix for INET_NTOA(N) when N >= 2^32unknown2002-04-061-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: SCO updates client/mysql.cc: Don't die on SIGQUIT
* | | | Adding some things according to Monty's correct observationsunknown2002-04-121-3/+6
| | | |
* | | | errmsg.txt:unknown2002-04-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translated new error message to Dutch. sql/share/dutch/errmsg.txt: Translated new error message to Dutch.
* | | | fixed bug in truncating temp tablesunknown2002-04-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed compilation problem on FreeBSD added test for truncating temporary tables mysql-test/r/truncate.result: truncate test mysql-test/t/truncate.test: truncate test update mysys/safemalloc.c: fixed FreeBSD compilation problem sql/sql_delete.cc: fixed bug in truncating temporary tables
* | | | safemalloc cleanup. Maybe it will now compile on FreeBSD. I still not haveunknown2002-04-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access to a FreeBSD box, though. mysys/my_static.h: cleanup mysys/safemalloc.c: cleanup sql/mysqld.cc: initialize some safemalloc variables in main()
* | | | fix for SQL_CALC_FOUND_ROWS in UNION'sunknown2002-04-031-0/+4
| | | |
* | | | Merged some sslopt-* include files, that will be removed in the nearunknown2002-04-031-7/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | future, in mysqld.cc. sql/mysqld.cc: Added support for SSL. This is just temporary solution and will be fixed to use my_getopt, when mysqld.cc is changed.
* | | | Merged in some changes made to MySQL clients by otherunknown2002-04-031-0/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | Changed mysql, mysqladmin, mysqlshow, mysqldump, mysqlimport,unknown2002-04-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge sinisa@work.mysql.com:/home/bk/mysql-4.0unknown2002-04-021-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
| * | | | Fix for a bug with EXPLAIN and (....) UNION (....) order by unknown2002-04-021-3/+5
| | | | |
* | | | | Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0unknown2002-04-026-23/+159
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Auto merged sql/mysqld.cc: Auto merged
View Lorry Controller Status