summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 4.0monty@mysql.com2004-09-011-5/+5
|\
| * Added global my_getopt_error_reporter function pointer which is ram@gw.mysql.r18.ru2004-08-311-5/+5
| | | | | | | | | | | | | | 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.
| * If the system has 64 bit "long", then "long long" does not add newjoerg@mysql.com2004-08-301-0/+3
| | | | | | | | | | | | | | | | | | functionality. The existing code takes advantage of this when "typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs. If the compiler then has prototypes for C99 functions 'strtoll()' and 'strtoull()' but no implementation, the existing code in 'strtoull.c' collides with that prototype. These collisions are avoided now. (backport from 4.1)
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-08-311-2/+0
|\ \ | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | Review of new pushed code (Indentation fixes and simple optimizations)monty@mysql.com2004-08-311-2/+0
| | | | | | | | | | | | | | | Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database Safety fix for mailformed MERGE files
* | | Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION ↵bar@mysql.com2004-08-271-1/+2
| | | | | | | | | | | | conflict
* | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2004-08-261-0/+3
|\ \ \ | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| * | | If the system has 64 bit "long", then "long long" does not add newjoerg@mysql.com2004-08-261-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | functionality. The existing code takes advantage of this when "typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs. If the compiler then has prototypes for C99 functions 'strtoll()' and 'strtoull()' but no implementation, the existing code in 'strtoull.c' collides with that prototype. These collisions are avoided now.
* | | mergedserg@serg.mylan2004-08-262-4/+18
|\ \ \ | |/ / |/| / | |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0rburnett@build.mysql.com2004-08-252-4/+18
| |\ | | | | | | | | | 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-192-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | mysql.h:paul@kite-hub.kitebird.com2004-08-251-4/+4
| | | | | | | | | | | | | | | Fix a misleading plural that should be singular. Fix other typos while I'm at it.
* | | A new function to meassure terminal screen cells number for a string.bar@mysql.com2004-08-251-0/+3
| | |
* | | Fix to compile with msvc: converted static const int Item_arena::* to enum ↵sergefp@mysql.com2004-08-241-0/+5
| | | | | | | | | | | | members, undefine ERROR
* | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1rburnett@build.mysql.com2004-08-201-0/+1
|\ \ \ | | | | | | | | | | | | into build.mysql.com:/users/rburnett/mysql-4.1
| * | | This fixes a Windows build failure. How did this build on Linux?rburnett@build.mysql.com2004-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | logging_ok: Logging to logging@openlogging.org accepted mysql_priv.h, my_time.h: Moved declaration of days_in_month array from mysql_priv.h to my_time.h to correct Windows build issues
* | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2004-08-203-28/+16
|\ \ \ \ | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.emb
| * \ \ \ mergedserg@serg.mylan2004-08-201-21/+9
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Build bug on 64-Bit platforms.ingo@mysql.com2004-08-191-21/+9
| | | | | | | | | | | | | | | | | | | | Removed improper casts. Thanks to Joerg Bruehe for the fix.
| * | | Fixed symbol name problems that made build fail.pem@mysql.comhem.se2004-08-192-7/+7
| | | |
* | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2004-08-191-15/+11
|\ \ \ \ | |/ / / | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.emb
| * | | mysql_com.h:guilhem@mysql.com2004-08-191-11/+7
| | | | | | | | | | | | | | | | still better names for enum; removing unneeded symbol
| * | | mysql_com.h:guilhem@mysql.com2004-08-191-9/+9
| | | | | | | | | | | | | | | | Better names for defines, as these are visible in API
* | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2004-08-192-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | into deer.(none):/home/hf/work/mysql-4.1.emb
| * | | Fixes for bugs in embedded library:hf@deer.(none)2004-07-222-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #4700 (Unsigned value returned as signed) just no appropriate checking #4701 (Errors returned earlier than expected) all errors returned from send_command() #4702 (Result isn't freed properly if there's no retrieval) flush_use_result has only 'client' version and should be made 'virtual'
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-191-16/+27
|\ \ \ \ | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | Very small API change: changing the values in enum enum_shutdown_level;guilhem@mysql.com2004-08-191-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as this enum is not really usable yet (as MySQL server supports only one shutdown level), and as SHUTDOWN_DEFAULT is still left to 0, this change should disturb no user. Later (in 4.1.4 or 4.1.5) code will be pushed to implement graceful shutdown using this enum.
* | | | | manually mergedserg@serg.mylan2004-08-181-11/+17
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflowserg@serg.mylan2004-08-111-11/+17
| | |/ | |/|
* | | apply UNIQUE constrain correctly for multi-byte charsetsserg@serg.mylan2004-08-131-1/+3
| | | | | | | | | | | | only MyISAM is fixed
* | | Cleanup in mysql_time.h/my_time.h headers. The first is used in mysql.h,konstantin@mysql.com2004-08-052-10/+17
| | | | | | | | | | | | the second is for the rest of time declarations in mysys.
* | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1guilhem@mysql.com2004-07-292-0/+16
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-1717
| * | | WL#1580: --start-datetime, --stop-datetime, --start-position (alias for ↵guilhem@mysql.com2004-07-292-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --position) and --stop-position options for mysqlbinlog, with a test file. This enables user to say "recover my database to how it was this morning at 10:30" (mysqlbinlog "--stop-datetime=2003-07-29 10:30:00"). Using time functions into client/ made me move them out of sql/ into sql-common/. + (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes cannot accept 2 binlogs" (that is, on command line).
* | | | Casted all macro arguments,ingo@mysql.com2004-07-281-177/+180
| | | | | | | | | | | | | | | | | | | | used a common style with array subscripts, improved the line-up, wrapped long lines.
* | | | Merginghf@deer.(none)2004-07-211-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | WL#1600 (Warn if result is truncatet due to max_allowed_packet)hf@deer.(none)2004-06-291-1/+2
| | | |
* | | | forced X/Open mode on HPUX removed. The correct way (that affects not only C ↵serg@serg.mylan2004-07-131-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but also C++ and linking) would be CFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE" CXXFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE" LDFLAGS="-lxnet" but apparently MySQL works without too.
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-07-091-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | | | my_global.h:konstantin@mysql.com2004-07-091-1/+5
| | |/ / | |/| | | | | | | | | | | | | | Define cxa_pure_virtual to print error message and DBUG_ASSERT: calls to pure virtual methods should not go unnoticed.
* | | | Merge with 4.0 to get bug fixesmonty@mysql.com2004-07-091-5/+12
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fixed Bug#4451. According to C/C++ standards, enums should not be usedjani@a80-186-24-72.elisa-laajakaista.fi2004-07-081-3/+12
| | | | | | | | | | | | out of their range.
* | | Don't allow badly formed UTF8 identitiersbar@mysql.com2004-07-071-1/+2
| | |
* | | HAVE_RTREE_KEYS are enabled on windows tooserg@serg.mylan2004-07-061-0/+1
| | |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-07-061-0/+2
|\ \ \ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | re-enable spatial features for windowsserg@serg.mylan2004-07-061-0/+2
| | |/ | |/| | | | | | | grr
* | | client.c, libmysql.c:paul@kite-hub.kitebird.com2004-06-301-4/+4
|/ / | | | | | | | | | | | | | | Symbol spelling change. errmsg.c: Client error message edits. errmsg.h: Two symbol spelling changes.
* | Added missing my_time.c file to mysqlclient projectmonty@mysql.com2004-06-282-4/+8
| | | | | | | | Moved include <assert.h> to my_global.h
View Lorry Controller Status