summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* - adding more missing libedit fileslenz@mysql.com2004-08-271-2/+2
|
* - add missing file "read.h" to the source distributionlenz@mysql.com2004-08-271-1/+1
|
* Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-08-271-7/+7
|\ | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * mysql.cc:paul@kite-hub.kitebird.com2004-08-271-7/+7
| | | | | | | | Minor edits to help command messages.
* | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-08-2731-36/+106
|\ \ | |/ | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * Bu#4526 building with utf8_bin collation causes help to be case sensitivebar@mysql.com2004-08-271-5/+5
| |
| * Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION ↵bar@mysql.com2004-08-2727-18/+95
| | | | | | | | conflict
| * grant.result:bar@mysql.com2004-08-271-1/+1
| | | | | | | | Forgot to push in the previous changeset
| * Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1pekka@mysql.com2004-08-271-9/+1
| |\ | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my41
| | * Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1vva@eagle.mysql.r18.ru2004-08-271-9/+1
| | |\ | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
| | | * fixed format of history of new libedit for compatibilityvva@eagle.mysql.r18.ru2004-08-271-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with old libedit and readline 1. discarded reading and writting of hist_cookie as the begin of the file 2. skip strvis for string before saving
| * | | bug-5252 fix (tinyblob)pekka@mysql.com2004-08-271-3/+4
| |/ /
* | | Fix order byjoreland@mysql.com2004-08-272-3/+3
|/ /
* | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-08-271-1/+1
|\ \ | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2004-08-271-1/+1
| |\ \ | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1
| | * | grant.result:bar@mysql.com2004-08-271-1/+1
| | | | | | | | | | | | | | | | Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.
* | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-08-271-0/+8
|\ \ \ \ | |/ / / | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * | | Adding the file needed for windows build (on behalf of Reggie)sergefp@mysql.com2004-08-271-0/+8
| | | |
* | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-08-273-7/+13
|\ \ \ \ | |/ / / |/| | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| * | | Fix ordered index scan with partially specified keyjoreland@mysql.com2004-08-273-7/+13
| | | |
* | | | Do-compile:mwagner@here.mwagner.org2004-08-261-1/+1
| | | | | | | | | | | | | | | | Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-08-262-0/+50
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/media/sda1/mysql/mysql-4.1-5126
| * | | | A short fix and test case for Bug#5126 konstantin@mysql.com2004-08-262-0/+50
| | | | | | | | | | | | | | | | | | | | "Mediumint and PS problem": just treat mediumint as long.
* | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2004-08-266-7/+48
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into mysql.com:/M41/mysql-4.1
| * | | | If the system has 64 bit "long", then "long long" does not add newjoerg@mysql.com2004-08-267-7/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | - typo fix - make sure to include an existing file in the sourcelenz@mysql.com2004-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | distribution...
* | | | | after mergeserg@serg.mylan2004-08-264-23/+24
| | | | |
* | | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0serg@serg.mylan2004-08-262-0/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * \ \ \ \ Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-08-262-0/+140
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | * \ \ \ \ Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0miguel@hegel.txg.br2004-08-262-0/+140
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into hegel.txg.br:/home/miguel/bk/mysql-4.0
| | | * | | | | Adding binary version information for debug/release version of libmysqld.dllmiguel@hegel.txg.br2004-08-252-0/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a customer request for to get the XP Logo Certification. Note for LenZ: Adding to the project libmysqld.dsp the file libmysqld.rc at compilation time will be created the libmysqld.res and this linked. For every release edit the libmysqld.rc version number.
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-2637-86/+386
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * \ \ \ \ \ \ \ Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0serg@serg.mylan2004-08-261-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | | | | remove warningserg@serg.mylan2004-08-261-0/+1
| | |/ / / / / /
| * | | | | | | mergedserg@serg.mylan2004-08-2637-86/+385
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0rburnett@build.mysql.com2004-08-2635-81/+378
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/rburnett/mysql-4.0
| | | * | | | | | Test case for Bug #4792 lower_case_table_names does not resolve ↵rburnett@build.mysql.com2004-08-252-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db.tbl.column in SELECT list lowercase_table.result: New results for modified lowercase_table test lowercase_table.test: Added test case for all uppercase database when running under lower_case_table_names. This really only failed under Windows. Bug# 4792
| | | * | | | | | Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT listrburnett@build.mysql.com2004-08-251-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql_base.cc: Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0rburnett@build.mysql.com2004-08-2532-81/+347
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | 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-193-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-195-38/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-185-120/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1431-72/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | | | | | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0lenz@mysql.com2004-08-261-2/+7
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| | | * | | | | | | - Updated RPM spec file: MySQL-Max now requires MySQL-server insteadlenz@mysql.com2004-08-261-2/+7
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | of MySQL (BUG#3860)
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-08-262-2/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.0
| | | * \ \ \ \ \ \ mergemonty@mysql.com2004-08-262-2/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Remove default argument to mysql_truncate()monty@mysql.com2004-08-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to new valgrind
| | * | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0joerg@mysql.com2004-08-261-0/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/M40/mysql-4.0
| | | * | | | | | | buf0rea.c:heikki@hundin.mysql.fi2004-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.
View Lorry Controller Status