summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S).unknown2004-09-2410-304/+986
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#4335 - one name can be handler open'ed many times. Reworked the HANDLER functions and interface. Using a HASH to store information on open tables that survives FLUSH TABLE. HANDLER tables alias names must now be unique, though it is allowed in 4.0 to qualify them with the database name of the base table. mysql-test/r/flush_table.result: BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). BUG#4335 - one name can be handler open'ed many times. Moved pure handler test results to handler.result. Added the new test results. mysql-test/r/handler.result: BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). BUG#4335 - one name can be handler open'ed many times. Moved pure handler test results from flush_table.result to here. mysql-test/t/flush_table.test: BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). BUG#4335 - one name can be handler open'ed many times. Moved pure handler tests to handler.test. Added new tests. mysql-test/t/handler.test: BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). BUG#4335 - one name can be handler open'ed many times. Moved pure handler tests from flush_table.test to here. sql/mysql_priv.h: BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). BUG#4335 - one name can be handler open'ed many times. Reworked the handler interface. sql/sql_base.cc: BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). BUG#4335 - one name can be handler open'ed many times. Replaced mysql_ha_close_list() by the better named function mysql_ha_flush() with readable options. sql/sql_class.cc: BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). BUG#4335 - one name can be handler open'ed many times. Added initialization for the handler tables hash. Changed the handler tables clean-up code. Unreleted to bug: Changed the order of THD initialization to avoid warning messages on Linux with gcc. sql/sql_class.h: BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). BUG#4335 - one name can be handler open'ed many times. Added the handler tables HASH to THD. sql/sql_handler.cc: BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). BUG#4335 - one name can be handler open'ed many times. Completely reworked the handler functions. Added an introducing comment, describing the new functionality. sql/sql_table.cc: BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S). BUG#4335 - one name can be handler open'ed many times. replaced mysql_ha_close() by the better named function mysql_ha_flush() with readable options.
* sql_yacc.yy:unknown2004-09-031-1/+1
| | | | | | | | Allow FROM or IN in SHOW KEYS, as in other SHOW statements. sql/sql_yacc.yy: Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
* A fix (Bug #4980: union statement with () union () order by produces wrong ↵unknown2004-09-033-1/+21
| | | | explain).
* errmsg.txt:unknown2004-09-0222-44/+350
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GPL comment sql/share/czech/errmsg.txt: Add GPL comment sql/share/danish/errmsg.txt: Add GPL comment sql/share/dutch/errmsg.txt: Add GPL comment sql/share/english/errmsg.txt: Add GPL comment sql/share/estonian/errmsg.txt: Add GPL comment sql/share/french/errmsg.txt: Add GPL comment sql/share/german/errmsg.txt: Add GPL comment sql/share/greek/errmsg.txt: Add GPL comment sql/share/hungarian/errmsg.txt: Add GPL comment sql/share/italian/errmsg.txt: Add GPL comment sql/share/japanese/errmsg.txt: Add GPL comment sql/share/korean/errmsg.txt: Add GPL comment sql/share/norwegian-ny/errmsg.txt: Add GPL comment sql/share/norwegian/errmsg.txt: Add GPL comment sql/share/polish/errmsg.txt: Add GPL comment sql/share/portuguese/errmsg.txt: Add GPL comment sql/share/romanian/errmsg.txt: Add GPL comment sql/share/russian/errmsg.txt: Add GPL comment sql/share/slovak/errmsg.txt: Add GPL comment sql/share/spanish/errmsg.txt: Add GPL comment sql/share/swedish/errmsg.txt: Add GPL comment sql/share/ukrainian/errmsg.txt: Add GPL comment
* Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-09-023-0/+36
|\ | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5232
| * A fix (Bug #5232: CREATE TABLE ... SELECT can deadlock itself).unknown2004-08-273-0/+36
| |
* | Fix for bug #5302unknown2004-09-021-1/+1
| |
* | Fix for bug #5302unknown2004-09-011-0/+7
| |
* | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2004-09-011-221/+0
|\ \ | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| * \ Merge mysql.com:/space/my/mysql-4.0unknown2004-09-011-221/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0-build
| | * | - removed swedish errmsg.OLDunknown2004-09-011-221/+0
| | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-errmsg.OLD~de59ad17392012d: Delete: sql/share/swedish/errmsg.OLD
* | | | ha_innodb.cc:unknown2004-09-011-2/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading sql/ha_innodb.cc: If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading
* | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-09-011-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | into mysql.com:/M40/mysql-4.0
| * | | Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES"unknown2004-09-011-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (backport from 4.1). configure.in: Defining "BIG_TABLES" works around a problem with the Sun Forte compiler for Solaris on x86 platforms: improper handling of "long long". Error shows up on the "limit_rows_found" variable in test "union". Old "BIG_FILES" was a typing error (backport from 4.1).
* | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-311-2/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | into krsna.patg.net:/home/patg/mysql-4.0
| * | | mysqld_safe.sh:unknown2004-08-311-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug #5001, added conditional if to test if port set, then only kill the processes for this port, not all processes (in the case of this bug where multiple servers are killed.) The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's discovery that mysqld_safe would get killed. In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file" was the case that evaluated as true, so in order to test, I had to comment that block out. scripts/mysqld_safe.sh: bug #5001, added conditional if to test if port set, then only kill the processes for this port, not all processes (in the case of this bug where multiple servers are killed.) The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's discovery that mysqld_safe would get killed. In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file" was the case that evaluated as true, so in order to test, I had to comment that block out.
* | | | Do-compile:unknown2004-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore. Build-tools/Do-compile: Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
* | | | Added global my_getopt_error_reporter function pointer which is unknown2004-08-3127-76/+87
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. client/mysql.cc: Removed extra handle_optins()'s parameter. client/mysqladmin.c: Removed extra handle_optins()'s parameter. client/mysqlbinlog.cc: Removed extra handle_optins()'s parameter. client/mysqlcheck.c: Removed extra handle_optins()'s parameter. client/mysqldump.c: Removed extra handle_optins()'s parameter. client/mysqlimport.c: Removed extra handle_optins()'s parameter. client/mysqlmanager-pwgen.c: Removed extra handle_optins()'s parameter. client/mysqlmanagerc.c: Removed extra handle_optins()'s parameter. client/mysqlshow.c: Removed extra handle_optins()'s parameter. client/mysqltest.c: Removed extra handle_optins()'s parameter. extra/my_print_defaults.c: Removed extra handle_optins()'s parameter. extra/mysql_install.c: Removed extra handle_optins()'s parameter. extra/mysql_waitpid.c: Removed extra handle_optins()'s parameter. extra/perror.c: Removed extra handle_optins()'s parameter. extra/resolve_stack_dump.c: Removed extra handle_optins()'s parameter. extra/resolveip.c: Removed extra handle_optins()'s parameter. include/my_getopt.h: Removed extra handle_optins()'s parameter. isam/isamchk.c: Removed extra handle_optins()'s parameter. isam/pack_isam.c: Removed extra handle_optins()'s parameter. myisam/mi_test1.c: Removed extra handle_optins()'s parameter. myisam/myisam_ftdump.c: Removed extra handle_optins()'s parameter. myisam/myisamchk.c: Removed extra handle_optins()'s parameter. myisam/myisampack.c: Removed extra handle_optins()'s parameter. sql/gen_lex_hash.cc: Removed extra handle_optins()'s parameter. sql/mysqld.cc: Removed extra handle_optins()'s parameter. tools/mysqlmanager.c: Removed extra handle_optins()'s parameter.
* | | If the system has 64 bit "long", then "long long" does not add newunknown2004-08-306-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) include/m_string.h: Extend the "fake" approach from 'strtoull()' onto 'strtoll()' (backport from 4.1). strings/strto.c: Ensure that calling file has included necessary headers, as these are needed at the upper level already (backport from 4.1). strings/strtol.c: Cleanup/alignment with the "long long" functions. strings/strtoll.c: When "long" is 64 bit already, system function 'strtol()' can be used. Header files 'my_global.h' and 'm_string.h' will manage that, if they are included early enough (backport from 4.1). strings/strtoul.c: Cleanup/alignment with the "long long" functions. strings/strtoull.c: When "long" is 64 bit already, system function 'strtoul()' can be used. Header files 'my_global.h' and 'm_string.h' will manage that, if they are included early enough (backport from 4.1).
* | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-08-3017-159/+246
|\ \ \ | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | | - removed mysql-test/t/flush_block_commit-master.opt as it collidedunknown2004-08-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the sleep value we use for the test suite run during the release builds BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796: Delete: mysql-test/t/flush_block_commit-master.opt
| * | | log.cc:unknown2004-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed missing * in comment in setup_windows_event_source sql/log.cc: Fixed missing * in comment in setup_windows_event_source
| * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-292-7/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0 sql/log.cc: Auto merged
| | * | | Fix for BUG#4500 "set character set replicates incorrectly"unknown2004-08-292-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately. Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS); such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used). I have written a test and it works, but I'm not pushing the test as it requires building with all charsets. I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar. sql/log.cc: When SET CHARACTER SET has been used, we must reset the charset after the writing the statement, in the binlog. In 4.1, this resetting is already achieved by the SET ONE_SHOT syntax. sql/log_event.cc: In slave, we must not simply reset the charset after each statement: if we do this, the charset gets immediately after executing the SET CHARACTER SET! (BUG#4500).
| * | | | - fixed typo so make dist does not failunknown2004-08-281-1/+1
| | | | |
| * | | | Code style fixes.unknown2004-08-287-147/+187
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options() mysql-test/r/lowercase_table.result: Changed foo database -> mysqltest More test cases mysql-test/t/lowercase_table.test: Changed foo database -> mysqltest More test cases mysys/my_getopt.c: Fix new code to use MySQL indentation style sql/log.cc: Change to use MySQL indentation style and naming conventions Remove usage of strlen() and strcat() sql/mysqld.cc: Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options() sql/sql_base.cc: Added comment sql/table.cc: Added #if MYSQL_VERSION_ID < 40100 to ensure code is merged correctly
| * | | Compile all charset conversion tables if --with-extra-charsets=allunknown2004-08-273-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | or --with-extra-charsets=complex is given.
| * | | table.cc:unknown2004-08-271-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #4558 Escape handling error for ENUM values in SJIS encoding sql/table.cc: Bug #4558 Escape handling error for ENUM values in SJIS encoding
| * | | win1251.conf:unknown2004-08-272-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed. bug#5110 sql/share/charsets/win1251.conf: Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed. bug#5110 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-271-0/+8
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | into build.mysql.com:/users/rburnett/mysql-4.0
| | * | Adding a file that was missed during the first pushunknown2004-08-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file was part of the patch for Bug #4466 Nothing in .err when mysql service ends because of malformed my.ini options message.mc: new file
| * | | - fixed brain fart in Bootrap - it never actually caught failuresunknown2004-08-261-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when pulling BK trees before. Build-tools/Bootstrap: - thinko fix: we need to run the "bk pull" command on its own, if we want to get its return value...
* | | | typo fixedunknown2004-08-301-1/+1
| | | |
* | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-08-262-0/+140
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | | Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-262-0/+140
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | into hegel.txg.br:/home/miguel/bk/mysql-4.0
| | * | Adding binary version information for debug/release version of libmysqld.dllunknown2004-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.
* | | | remove warningunknown2004-08-261-0/+1
|/ / /
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-2635-81/+378
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/rburnett/mysql-4.0 BitKeeper/etc/logging_ok: auto-union sql/mysql_priv.h: Auto merged
| * | | Test case for Bug #4792 lower_case_table_names does not resolve ↵unknown2004-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 mysql-test/t/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 mysql-test/r/lowercase_table.result: New results for modified lowercase_table test
| * | | Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT listunknown2004-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 sql/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.0unknown2004-08-2532-81/+347
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/rburnett/mysql-4.0 BitKeeper/etc/logging_ok: auto-union client/mysql.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
| | * | Bug #4466 Nothing in .err when mysql service ends because of malformed ↵unknown2004-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 include/my_getopt.h: moved definition of enum loglevel from my_getopt.h to my_sys.h include/my_sys.h: moved definition of enum loglevel from my_getopt.h to my_sys.h mysys/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
| | * | Bug #4466 Nothing in .err when mysql service ends because of malformed ↵unknown2004-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 include/my_getopt.h: Renamed LOGLEVEL to loglevel to match coding standards mysys/my_getopt.c: Renamed LOGLEVEL to loglevel to match coding standards sql/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. sql/mysql_priv.h: Changed LOGLEVEL to loglevel. Removed startup_ from some of the DBUG_ENTER macros. Removed the print_msg_to_log function as it was unused. sql/mysqld.cc: Changed LOGLEVEL enum to loglevel
| | * | BUG# 4466 - Nothing in .err when mysql service ends because of malformed ↵unknown2004-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. include/my_getopt.h: changed typedefs to use better naming convention. Moved error bitmask into the LOGLEVEL enum and included it here. mysys/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 sql/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. sql/mysql_priv.h: Removed the MY_ERROR style bitmask. Changed function headers to use new LOGLEVEL enum sql/mysqld.cc: Changed option_error_reporter to match new function header that includes LOGLEVEL enum
| | * | mysql_priv.h:unknown2004-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) VC++Files/sql/mysqld.dsp: Added custom build step for compiling message file and added message resource file (output of mc) client/mysqladmin.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlcheck.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqldump.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlimport.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlmanager-pwgen.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlmanagerc.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlbinlog.cc: Added NULL error reporter parameter as the last paramter to handle_options client/mysqlshow.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysqltest.c: Added NULL error reporter parameter as the last paramter to handle_options extra/my_print_defaults.c: Added NULL error reporter parameter as the last paramter to handle_options extra/mysql_install.c: Added NULL error reporter parameter as the last paramter to handle_options extra/mysql_waitpid.c: Added NULL error reporter parameter as the last paramter to handle_options extra/perror.c: Added NULL error reporter parameter as the last paramter to handle_options extra/resolve_stack_dump.c: Added NULL error reporter parameter as the last paramter to handle_options extra/resolveip.c: Added NULL error reporter parameter as the last paramter to handle_options isam/isamchk.c: Added NULL error reporter parameter as the last paramter to handle_options isam/pack_isam.c: Added NULL error reporter parameter as the last paramter to handle_options myisam/mi_test1.c: Added NULL error reporter parameter as the last paramter to handle_options myisam/myisam_ftdump.c: Added NULL error reporter parameter as the last paramter to handle_options myisam/myisamchk.c: Added NULL error reporter parameter as the last paramter to handle_options myisam/myisampack.c: Added NULL error reporter parameter as the last paramter to handle_options include/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 mysys/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 tools/mysqlmanager.c: Added NULL error reporter parameter as the last paramter to handle_options client/mysql.cc: Added NULL as error reporter arg to the end of handle_options sql/mysqld.cc: Added option_error_reporter callback function and pass that into handle_options sql/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. sql/gen_lex_hash.cc: Added NULL error reporting parameter to handle_options sql/mysql_priv.h: 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 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2004-08-261-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| * | | | - Updated RPM spec file: MySQL-Max now requires MySQL-server insteadunknown2004-08-261-2/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | of MySQL (BUG#3860)
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-262-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.0
| * \ \ \ mergeunknown2004-08-262-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged mysql-test/mysql-test-run.sh: merge (use new code)
| | * | | Remove default argument to mysql_truncate()unknown2004-08-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to new valgrind mysql-test/mysql-test-run.sh: Update for new valgrind sql/mysql_priv.h: Remove default argument to mysql_truncate() sql/sql_parse.cc: Remove default argument to mysql_truncate()
View Lorry Controller Status