summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 4.0monty@mysql.com2004-09-011-40/+57
|\
| * Added global my_getopt_error_reporter function pointer which is ram@gw.mysql.r18.ru2004-08-311-45/+56
| | | | | | | | | | | | | | used in the handle_options() function (instead of using additional handle_option() parameter). The default value of the my_getopt_error_reporter is default_reporter(). One can set it to other functions if case of need.
| * Code style fixes.monty@mysql.com2004-08-281-39/+48
| | | | | | | | Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
* | mergedserg@serg.mylan2004-08-261-29/+32
|\ \ | |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0rburnett@build.mysql.com2004-08-251-29/+29
| |\ | | | | | | | | | into build.mysql.com:/users/rburnett/mysql-4.0
| | * Bug #4466 Nothing in .err when mysql service ends because of malformed ↵rburnett@build.mysql.com2004-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | my.ini options my_getopt.c: Moved the inclusion of my_getopt.h down below the inclusion of my_sys.h so that enum loglevel definition would be available my_sys.h, my_getopt.h: moved definition of enum loglevel from my_getopt.h to my_sys.h
| | * Bug #4466 Nothing in .err when mysql service ends because of malformed ↵rburnett@build.mysql.com2004-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | my.ini options mysqld.cc: Changed LOGLEVEL enum to loglevel mysql_priv.h, log.cc: Changed LOGLEVEL to loglevel. Removed startup_ from some of the DBUG_ENTER macros. Removed the print_msg_to_log function as it was unused. my_getopt.c, my_getopt.h: Renamed LOGLEVEL to loglevel to match coding standards
| | * BUG# 4466 - Nothing in .err when mysql service ends because of malformed ↵rburnett@build.mysql.com2004-08-181-33/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | my.ini options mysqld.cc: Changed option_error_reporter to match new function header that includes LOGLEVEL enum mysql_priv.h: Removed the MY_ERROR style bitmask. Changed function headers to use new LOGLEVEL enum log.cc: Changed print_buffer_to_log to print_buffer_to_file. Remove the timestamp bool and now all log entries written to stderr are timestamped. Removed some unused commented code. changed to use the new LOGLEVEL enum. my_getopt.c: Changed functions to use the new LOGLEVEL enum and changed the included error reporter to be default_reporter. This reporter is used in handle_options if a reporter is not given my_getopt.h: changed typedefs to use better naming convention. Moved error bitmask into the LOGLEVEL enum and included it here.
| | * mysql_priv.h:rburnett@build.mysql.com2004-08-141-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added declarations for print_msg_to_log and vprint_msg_to_log. sql_print_error are simple functions that wrap calls to print_msg_to_log. Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE gen_lex_hash.cc: Added NULL error reporting parameter to handle_options log.cc: Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log. Print_msg_to_log will write the message to the windows event log if on NT. We now have error, warning, and information versions of sql_print_xxxx. T his is a variation of a similar changeset WAX did. mysqld.cc: Added option_error_reporter callback function and pass that into handle_options mysql.cc: Added NULL as error reporter arg to the end of handle_options Many files: Added NULL error reporter parameter as the last paramter to handle_options my_getopt.c: Added second function pointer to server as an error reporting callback. Added local function report_option_error that will either write the error to stderr or to the error reporting callback. changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error my_getopt.h: Changed declaration of handle_options to use typedefs for the two function pointers. added second function pointer to server as an error reporting callback mysqld.dsp: Added custom build step for compiling message file and added message resource file (output of mc)
| * | Fix warning VC++ and fix applied fisrt to source 4.1miguel@hegel.txg.br2004-08-242-22/+9
| | |
* | | my_handler.c:rburnett@build.mysql.com2004-08-241-2/+2
| | | | | | | | | | | | Added (my_bool) cast to !(nextflag & SEARCH_PREFIX) code to correct MSVC warning about mismatched integral types
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-08-2322-63/+64
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | | Changed %lx -> 0x%lx (for easier comparison of debug files)monty@mysql.com2004-08-2322-63/+64
| | | | | | | | | | | | | | | | | | | | Cosmetic cleanups Don't call 'delete_elements' on copy_funcs as this causes elements to be freed twice
* | | | mergedserg@serg.mylan2004-08-201-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | typos fixedserg@serg.mylan2004-08-191-2/+2
| | | |
| * | | copied new my_vsnprintf from 4.1. use "ul" when mergingserg@serg.mylan2004-08-191-16/+74
| | |/ | |/|
* | | bug fixed: when inited=0, can_be_used should be 0 too. (BUG#4901)serg@serg.mylan2004-08-111-21/+21
| | |
* | | Fix for bug report #4737 and revert fix for bug #4375 (re-opened).miguel@hegel.txg2004-07-291-11/+0
| | |
* | | WL#1518, "make bundled zlib usable for unix builds": konstantin@mysql.com2004-07-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | required autotools macro written and deployed in all apropriate Makefile.ams. Use cases checked: - linux, standard location of zlib, no ndb - linux, standard locatoin of zlib, with ndb - linux, non-standard location of zlib, no ndb - hpux11, use of bundled zlib, no ndb The only non-checked case is non-standard location of zlib (or use of bundled zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts like AIX52 or HPUX11, where such a check is possible. It didn't compile there before as these systems dont't have installed zlib, so nothing got broken ;)
* | | First step of implementation of WL#1518 "make bundled zlibkonstantin@mysql.com2004-07-211-13/+0
| |/ |/| | | | | usable for unix builds": zlib 1.2.1 imported
* | Don't close already closed files in vio (not critical)monty@mysql.com2004-07-121-0/+1
| |
* | Merge with 4.0 to get bug fixesmonty@mysql.com2004-07-091-0/+11
|\ \ | |/
| * my_lib.c:guilhem@mysql.com2004-07-051-2/+4
| | | | | | | | more accurate comment
| * Windows-specific:guilhem@mysql.com2004-07-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Fix for BUG#4375 "Windows specific directories are copied during replication": in the Windows version of my_dir(), do not show hidden or system files which Windows sometimes creates in the root directory of drive (like RECYCLER and SYSTEM VOLUME INFORMATION directories) (so this problem showed up only when the datadir was the root dir of a drive). This will make SHOW DATABASES display better, and will do no harm to MySQL. For example, DROP DATABASE will not miss some files, as MySQL creates no hidden or system files.
| * Prevent potential problems on 32-Bit machines.ingo@mysql.com2004-06-251-4/+4
| |
* | Adding Roman (classical Latin) collation.bar@mysql.com2004-07-071-0/+4
| |
* | Merge with 4.0 to get the latest bug patches to 4.1monty@mysql.com2004-06-251-1/+2
|\ \ | |/
| * - rephrased commentlenz@mysql.com2004-06-221-1/+2
| |
| * - Applied some portability fixes for SGI IRIX/MipsPro compilerlenz@mysql.com2004-06-221-1/+1
| | | | | | | | | | (e.g. a fix for BUG#3507 and some modifications recommended by Andrea Suatoni and Joerg Behrens - thank you!)
* | mergemonty@mysql.com2004-06-211-1/+1
|\ \
| * \ Merge with 4.0.21monty@mysql.com2004-06-181-1/+1
| |\ \ | | |/
| | * Applied patch from Novell (2004-06-03)monty@mysql.com2004-06-181-1/+1
| | |
| | * backport wild_compare fix from 4.1 - bug#3924serg@serg.mylan2004-05-292-24/+47
| | |
* | | Critical fixes after review:bar@mysql.com2004-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | - mutex was unlocked before the end of the critical sesion, - Portability issue: It's better to use (*alloc)(x) instead of alloc(x), if alloc is a function passed as an argument. - Use {} around if() block, to avoid possible problems with some Windows compilers.
* | | UTF8 UCA based collations.bar@mysql.com2004-06-141-1/+33
|/ /
* | Unicode collation algorithm: contraction support.bar@mysql.com2004-06-121-0/+10
| | | | | | | | | | E.g. 'Ch' is treated as a separate letter in Czech, not as a combination of C+h.
* | mergedserg@serg.mylan2004-06-111-3/+1
|\ \
| * | bug#3964 and related issues: FTB problems with charsets where one byte can ↵serg@serg.mylan2004-06-101-3/+1
| | | | | | | | | | | | | | | | | | match many correct prefix compare with my_strnncoll
* | | Move UCA language specific definitions into ctype-ucs.c.bar@mysql.com2004-06-112-143/+23
| | |
* | | charset.c:bar@mysql.com2004-06-111-44/+15
| | | | | | | | | | | | Reuse some code between simple and UCA collations.
* | | Initialize max_sort_char only if a character set is requested.bar@mysql.com2004-06-111-23/+0
| | |
* | | Allocate memory when a character set is requested:bar@mysql.com2004-06-111-548/+14
| | | | | | | | | | | | | | | | | | - For simple character sets: from_uni convertion table. - For UCA: alternative weight arrays. Use mbminlen instead of MY_CS_NONTEXT
* | | assert.h needed for my_dbug.h now is included in my_dbug.h, where it for konstantin@mysql.com2004-06-1010-10/+0
| | | | | | | | | | | | | | | some reason wasn't included before. A lot of files cleaned up from #include <assert.h>
* | | Optimization to use less memory.bar@mysql.com2004-06-101-5/+19
| | |
* | | charset.c:bar@mysql.com2004-06-091-1/+2
| | | | | | | | | | | | | | | Fix to be ANSI C complient ,
* | | WL#916: Unicode collations for some languagesbar@bar.intranet.mysql.r18.ru2004-06-081-30/+180
| | |
* | | Mergedsergefp@mysql.com2004-06-071-17/+53
|\ \ \ | |/ / |/| |
| * | Post review fixes for "SQL Syntax for Prepared Statements".sergefp@mysql.com2004-06-071-22/+23
| | |
| * | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-06-031-10/+45
| |\ \ | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
| | * \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-06-011-10/+45
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge