summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* mysql.server should read [server] group from my.cnf - according to the manualunknown2003-06-131-1/+1
|
* consistency fix - all help texts for command-line options should end with a dot.unknown2003-06-1318-255/+252
|
* Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-121-1/+1
|\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * FT2 bug in mi_delete fixedunknown2003-06-121-1/+1
| |
* | ft_update.c:unknown2003-06-112-2/+13
| | | | | | | | | | | | | | | | | | | | Fix parse error per serg instructions. myisam/ft_update.c: Fix parse error per serg instructions. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2003-06-114-1/+35
|\ \ | |/ |/| | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1
| * We now require SUPER privilege for SET PSEUDO_THREAD_ID.unknown2003-06-114-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/rpl_temporary.result: result update mysql-test/t/rpl_temporary.test: test that PSEUDO_THREAD_ID now requires SUPER. sql/set_var.cc: Class for pseudo_thread_id (it used to be sys_var_thd_ulong, but we decided to require the SUPER privilege so we needed a check() function, which sys_var_thd_ulong does not feature (check() is virtual in sys_var and in sys_var_thd_ulong too). sql/set_var.h: Class for pseudo_thread_id
* | test result updatedunknown2003-06-112-1/+3
| | | | | | | | | | mysql-test/t/rpl_relayrotate.test: when mysqld has no innodb compiled in it's not a bug!
* | protect deleted objects from reusal with safemalloc techniqueunknown2003-06-111-1/+5
|/
* Merge cpedersen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-1019-60/+266
|\ | | | | | | | | | | | | into tsort.bitbybit.dk:/home/carsten/mysql/bk/mysql-4.1
| * Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-103-2/+20
| |\ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * LOAD_FILE() is now COERCIBLEunknown2003-06-103-2/+20
| | | | | | | | | | | | | | | | | | | | | LOAD_FILE() tests
| * | test results updatedunknown2003-06-103-12/+12
| | |
| * | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-107-12/+155
| |\ \ | | |/ | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * Function INSERT() now works according to coercibility rulesunknown2003-06-103-3/+18
| | | | | | | | | | | | | | | | | | | | | Test for INSERT() has been added
| | * Coercibility tests forunknown2003-06-102-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | - equal predicate - LIKE predicate - strcmp() function
| | * Some more functions work according to coercibility now:unknown2003-06-105-12/+48
| | | | | | | | | | | | | | | | | | | | | | | | repeat, reverse, quote, soundex, substring Test func_str has been extended to check them
| * | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-104-7/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-103-6/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.1.latest
| | | * Bugfix for HEAP table rb-index scan.unknown2003-06-103-6/+6
| | | |
| | * | mysqldump.c:unknown2003-06-101-1/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | SET NAMES is not sent to server when SET NAMES is not dumped Server decides which character set to use in this case client/mysqldump.c: SET NAMES is not sent to server when SET NAMES is not dumped Server decides which character set to use in this case
| | * mysqldump.c:unknown2003-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | SET NAMES is not produced in compatibility modes client/mysqldump.c: SET NAMES is not produced in compatibility modes
| * | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-093-27/+69
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 myisam/mi_delete.c: Auto merged
| | * more DBUG_xxx tagsunknown2003-06-093-27/+69
| | |
* | | Some error messages re. BLOBs are true for TEXTs as wellunknown2003-06-092-3/+4
|/ / | | | | | | | | | | | | sql/share/english/errmsg.txt: Some messages re. BLOBs are true for TEXTs as well BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Fix for mysql_list_fields & reset stmt buffers from stmt_free_resultunknown2003-06-085-52/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows build fix VC++Files/sql/mysqld.dsp: Added sql_state.c to wrk space include/mysql_com.h: Windows build fix (mismatch declaration of my_bool and bool from defination) include/thr_alarm.h: Windows build fix libmysql/libmysql.c: Fix for mysql_list_fields & reset stmt buffers from stmt_free_result tests/client_test.c: Updated test for DEFAULT value for mysql_list_fields() New tests for mysql_stmt_free_result()
* | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-0632-21/+456
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.revoke sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * | REVOKE all privileges and delete user(244)unknown2003-06-0632-21/+456
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysqld_error.h: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT mysql-test/r/grant.result: Test for DROP USER, REVOKE ALL PRIVILEGES, GRANT mysql-test/t/grant.test: Test for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/czech/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/danish/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/dutch/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/english/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/estonian/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/french/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/german/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/greek/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/hungarian/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/italian/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/japanese/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/korean/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/norwegian-ny/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/norwegian/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/polish/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/portuguese/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/romanian/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/russian/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/serbian/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/slovak/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/spanish/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/swedish/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT sql/share/ukrainian/errmsg.txt: Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT
* | | client.c:unknown2003-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Compilation falure fix sql-common/client.c: Compilation falure fix
* | | my_global.h:unknown2003-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ulong was used before the line it have been declared include/my_global.h: ulong was used before the line it have been declared
* | | After merge fixesunknown2003-06-055-29/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/repair_part1.result: Rename: mysql-test/r/repair.result -> mysql-test/r/repair_part1.result mysql-test/t/repair_part1.test: Rename: mysql-test/t/repair.test -> mysql-test/t/repair_part1.test include/sql_common.h: Declare not_error_sqlstate scripts/Makefile.am: Added back fill_help_tables.sql
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-051-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1
| * | | fixed bug (writting outside mallocced buffer in sql_help.cc)unknown2003-06-051-3/+3
| | | | | | | | | | | | | | | | | | | | sql/sql_help.cc: fixed bug (writting outside mallocced buffer)
* | | | Merge with 4.0.13unknown2003-06-0527-294/+565
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43: Auto merged innobase/os/os0file.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/rpl_loaddata.result: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged sql/handler.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/net_serv.cc: Auto merged sql/slave.cc: Auto merged sql/sql_repl.cc: Auto merged support-files/mysql.spec.sh: Auto merged
| * | | | Added function commentunknown2003-06-051-3/+15
| | | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-06-051-4/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
| | * | | | mysqld won't give a warning any more, if --user=user_name is used,unknown2003-06-051-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if 'user_name' is the current user and it is not root.
| * | | | | ha_innodb.cc:unknown2003-06-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert a change to dict_mem_index_add_field which slipped prematurely into the bk tree sql/ha_innodb.cc: Revert a change to dict_mem_index_add_field which slipped prematurely into the bk tree
| * | | | | ha_innodb.cc, handler.cc:unknown2003-06-052-104/+157
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB sql/handler.cc: Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB sql/ha_innodb.cc: Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB
| * | | | Merged fix for alarm on big blocksunknown2003-06-051-1/+1
| |\ \ \ \
| | * | | | Fixed test if thr_alarm() failedunknown2003-06-051-1/+1
| | | | | |
| * | | | | Merge jani@192.168.0.2:/my/mysql-4.0unknown2003-06-052-5/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
| | * | | | | Fixed a bug in concat_ws(), which did not add concat separatorunknown2003-06-052-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in case of an empty string. Bug ID 586.
| * | | | | | Print error if we can't delete an alarmunknown2003-06-055-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More debugging variables Increment aborted_threads in case of killed or too big packet include/thr_alarm.h: made prototype more portable mysys/thr_alarm.c: Print error if we can't delete an alarm sql/mysqld.cc: Statistics variable (for debugging) sql/net_serv.cc: statistics variable (for debugging) sql/sql_parse.cc: Increment aborted_threads in case of killed or too big packet
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-06-052-1/+13
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| | * | | | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2003-06-042-1/+13
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| | | * | | | | - When compiling the Max package incl. RAID support using gcc, make sureunknown2003-06-041-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to set CXX=gcc (cannot link the code with g++) - this should help to recompile the RPM on Distributions using gcc 3 - Added a symlink /usr/sbin/rcmysql -> /etc/init.d/mysql
| | | * | | | | - Updated Default-Stop run levels in the LSB header section to satisfyunknown2003-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Red Hat's chkconfig (Bug #272) (The LSB spec is a bit ambigous about what actually needs to be put into this field)
| * | | | | | | Merge with 3.23 to get fix for thr_alarm and big packetsunknown2003-06-051-2/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Fixed problem with alarms when reading too big packetunknown2003-06-051-5/+5
| | | | | | | |