summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add missing definesunknown2003-06-161-0/+2
|
* mergeunknown2003-06-162-5/+5
|\ | | | | | | | | | | | | sql-common/client.c: Auto merged scripts/mysql_install_db.sh: Use local version
| * Fix for compilation error.unknown2003-06-162-5/+5
| | | | | | | | | | | | | | | | | | | | | | Compiler can signal error when init_sigpipe_variables expands as empty place. Had to remove all semicolons after init_sigpipe_variables libmysql/client_settings.h: semicolon added sql-common/client.c: we don't need semicolons after init_sigpipe_variables
| * Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2003-06-151-1/+1
| |\ | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
| | * fixed bug with './' prefix in mysql_install_dbunknown2003-06-141-1/+1
| | | | | | | | | | | | | | | scripts/mysql_install_db.sh: fixed bug with './' prefix
* | | Fixes for make_win_src_distributionsunknown2003-06-1510-75/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed compiler warnings scripts/make_win_src_distribution.sh: Added option --dirname Also copy sql-common directory Create mysql data files even if mysqld is not installed scripts/mysql_create_system_tables.sh: Update for usage with make_win_src_distribution scripts/mysql_install_db.sh: Update for usage with make_win_src_distribution sql-common/client.c: Portability fix sql/item_cmpfunc.cc: Removed compiler warning sql/sql_acl.cc: Indentation cleanup Removed compiler warning sql/sql_parse.cc: Removed compiler warning sql/sql_select.cc: Removed compiler warning sql/sql_yacc.yy: Removed compiler warning strings/ctype-utf8.c: Removed compiler warning
* | | LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows.unknown2003-06-152-3/+14
|/ / | | | | | | | | mysql-test/r/auto_increment.result: Update results after bug fix
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-1421-691/+636
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1 client/mysql.cc: Auto merged mysql-test/r/type_blob.result: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged
| * | Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 ↵unknown2003-06-1422-692/+637
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master/slave will now use the 4.1 protocol Fixed wrong value for SQLSTATE_LENGTH Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect() Changed mysql_port and mysql_unix_port to mysqld_xxxx client/mysql.cc: Removed valgrind & compiler warnings client/sql_string.h: Fix to remove valgrind warnings include/mysql.h: Added read_timeout and write_timeout to mysql options struct. This is to be used for slave when connection to master. code cleanup include/mysql_com.h: Fixed wrong value for SQLSTATE_LENGTH Added CLIENT_REMEMBER_OPTIONS include/sql_common.h: Cleanup after split of libmysql.c to client.c and libmysql.c include/sql_state.h: Removed default states libmysql/client_settings.h: Cleanup after split of libmysql.c to client.c and libmysql.c libmysql/libmysql.c: Cleanup after split of libmysql.c to client.c and libmysql.c mysql-test/r/type_blob.result: Update results after someone updated error messages without running tests mysys/charset.c: More debug information mysys/errors.c: Fixed wrong error message sql-common/client.c: Cleanup after split of libmysql.c to client.c and libmysql.c sql/Makefile.am: Added sql_client.cc sql/client_settings.h: Cleanup after split of libmysql.c to client.c and libmysql.c sql/log.cc: Changed mysql_port and mysql_unix_port to mysqld_xxxx sql/mysql_priv.h: Changed mysql_port and mysql_unix_port to mysqld_xxxx sql/mysqld.cc: Changed mysql_port and mysql_unix_port to mysqld_xxxx sql/protocol.cc: Fix for SQLSTATE_LENGTH Moved function to sql_client.c sql/repl_failsafe.cc: Cleanup after split of libmysql.c to client.c and libmysql.c sql/set_var.cc: Changed mysql_port and mysql_unix_port to mysqld_xxxx sql/slave.cc: Cleanup after split of libmysql.c to client.c and libmysql.c
* | | bug #251 - destroyed object reused - fixedunknown2003-06-132-5/+6
| | |
* | | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-1319-256/+253
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | 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
| | | |
* | | | cleaned user used in tests 'connect' and 'rpl_temporary'unknown2003-06-133-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/connect.result: result update mysql-test/t/connect.test: clean after we are done mysql-test/t/rpl_temporary.test: use '' instead of 'boo'
* | | | user change to avoid conflicts with user 'test'unknown2003-06-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/rpl_temporary.test: user change to avoid conflicts with user 'test' (to which test connect.test gives password "gambling", so depending on the order of the tests, 'test' has password '' or 'gambling': better to use an unknown user which will be directed to ''@localhost with password always '').
* | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2003-06-125-72/+195
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1
| * | | See each file's changeset for details.unknown2003-06-125-72/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Comments for future devs. - Start_log_event::exec_event() : when we hit it, do a rollback. - We don't need LOG_EVENT_FORCED_ROTATE_F. - Stop_log_event::exec_event() : when we hit it, we needn't clean anything. - Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F. - We don't need Stop events in the relay log. - Now filtering of server id is done in the I/O thread first. sql/log.cc: We don't need LOG_EVENT_FORCED_ROTATE_F sql/log_event.cc: - Comments for future devs. - Start_log_event::exec_event() : when we hit it, do a rollback. If the SQL thread was inside a transaction (for example, the master died while writing to the binlog, so did not commit (because we write to the binlog before committing), so will rollback), it's sensible to rollback. If we're not in a transaction, rollback will not hurt (it will do nothing). - We don't need LOG_EVENT_FORCED_ROTATE_F. - Stop_log_event::exec_event() : when we hit it, we needn't clean anything, because each threads has already written some cleaning statements (DROP TEMPORARY TABLE, DO RELEASE_LOCK); we still clean in Start_log_event::exec_event() (if 4.x). sql/log_event.h: - Comments for future devs. - Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F. sql/slave.cc: - We don't need Stop events in the relay log (see changeset's description about log_event.cc). So we can make event queuing (writing to the relay log) simpler. - Something that was marked TODO: now filtering of server id (if the server id of this event is the same as mine ignore it) is done in the I/O thread if the master is 4.x (it still also done in the SQL thread whatever the version of the master is, for safe upgrades). This saves disk space. sql/slave.h: We don't need master_info.ignore_stop_event anymore, as we don't write Stop_event to the relay log anymore.
* | | | 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
| | | | |
View Lorry Controller Status