summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-03-021-4/+23
|\ | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1
| * More comments on what could explain -1 in Seconds_Behind_Master inunknown2004-03-021-2/+15
| | | | | | | | | | | | | | SHOW SLAVE STATUS.
| * After hours of unsuccessful research onunknown2004-03-021-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#2826 "Seconds behind master weirdness" (sometimes this column of SHOW SLAVE STATUS shows a very big value, in fact a small negative number casted to ulonglong). This problem was reported by only one user, but which uses synchronized time between his servers. As suggested by the user, to hide this I display max(0, the value) so that it will be less confusing. For a user, seeing 0 is probably better than seeing -1 (both tell you that the slave is very close to the master). sql/slave.cc: Don't display a negative Seconds_Behind_Master in SHOW SLAVE STATUS.
* | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-03-0211-394/+436
|\ \ | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 include/my_sys.h: Auto merged
| * | Desperate attempt to push part of prepared statements cleanup which was unknown2004-03-0211-394/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reviewed in Saint-Petersbourg (including post-review fixes). include/my_sys.h: Added clear_alloc_root (reset alloc root without freeing its memory) sql/item.h: - rename setup_param -> set_parap (function assigns parameter value to item) sql/mysql_priv.h: - all return values are void, because return value is never checked in dispatch_command - removed unused declaration of setup_param_functions sql/protocol.h: - unused declarations of setup_params_data* removed sql/sql_class.cc: Cleanup: - bzero(mem_root) replaced with clear_alloc_root - query_id and command members moved back to THD from Statement Assignment of mem_root, free_list, query_id and command optimized away from set_statement(). sql/sql_class.h: - query_id and command moved back to THD from Statement sql/sql_lex.h: - better type for param_list - param_count is the same thing as param_list.elements sql/sql_parse.cc: - comments for dispatch_command sql/sql_prepare.cc: Cleanup: - added comments to many functions and removed trailing spaces in many lines, some stale comments removed. - it's faster to iterate using pointers, than classes - Renames: error_in_prepare renamed to get_longdata_error (because it is set when there is an error in mysql_send_longdata, rather than in mysql_prepare), embedded versions of placeholder assignement functions now have prefix emb_, setup_ functions renamed to set_, because they perform assignment, not installation, setup_params_data now doesn't call insert_params and was renamed to setup_set_param_functions, - find_prepared_statement should not send error if called from no-reply calls, like mysql_stmt_reset - error reporting is checked up, to always report errors and not report errors twice. send_prep_stmt can be done mostly in send_prepare_result, rather than in test_* functions. - now we don't need to reinit THD->mem_root/free_list in mysql_stmt_execute, because it's not reset there. tests/client_test.c: - removed second call to test_subqueries
* | | my_getsystime()unknown2004-03-025-11/+44
| | |
* | | "you need MySQL build with" may take an configure option as an argument not ↵unknown2004-03-0222-22/+22
|/ / | | | | | | necessarily a define
* | Cleanup ha_checktype() and redundant variables.unknown2004-03-0210-70/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysqld/lib_sql.cc: Removing *_skip variables sql/ha_berkeley.cc: Removing *_skip variables sql/ha_berkeley.h: Removing *_skip variables sql/ha_innodb.cc: Removing *_skip variables sql/ha_innodb.h: Removing *_skip variables sql/ha_isam.cc: Removing *_skip variables sql/ha_isam.h: Removing *_skip variables sql/handler.cc: Removing *_skip variables Cleanup ha_checktype() sql/mysqld.cc: Removing *_skip variables sql/sql_show.cc: Removing *_skip variables
* | fix for a bug #2953.unknown2004-03-013-2/+17
| | | | | | | | | | | | | | | | | | When password was granted with a global grant, then granting privileges on database level, without password being specified, will temporary (in memory) set password to ''.
* | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-02-293-5/+9
|\ \ | | | | | | | | | | | | | | | | | | into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
| * | bug#3011 - multi-byte charset in fulltextunknown2004-02-293-5/+9
| | | | | | | | | | | | | | | | | | myisam/ft_nlq_search.c: bug#3011 - multi-byte charset in fulltext cleanup
* | | Add word to error message.unknown2004-02-2922-23/+23
|/ /
* | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-02-291-18/+18
|\ \ | |/ |/| | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * compare a decimal value with a string not a double, as we want to test for ↵unknown2004-02-291-18/+18
| | | | | | | | an *exact* match
* | small after-merge fixes (error messages).unknown2004-02-2826-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysqld_error.h: more generic error code mysql-test/r/func_compress.result: update after message change mysql-test/r/loaddata.result: update after message change mysql-test/r/warnings.result: update after message change sql/share/czech/errmsg.txt: message change sql/share/danish/errmsg.txt: message change sql/share/dutch/errmsg.txt: message change sql/share/english/errmsg.txt: message change sql/share/estonian/errmsg.txt: message change sql/share/french/errmsg.txt: message change sql/share/german/errmsg.txt: message change sql/share/greek/errmsg.txt: message change sql/share/hungarian/errmsg.txt: message change sql/share/italian/errmsg.txt: message change sql/share/japanese/errmsg.txt: message change sql/share/korean/errmsg.txt: message change sql/share/norwegian-ny/errmsg.txt: message change sql/share/norwegian/errmsg.txt: message change sql/share/polish/errmsg.txt: message change sql/share/portuguese/errmsg.txt: message change sql/share/romanian/errmsg.txt: message change sql/share/russian/errmsg.txt: message change sql/share/slovak/errmsg.txt: message change sql/share/spanish/errmsg.txt: message change sql/share/swedish/errmsg.txt: message change sql/share/ukrainian/errmsg.txt: message change
* | temporary undo needed for mergeunknown2004-02-283-36/+47
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/share/serbian/errmsg.txt: Auto merged include/mysqld_error.h: for merge mysql-test/r/loaddata.result: for merge mysql-test/r/warnings.result: for merge sql/share/czech/errmsg.txt: for merge sql/share/danish/errmsg.txt: for merge sql/share/dutch/errmsg.txt: for merge sql/share/english/errmsg.txt: for merge sql/share/estonian/errmsg.txt: for merge sql/share/french/errmsg.txt: for merge sql/share/german/errmsg.txt: for merge sql/share/greek/errmsg.txt: for merge sql/share/hungarian/errmsg.txt: for merge sql/share/italian/errmsg.txt: for merge sql/share/japanese/errmsg.txt: for merge sql/share/korean/errmsg.txt: for merge sql/share/norwegian-ny/errmsg.txt: for merge sql/share/norwegian/errmsg.txt: for merge sql/share/polish/errmsg.txt: for merge sql/share/portuguese/errmsg.txt: for merge sql/share/romanian/errmsg.txt: for merge sql/share/russian/errmsg.txt: for merge sql/share/slovak/errmsg.txt: for merge sql/share/spanish/errmsg.txt: for merge sql/share/swedish/errmsg.txt: for merge sql/share/ukrainian/errmsg.txt: for merge
| * Fix for BUG#3000:unknown2004-02-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | "replicate-wild-*-table=db.% does not apply to ALTER DATABASE" apply replicate-* rules to ALTER DATABASE like we already do for CREATE DATABASE/ DROP DATABASE. sql/sql_parse.cc: apply replicate-* rules to ALTER DATABASE like we already do for CREATE DATABASE/ DROP DATABASE.
| * result update after typo fixedunknown2004-02-282-3/+3
| | | | | | | | | | | | | | mysql-test/r/loaddata.result: update after typo fixed mysql-test/r/warnings.result: update after typo fixed
| * found typounknown2004-02-2221-21/+21
| |
| * Fix for BUG#2757unknown2004-02-2126-58/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "--read-only gives weird error on update". It is not fixable in 4.0 because it requires modifying the sql/share/*/errmsg.txt files. So it is fixed in 4.1 like this: the ER_SKIP_GRANT_TABLES is replaced by a more generic ER_OPTION_PREVENTS_STATEMENT which can be used both for "can't do this because of --skip-grant-tables" and "can't do this because of --read-only" (for this we don't use ER_CANT_UPDATE_WITH_READLOCK anymore). So now the message for --read-only is: "The MySQL server is running with the --read-only option so cannot execute this statement". include/mysqld_error.h: more general naming as more general message sql/share/czech/errmsg.txt: message change sql/share/danish/errmsg.txt: message change sql/share/dutch/errmsg.txt: message change sql/share/english/errmsg.txt: message change sql/share/estonian/errmsg.txt: message change sql/share/french/errmsg.txt: message change sql/share/german/errmsg.txt: message change sql/share/greek/errmsg.txt: message change sql/share/hungarian/errmsg.txt: message change sql/share/italian/errmsg.txt: message change sql/share/japanese/errmsg.txt: message change sql/share/korean/errmsg.txt: message change sql/share/norwegian-ny/errmsg.txt: message change sql/share/norwegian/errmsg.txt: message change sql/share/polish/errmsg.txt: message change sql/share/portuguese/errmsg.txt: message change sql/share/romanian/errmsg.txt: message change sql/share/russian/errmsg.txt: message change sql/share/serbian/errmsg.txt: message change sql/share/slovak/errmsg.txt: message change sql/share/spanish/errmsg.txt: message change sql/share/swedish/errmsg.txt: message change sql/share/ukrainian/errmsg.txt: message change sql/sql_acl.cc: Changes to use the more generic ER_OPTION_PREVENTS_STATEMENT instead of ER_SKIP_GRANT_TABLES: * use of net_printf() instead of send_error() (because send_error() does not support printf-like format). * in some places we now just do my_error() and return -1 (only caller is mysql_execute_command() which does send_error() if result is -1). * Replaced my_printf_error() by simpler my_error() (except in 2 locations where there was a "we must use my_printf_error()" comment). sql/sql_parse.cc: new error code (more generic).
* | minor compress() cleanupunknown2004-02-282-4/+4
| | | | | | | | | | | | | | sql/item_strfunc.cc: typo fixed sql/share/english/errmsg.txt: wording
* | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-02-281-2/+2
|\ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | update max_used_connections *after* thread_count was increased to take into ↵unknown2004-02-281-2/+2
| | | | | | | | | | | | account the current connection
* | | - fixed another HP-UX compile error ("Member 'set_item_arena' not declared unknown2004-02-281-1/+1
|/ / | | | | | | | | | | | | in class Statement")
* | make func_misc portableunknown2004-02-282-4/+4
| | | | | | | | | | | | | | on different systems sprintf("%.3", 1.555499999999999) behaves differently
* | fix CHARSET(UUID())unknown2004-02-272-1/+5
| |
* | restored func_misc.result after my_strtod fixunknown2004-02-271-1/+1
| |
* | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-02-2716-133/+71
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/item_strfunc.cc: Auto merged sql/mysqld.cc: Auto merged
| * | - removed extraneous Item_ident:: to fix a compile error on HP-UXunknown2004-02-271-1/+1
| | |
| * | btr0cur.c:unknown2004-02-271-60/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths innobase/btr/btr0cur.c: Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths
| * | Applied fixes to issues discovered during test builds on Windows.unknown2004-02-2710-51/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/libmysql/libmysql.dsp: strtod.c is needed to build the library. VC++Files/libmysqld/libmysqld.dsp: Add include directory to resolve problem with including emb_qcache.h, remove opt_ft.cc (no longer in tree). VC++Files/mysqldemb/mysqldemb.dsp: Add include directory to resolve problem with including emb_qcache.h, remove opt_ft.cc (no longer in tree). VC++Files/mysqlserver/mysqlserver.dsp: Add include directory to resolve problem with including emb_qcache.h. VC++Files/strings/MASM6x/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. VC++Files/strings/noMASM/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. VC++Files/strings/strings.dsp: Remove atof.c (no longer in tree) and add strtod.c, needed for the library. sql/mysqld.cc: A cast is required to resolve the compile error on Windows (char * is not equivalent to byte *). sql/set_var.cc: A cast is required to resolve the compile error on Windows (char * is not equivalent to byte *). BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | do not use static array of pastpoints in my_strtod - it is not portableunknown2004-02-273-19/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (that is, these numbers are converted to doubles by a local OS strtod, and on different systems they get different values) sql/item_strfunc.cc: no need to check for HAVE_ISNAN here, it is taken care of in my_global.h strings/strtod.c: do not use static array of pastpoints - it is not portable (that is, these numbers are converted to doubles by a local OS strtod, and on different systems they get different values) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | - fixed test result: FORMAT(12345.5555,3) really should return "12,345.556"unknown2004-02-271-1/+1
| | |
| * | - really remove all traces of odbcunknown2004-02-261-1/+1
| | |
* | | comment correctedunknown2004-02-271-1/+1
| | |
* | | my_gethwaddr() for linux/freebsdunknown2004-02-2712-21/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UUID() function BitKeeper/etc/ignore: Added mysys/test_gethwaddr to the ignore list include/my_sys.h: my_gethwaddr() mysys/Makefile.am: my_gethwaddr sql/item_create.cc: UUID() function sql/item_create.h: UUID() function sql/item_strfunc.cc: UUID() function sql/item_strfunc.h: UUID() function sql/lex.h: UUID() function sql/mysql_priv.h: UUID() function sql/mysqld.cc: UUID() function sql/sql_class.cc: cleanup
* | | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-02-262-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/mysqld.cc: Auto merged
| * | in netware ':' is also a valid path characterunknown2004-02-242-3/+3
| | |
* | | Code cleanupunknown2004-02-241-1/+1
| | |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-02-2410-5/+145
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1 sql/mysqld.cc: Auto merged
| * | minor omission that effectively disabled my_strtod fixed :)unknown2004-02-244-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/bigint.result: updated mysql-test/r/func_misc.result: updated mysql-test/t/bigint.test: updated
| * | Merge bk-internal:/home/bk/mysql-4.1/unknown2004-02-232-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | missing break addedunknown2004-02-231-0/+1
| | | |
| | * | typo fixedunknown2004-02-211-1/+1
| | | |
| * | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2004-02-224-1/+137
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2719/mysql-4.1
| | * | | fixed for BUG #2719 "Heap tables status shows wrong or missing data"unknown2004-02-204-1/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | heap/hp_delete.c: added code for right calculation of Index_length in HEAP tables with BTREE indexes heap/hp_write.c: added code for right calculation of Index_length in HEAP tables with BTREE indexes mysql-test/r/show_check.result: added test for BUG #2719 "Heap tables status shows wrong or missing data" mysql-test/t/show_check.test: added test for BUG #2719 "Heap tables status shows wrong or missing data"
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-02-22173-52898/+2735
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1 innobase/rem/rem0cmp.c: Auto merged libmysql/libmysql.c: Auto merged sql-common/client.c: Auto merged sql/ha_innodb.cc: Auto merged sql/sql_base.cc: Auto merged
| * | | | Updated resultsunknown2004-02-221-3/+3
| | | | |
| * | | | Merge with 4.0 to get fixed testsunknown2004-02-225-26/+33
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/lock_tables_lost_commit.test: Auto merged
| | * | | | Move tests that uses innodb to innodb.testunknown2004-02-225-26/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/lock_tables_lost_commit.test: Ensure that innodb is compiled in
View Lorry Controller Status