summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ctype-win1250ch.c, ctype-czech.c:unknown2004-05-073-4/+4
| | | | | | | | | | | | | | Czech collations were renamed to _cs Index.xml: Czech collation were renamed to _cs sql/share/charsets/Index.xml: Czech collation were renamed to _cs strings/ctype-czech.c: Czech collations were renamed to _cs strings/ctype-win1250ch.c: Czech collations were renamed to _cs
* Portablity fix for system with case insenstive table names. (Without this ↵unknown2004-05-071-0/+3
| | | | ALTER TABLE can fail for InnoDB)
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-0715-70/+100
|\ | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 libmysql/libmysql.c: Auto merged
| * Portability fixesunknown2004-05-0715-70/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change strtoll -> my_strtoll10() Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472) configure.in: Fixed problem on IRIX64 (One can't have AC_MSG_RESULT on same row as AC_DEFINE extra/my_print_defaults.c: Fixed wrong definition for 'verbose' include/my_global.h: Portability fix (IRIX64) libmysql/client_settings.h: Remove compiler warnings libmysql/libmysql.c: Remove compiler warnings mysql-test/r/func_str.result: Updated results mysql-test/r/key_cache.result: Updated results to not depend on key_blocks_unused mysql-test/t/func_str.test: More test of long overflow mysql-test/t/key_cache.test: Updated results to not depend on key_blocks_unused sql/item.cc: Portability fix (don't use strtoll()) sql/item.h: Portability fix (don't use strtoll()) sql/item_sum.h: Portability fix (don't use strtoll()) sql/item_timefunc.cc: Fixed compiler warning strings/ctype-simple.c: Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems strings/ctype-ucs2.c: Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
* | Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-062-19/+66
|\ \ | | | | | | | | | | | | | | | | | | into hegel.local:/home/miguel/bk/mysql-4.1
| * \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-05-072-19/+66
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
| | * | postreview fixesunknown2004-05-072-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_lex.h: description of field sql/sql_union.cc: layout fixed
| | * | fake_select_lex should be prepared during PS preparation to work correctlyunknown2004-05-072-19/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | item_list for fake_select will be created only once (problem reported by valgrind in test_union2 fixed) sql/sql_lex.h: new function to keep code in one place sql/sql_union.cc: fake_select_lex should be prepared during PS preparation to work correctly item_list for fake_select will be created only once
* | | | Windows VC++ compiler compatibilityunknown2004-05-0622-35/+88
|\ \ \ \ | |/ / / | | | | | | | | | | | | sql/set_var.cc: VC++ error compiler compatibility
| * | | Merge mysql.com:/space/my/mysql-4.1unknown2004-05-061-4/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | * | - removed duplicate file ..\strings\strxnmov.c from the mysqlclient.dspunknown2004-05-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that was accidently added by the last BK auto merge VC++Files/client/mysqlclient.dsp: - removed duplicate file ..\strings\strxnmov.c that was added by the last auto merge
| * | | mysql_stmt_reset now expects ok/error packet from server.unknown2004-05-063-9/+17
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | libmysql/libmysql.c: Make advanced_command check client reply sql/sql_prepare.cc: mysql_stmt_reset now sends ok/error reply to the client. tests/client_test.c: Memory leak fixed.
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-067-11/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/pem/work/mysql-4.1
| | * | Fixed (portability) bug in handler.h, and tried to silence cast warnings on ↵unknown2004-05-067-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some platforms. sql/handler.h: Fixed (portability) bug. No qualified method names in the class definition. sql/item_cmpfunc.h: Attempt to silence cast warnings on some platforms. sql/item_subselect.h: Attempt to silence cast warnings on some platforms. sql/set_var.cc: Silence warning (missing cast). sql/spatial.h: Attempt to silence cast warnings on some platforms. sql/sql_cache.cc: Silence warning (wrong cast). sql/sql_lex.h: Attempt to silence cast warnings on some platforms.
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-067-9/+35
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * | Merge with 4.0 to get security patch for check_grant_columunknown2004-05-067-9/+35
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/os0file.h: Auto merged innobase/os/os0file.c: Auto merged innobase/srv/srv0srv.c: Auto merged mysql-test/r/rpl_server_id2.result: Auto merged sql/ha_innodb.cc: Auto merged sql/slave.cc: Merge with 4.0
| | | * \ Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0unknown2004-05-061-2/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_acl.cc: Auto merged
| | | | * | fixed db name and layout (can cause very rare race condition bug)unknown2004-05-041-2/+2
| | | | | |
| | | * | | Remove not used variableunknown2004-05-061-2/+2
| | | | | |
| | | * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-05-053-3/+8
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | | * | | very minor changes: a STOP SLAVE in a replication test to get rid of a non ↵unknown2004-05-053-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | critical message in slave.err, and a comment update mysql-test/r/rpl_server_id2.result: result update mysql-test/t/rpl_server_id2.test: We stop the slave before cleaning up otherwise we'll get 'drop table t1' executed twice, so an error in the slave.err (not critical). sql/slave.cc: update comment about 4.1 now that 4.1 is fixed (in a few minutes, exactly)
| | | * | | | InnoDB portability fix: new function os_file_set_eof()unknown2004-05-054-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/os0file.h: Add os_file_set_eof() innobase/os/os0file.c: Add os_file_set_eof() innobase/srv/srv0srv.c: Replace chsize() or ftruncate() with os_file_set_eof() sql/ha_innodb.cc: Replace my_chsize() with os_file_set_eof()
| * | | | | | - Windows compile fixes: added some missing files to the Windows Projectunknown2004-05-065-2/+18
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files, fixed linking of myisam_ftdump VC++Files/client/mysqlclient.dsp: - added strings/ctype.uca.c VC++Files/libmysql/libmysql.dsp: - added strings/ctype.uca.c VC++Files/myisam_ftdump/myisam_ftdump.dsp: - added zlib to the link line VC++Files/sql/mysqld.dsp: - added discover.cpp VC++Files/strings/strings.dsp: - added strings/ctype.uca.c
* | | | | | Windows VC++ compability fixunknown2004-05-061-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | sql/set_var.cc: Fix VC++ compiler error
* | | | | Few cleanups to client_test.cunknown2004-05-061-9/+5
|/ / / / | | | | | | | | | | | | | | | | tests/client_test.c: Few cleanups
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-063-2/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | | | Fixed wrong key usage which caused wrong result for some "WHERE ↵unknown2004-05-063-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | primary_key=constant" queries where MySQL could use 'only index' (Bug #3666) The bug was introduced in a patch in the 4.1.2 source tree. mysql-test/r/key.result: New result mysql-test/t/key.test: Added test case for bug in key read sql/sql_select.cc: Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
* | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-062-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-4.1-code-cleanup sql/item.cc: Auto merged sql/item.h: Auto merged
| * | | | Make Item_param::val_int and Item_param::val_str follow the used convention ↵unknown2004-05-052-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and return 0 if null_value==1. sql/item.h: Added comments about Item::valxx() behavior if Item's value is NULL.
* | | | | fixed test resultsunknown2004-05-051-1/+1
| | | | |
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-05-052-10/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
| * | | | | Replication:unknown2004-05-052-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread). mysql-test/r/rpl_server_id2.result: result update sql/slave.cc: As the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
* | | | | | mergeunknown2004-05-0576-471/+1038
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: Auto merged sql/sql_union.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | | After merge fixesunknown2004-05-054-7/+7
| | | | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-0572-465/+1031
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/item_strfunc.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_union.cc: Auto merged
| | * | | | | after merge fixesunknown2004-05-0518-42/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqldump.c: Fixed problem with multiple tables (--skip-quote didn't work properly for second table) myisam/myisamchk.c: after merge fix
| | * | | | | Merge with 4.0.19unknown2004-05-0566-440/+988
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/mysql.dsw: Auto merged extra/perror.c: Auto merged extra/replace.c: Auto merged innobase/configure.in: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/lock/lock0lock.c: Auto merged ltmain.sh: Auto merged BitKeeper/deleted/.del-libmysqld.def~8edf7b8780ce943c: Auto merged innobase/os/os0file.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/trx/trx0trx.c: Auto merged mysql-test/r/alias.result: Auto merged mysql-test/t/system_mysql_db_fix-master.opt: Auto merged mysql-test/r/func_time.result: Automatic merge mysql-test/r/innodb.result: Automatic merge mysql-test/t/alias.test: Automatic merge mysql-test/t/create.test: Automatic merge mysql-test/t/func_time.test: Automatic merge sql/ha_innodb.cc: Automatic merge sql/mysql_priv.h: Automatic merge mysql-test/r/rpl_multi_update.result: Automatic merge mysql-test/t/rpl_error_ignored_table.test: Automatic merge mysql-test/t/rpl_multi_update.test: Automatic merge sql/slave.h: Automatic merge sql/sql_base.cc: Automatic merge sql/sql_db.cc: Automatic merge sql/sql_insert.cc: Automatic merge sql/structs.h: Automatic merge sql/table.cc: Automatic merge strings/longlong2str-x86.s: Automatic merge strings/strings-x86.s: Automatic merge support-files/my-medium.cnf.sh: Automatic merge
| | | * | | | Portability fixunknown2004-05-051-5/+1
| | | | | | |
| | | * | | | InnoDB: Truncate "<datadir>/innodb.status.<pid>" to its actual sizeunknown2004-05-052-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug #3596) innobase/srv/srv0srv.c: Truncate "<datadir>/innodb.status.<pid>" to its actual size (Bug #3596) sql/ha_innodb.cc: Truncate "<datadir>/innodb.status.<pid>" to its actual size (Bug #3596)
| | | * | | | InnoDB: os0file.c: Lock files exclusively (Bug #3608)unknown2004-05-051-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/os/os0file.c: Lock files unless #defined __WIN__ or UNIV_HOTBACKUP (Bug #3608)
| | | * | | | Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-05-058-29/+44
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/l/mysql-4.0
| | | | * | | | Fixes to Windows project files for 4.0.19unknown2004-05-042-11/+18
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysqlclient.dsp: Add strxnmov to project files VC++Files/mysql.dsw: Add dependency to prevent compile error
| | | | * | | useless fixes for --report-password and --show-slave-auth-info (almost ↵unknown2004-05-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | undocumented options), just for beauty of truth. sql/mysqld.cc: correcting sentence (even if option is not really usable, as it depends on report-user and report-password which are undocumented (and will stay like this)). sql/slave.cc: report password when you must report password.
| | | | * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-05-041-10/+7
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | | | * | | Fix for Bug#3357 "If the statement is long, the error message is trunc and ↵unknown2004-05-041-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | important info is lost"; in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning, so that it is not cut by truncation if the query is very long (which happens if the query goes first). sql/log_event.cc: in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning, so that it is not cut by truncation if the query is very long (which happens if the query goes first).
| | | | * | | | don't rely on readdir() returning . and .. firstunknown2004-05-042-2/+13
| | | | | | | |
| | | | * | | | compatibility fix. warning removedunknown2004-05-031-4/+4
| | | | | | | |
| | | * | | | | Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-05-0310-20/+323
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/l/mysql-4.0
| | | | * | | | InnoDB: implement LOCK TABLE (Bug #3299)unknown2004-04-2910-20/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/lock0lock.h: Add lock_table_unlock() and lock_release_tables_off_kernel() Add LOCK_TABLE_EXP innobase/include/row0mysql.h: Add row_unlock_table_for_mysql() and row_lock_table_for_mysql() innobase/include/trx0trx.h: Add n_tables_locked innobase/lock/lock0lock.c: Add LOCK_TABLE_EXP for explicit LOCK TABLE commands Add lock_table_unlock() Add lock_release_tables_off_kernel() innobase/row/row0mysql.c: Add row_unlock_table_for_mysql() and row_lock_table_for_mysql() innobase/trx/trx0trx.c: Add n_tables_locked mysql-test/r/innodb.result: Updated handling of auto_inc columns sql/ha_innodb.cc: Call row_lock_table_for_mysql() and row_unlock_table_for_mysql()
| | | * | | | | better followup fix for my_getopt (Argh!)unknown2004-04-301-7/+7
| | | | | | | |
View Lorry Controller Status