summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Cleaned up last bug fixesunknown2003-09-092-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fix bug in SHOW GRANTS when there is a column privilege but no table privilege include/mysql.h: Make server_inited external libmysqld/libmysqld.c: Remove reference to (wrong) external variable mysql-test/r/grant.result: Fixed up grant test to not user 'user1' or 'user2' Check for bug in SHOW GRANTS when there is a column privilege but no table privilege mysql-test/r/mix_innodb_myisam_binlog.result: Change to use tables t1 and t2 mysql-test/t/grant.test: Fixed up grant test to not user 'user1' or 'user2' Check for bug in SHOW GRANTS when there is a column privilege but no table privilege mysql-test/t/mix_innodb_myisam_binlog.test: Change to use tables t1 and t2 sql/sql_acl.cc: Fix bug in SHOW GRANTS when there is a column privilege but no table privilege sql/sql_parse.cc: Use HAVE_REPLICATION instead of EMBEDDED_LIBRARY
* fix for #1211unknown2003-09-081-0/+10
| | | | | | sql/sql_parse.cc: Replication's commands were allowed, but didn't have proper implementations for embedded library
* Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-09-051-3/+7
|\ | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0
| * Merge with 3.23unknown2003-09-051-3/+7
| |\
| | * bug #928 - arbitrary table grant was used, sort-order wasn't honoredunknown2003-09-021-3/+7
| | |
* | | Add QUICK as mysql-recover option in mysqld --helpunknown2003-09-051-1/+1
| | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | bug#926 fix undone - it caused suboptimal execution plan for "range ON, no ↵unknown2003-09-051-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | WHERE" query Another fix applied
* | | bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEYunknown2003-09-031-2/+2
|/ /
* | Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with ↵unknown2003-09-021-0/+3
| | | | | | | | BDB and an indexed column.
* | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-09-011-0/+6
|\ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | workaround for IN's special treatment of first argument. Not for 4.1unknown2003-09-011-0/+6
| | |
* | | removed stale commentunknown2003-08-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13:58 <monty> konstantin: the comment is missplaced (probably after merge). You can remove it sql/sql_parse.cc: removed stale comment BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-295-35/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| * | | Revert change of lower-case-table handling as this breaks how alias works.unknown2003-08-295-35/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes like this should be done to 4.1, not to a stable release mysql-test/r/lowercase_table.result: Revert change of lower-case-table handling mysql-test/t/lowercase_table.test: Revert change of lower-case-table handling sql/sql_class.cc: Revert change of lower-case-table handling sql/sql_class.h: Revert change of lower-case-table handling sql/sql_parse.cc: Revert change of lower-case-table handling sql/sql_table.cc: Revert change of lower-case-table handling sql/sql_yacc.yy: Revert change of lower-case-table handling
* | | | Merge jcole@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-281-32/+41
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0
| * | | opt_range.cc: Fixes for out of memory conditions.unknown2003-08-281-32/+41
| |/ / | | | | | | | | | | | | sql/opt_range.cc: Fixes for out of memory conditions.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-284-22/+36
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0 myisam/mi_dynrec.c: Auto merged mysql-test/r/isam.result: Auto merged
| * | Portability fixesunknown2003-08-284-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Removed not used functions myisam/mi_dynrec.c: Added assert to avoid compilation errors mysql-test/r/isam.result: Updated results after merge sql/log_event.cc: Cleanup sql/mysql_priv.h: Cleanup sql/sql_class.cc: Moved Table_ident functions to .cc file to allow them to use table_case_convert() sql/sql_class.h: Moved Table_ident functions to .cc file to allow them to use table_case_convert()
* | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-08-281-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | oom protectionunknown2003-08-281-3/+3
| | |
* | | Add detection of in_addr_tunknown2003-08-281-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pack_bits to pack_reclength for dynamic rows. This solves buffer a possible buffer overflow on update. (This will probably solve bug #563) Fix test for available file descriptors in mysqltest Fixed core dump bug in replication tests when running without transactional table support acconfig.h: Add detection of in_addr_t acinclude.m4: Add detection of in_addr_t configure.in: Add detection of in_addr_t extra/my_print_defaults.c: Cleanup extra/resolveip.c: Add detection of in_addr_t libmysql/dll.c: Fixed C++ commments myisam/mi_dynrec.c: Add ASSERT if allocated record length is to small myisam/mi_open.c: Add pack_bits to pack_reclength for dynamic rows. This solves buffer a possible buffer overflow on update. myisam/mi_test_all.sh: Added valgrind option to make it easier to verify tests mysql-test/include/check_var_limit.inc: Fix test for available file descriptors mysql-test/r/myisam.result: More tests mysql-test/t/myisam.test: More tests mysql-test/t/query_cache_merge.test: Fix test for available file descriptors mysys/default.c: Cleanup mysys/my_pthread.c: Remove C++ comments sql/log.cc: Code cleanup Fixed core dump bug in replication tests when running without transactional table support.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-272-37/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| * | | Updating translation for Spanish/Portuguese error messages filesunknown2003-08-272-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/share/portuguese/errmsg.txt: Updating Translation sql/share/spanish/errmsg.txt: Updating Translation
* | | | Fixed unlikely stack bug when having a BIG expression of type 1+1-1+1-1... ↵unknown2003-08-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in certain combinations. Bug #871 sql-bench/limits/mysql.cfg: Updated limits sql/item_cmpfunc.cc: Test for stack checking sql/item_func.cc: Test for stack checking
* | | | Add column names for metadata when running mysql with -Tunknown2003-08-272-2/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324 client/mysql.cc: Add column names for metadata when running with -T mysql-test/r/show_check.result: test case for bug fix mysql-test/t/show_check.test: test case for bug fix sql/item_sum.cc: Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324 sql/sql_load.cc: Removed not needed line
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-277-38/+66
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| * | vio ssl structure renames (to get rid of ending _)unknown2003-08-277-38/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added TCP/IP read/write timeout for windows Check on windows if second server is started with same TCP/IP port BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f: Delete: mysql-test/include/have_openssl_2.inc BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514: Delete: mysql-test/r/have_openssl_2.require BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8: Delete: mysql-test/t/openssl_2.test BitKeeper/etc/ignore: added libmysql/vio_priv.h libmysql_r/vio_priv.h client/mysql.cc: vio ssl structure renames include/violite.h: Cleanup violite.h interface (move things to vio_priv.h) libmysql/Makefile.am: Use vio_priv.h libmysql/Makefile.shared: Use vio_priv.h libmysqld/lib_vio.c: Added timeout for windows mysys/my_getopt.c: Indentaion cleanup sql/item_cmpfunc.cc: Remove compiler warnings sql/item_func.cc: Remove compiler warnings sql/mini_client.cc: vio ssl structure renames sql/mysqld.cc: Check on windows if second server is started with same TCP/IP port sql/net_serv.cc: Add read/write timeouts for windows sql/sql_acl.cc: vio ssl structure renames sql/sql_show.cc: vio ssl structure renames vio/vio.c: Added timeouts for windows vio/viosocket.c: Added timeouts for windows vio/viossl.c: Added timeouts for windows Cleaned up structure element names vio/viosslfactories.c: Added timeouts for windows Cleaned up structure element names
* | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-252-7/+30
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * | comments about mutexes in replication.unknown2003-08-252-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't start the SQL slave thread with SQL_BIG_SELECTS; it's better to inhibate max_join_size instead. sql/slave.cc: OPTION_BIG_SELECTS does more than ignoring max_join_size (talks to the optimiser), just ignore max_join_size. sql/slave.h: comments
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-255-34/+89
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0 sql/log_event.cc: Auto merged
| * | Clearer states in SHOW PROCESSLIST for replication threads.unknown2003-08-254-22/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example the Binlog_dump thread (on the master) sometimes showed "Slave:". And there were confusing messages where "binlog" was employed instead of "relay log". sql/log.cc: MYSQL_LOG::wait_for_update() is used by the binlog_dump and I/Oslave threads, and it updates thd->proc_info, so we need a bool to not show the same proc_info for 2 different things (previously we showed "Slave: etc" and that's bad for a binlog_dump thread). sql/slave.cc: Clearer thd-proc_info for slave threads. sql/sql_class.h: prototype change sql/sql_repl.cc: clearer thd->proc_info for binlog_dump thread
| * | The slave threads MUST not care about max_join_size, we start them withunknown2003-08-231-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OPTION_BIG_SELECTS. sql/slave.cc: The slave threads MUST not care about max_join_size. I can imagine the case of a slave where users can connect and do SELECTs, but DBA does not want them to issue crazy SELECTs, but he/she still wants replication to work. Before, this just printed a warning to the error log (not fatal) but that was still annoying.
| * | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-232-8/+43
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | * | * Fix for a potential bug:unknown2003-08-232-8/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the SQL thread stops, set rli->inside_transaction to 0. This is needed if the user later restarts replication from a completely different place where there are only autocommit statements. * Detect the case where the master died while flushing the binlog cache to the binlog and stop with error. Cannot add a testcase for this in 4.0 (I tested it manually) as the slave always runs with --skip-innodb. sql/log_event.cc: Detect the case where the master died while flushing the binlog cache to the binlog: in that case, we have a BEGIN with no COMMIT/ROLLBACK in the relay log; we detect this with rli->inside_transaction in Rotate_log_event::exec_event() (which is the only right place to detect this, see comments). When we see it, we stop with error. In 4.1, I had put code in Start_log_event::exec_event(); I'll remove it next time I push in the 4.1 tree. sql/slave.cc: * Use slave_print_error instead of sql_print_error, to put the info in SHOW SLAVE STATUS too. * Fix for a potential bug: when the SQL thread stops, set rli->inside_transaction to 0. This is not needed if replication later restarts from the same position; but this is needed if the user restarts replication from a completely different place where there are only autocommit statements (in that case, if we didn't set to 0, the position would never increment in SHOW SLAVE STATUS, even if queries are processed well).
* | | | Better fix for myisamchk --sort-index on windowsunknown2003-08-252-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed deadlock bug when doing resize of key buffer while key buffer was in active use myisam/mi_locking.c: Better fix for myisamchk --sort-index on windows mysql-test/r/symlink.result: Update results mysql-test/t/symlink.test: Update results mysys/mf_keycache.c: Fixed deadlock bug when doing resize of key buffer while key buffer was in active use sql/ha_myisam.cc: simple optimization sql/sql_show.cc: Fixed theoretical buffer overrun Reset variable properly before calling update_create_info()
* | | | Update of VC++ project files (to remove link warnings)unknown2003-08-252-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unlock error in myisamchk on windows when doing --sort-index Use SetFilePointer instead of SetFilePointerEx VC++Files/client/mysql.dsp: Update of project files VC++Files/client/mysqladmin.dsp: Update of project files VC++Files/client/mysqlclient.dsp: Update of project files VC++Files/client/mysqldump.dsp: Update of project files VC++Files/client/mysqlimport.dsp: Update of project files VC++Files/client/mysqlshow.dsp: Update of project files VC++Files/comp_err/comp_err.dsp: Update of project files VC++Files/innobase/innobase.dsp: Update of project files VC++Files/isamchk/isamchk.dsp: Update of project files VC++Files/libmysql/libmysql.dsp: Update of project files VC++Files/libmysqld/libmysqld.dsp: Update of project files VC++Files/libmysqltest/myTest.dsp: Update of project files VC++Files/my_print_defaults/my_print_defaults.dsp: Update of project files VC++Files/myisamlog/myisamlog.dsp: Update of project files VC++Files/mysql.dsw: Update of project files VC++Files/mysqlbinlog/mysqlbinlog.dsp: Update of project files VC++Files/mysqlcheck/mysqlcheck.dsp: Update of project files VC++Files/mysqldemb/mysqldemb.dsp: Update of project files VC++Files/mysqlmanager/MySqlManager.dsp: Update of project files VC++Files/mysqlserver/mysqlserver.dsp: Update of project files VC++Files/mysqlshutdown/mysqlshutdown.dsp: Update of project files VC++Files/mysys/mysys.dsp: Update of project files VC++Files/pack_isam/pack_isam.dsp: Update of project files VC++Files/perror/perror.dsp: Update of project files VC++Files/replace/replace.dsp: Update of project files VC++Files/sql/mysqld.dsp: Update of project files VC++Files/test1/test1.dsp: Update of project files VC++Files/thr_test/thr_test.dsp: Update of project files VC++Files/vio/vio.dsp: Update of project files VC++Files/zlib/zlib.dsp: Update of project files myisam/mi_check.c: Fix unlock error in myisamchk on windows when doing --sort-index myisam/mi_locking.c: Fix unlock error in myisamchk on windows when doing --sort-index myisam/myisamchk.c: New comment mysys/my_chsize.c: Use SetFilePointer instead of SetFilePointerEx, as the first is more portable sql/handler.cc: Fix compiler warning sql/log_event.cc: Fix compiler warning
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-234-39/+65
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0 sql/mysql_priv.h: Auto merged sql/sql_table.cc: Auto merged
| * | | show symlinked directories in SHOW CREATE TABLEunknown2003-08-234-39/+65
| | | |
* | | | After merge fixesunknown2003-08-2235-468/+862
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_test.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/t/func_test.test: Auto merged mysql-test/t/grant.test: Auto merged sql/ha_innodb.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-226-16/+105
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | * | 2 minor edits, plusunknown2003-08-226-16/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning" and fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog". Now we don't always write the non-trans update immediately to the binlog; if there is something in the binlog cache we write it to the binlog cache (because the non-trans update could depend on a trans table which was modified earlier in the transaction); then in case of ROLLBACK, we write the binlog cache to the binlog, wrapped with BEGIN/ROLLBACK. This guarantees that the slave does the same updates. For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated, we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog (because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO SAVEPOINT in the binlog. Apart from this rare case of updates of mixed table types in transaction, the usual way is still clear the binlog cache at ROLLBACK, or chop it at ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which is fine). Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM". client/mysqldump.c: Minor edit: one CHANGE MASTER with 2 arguments instead of 2 CHANGE MASTER with one argument each. mysql-test/r/rpl_loaddata.result: result update mysql-test/t/rpl_loaddata.test: minor edit: simplifying the test. sql/handler.cc: Fix for BUG#873. See comments in code, and the description of the changeset. sql/log.cc: * Previously, if a query updated a non-transactional table we wrote it immediately to the real binlog. This causes a bug when the update is done inside a transaction and uses the content of an updated transactional table (because this makes a wrong order of queries in the binlog). So if the binlog cache is not empty, we write the query to the binlog cache; otherwise we can write it to the binlog. * Previously, when we flushed the binlog cache to the binlog, we wrapped it with BEGIN/COMMIT. Now it's also possible to wrap it with BEGIN/ROLLBACK, to handle transactions which update both transactional and non-transactional tables. sql/log_event.cc: The slave thread can leave a transaction if COMMIT or if ROLLBACK. sql/sql_class.h: prototype sql/sql_insert.cc: Fix for BUG#1113: this was because the INSERT SELECT code did not set OPTION_STATUS_NO_TRANS_UPDATE. sql/sql_parse.cc: Don't send ER_WARNING_NOT_COMPLETE_ROLLBACK if this is the SQL slave thread (see comments).
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-223-3/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0 client/mysqltest.c: Auto merged sql/sql_load.cc: Auto merged
| | * | | Move test that uses many tables (in query_cache.test) to separate test so ↵unknown2003-08-223-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that we can get it 'skipped' instead of 'failed' on system where we can't open many files. client/mysqltest.c: Fix that LET can be used with queries that return multiple columns libmysql/errmsg.c: Extend socket name to 100 characters in error messages libmysql/libmysql.c: Reset some variables to make ensure that we can call mysql_server_init()/mysql_server_end() many times mysql-test/mysql-test-run.sh: Set open-files-limit to 1024 mysql-test/r/loaddata.result: Add test case for LOAD DATA bug report (was not a bug) mysql-test/r/query_cache.result: Move test with many tables to separate test mysql-test/r/select_safe.result: Make test repeatable mysql-test/t/loaddata.test: Add test case for LOAD DATA bug report (was not a bug) mysql-test/t/query_cache.test: Move test with many tables to separate test mysql-test/t/select_safe.test: Make test repeatable sql/field.cc: Portability fix for gcc 3.3 sql/mysqld.cc: Store in open_files_limit the true number of files we can open (if system supports it) sql/sql_load.cc: Safety fix
| * | | | mergedunknown2003-08-213-36/+42
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | extra/resolveip.c: Auto merged sql/item.cc: Auto merged
| | * | | Bug #1064: SHOW CREATE TABLE: avoid allocations for simple tables, old ↵unknown2003-08-212-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client compatibility sql/item.h: fixups sql/sql_show.cc: avoid allocations for simple tables old client compatibility
| | * | | fix for SHOW CREATE TABLE to report corerct second field's lengthunknown2003-08-212-36/+39
| | | | |
| * | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-08-2120-177/+254
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | * | | Yesterday I removed process_io_create_file; I shouldn't have.unknown2003-08-211-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's say the lack of comments did not help me ;) Copying it back again and adding comments; now 3.23->4.0 replication of LOAD DATA INFILE works again. sql/slave.cc: Enabling again process_io_create_file
| | * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-08-206-152/+59
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0 sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/slave.cc: Auto merged
| | | * | First commit for fixing BUG#1100unknown2003-08-206-152/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "LOAD DATA INFILE is badly filtered by binlog-*-db rules". There will probably be a second final one to merge Dmitri's changes to rpl_log.result and mine. 2 new tests: rpl_loaddata_rule_m : test of logging of LOAD DATA INFILE when the master has binlog-*-db rules, rpl_loaddata_rule_s : test of logging of LOAD DATA INFILE when the slave has binlog-*-db rules and --log-slave-updates. mysql-test/r/rpl_loaddata.result: Test that logging of LOAD DATA INFILE is done on the slave mysql-test/t/rpl_loaddata.test: Test that logging of LOAD DATA is done on the slave sql/log.cc: debug info sql/log_event.cc: * Append_block, Exec_load and Delete_file now have a member 'db' like Create_file. This member is filled by mysql_load(). It is used for filtering by binlog-*-db rules, that's all. It's not written to the binlog, and so can't be read from the binlog. In other words, that's temporary info which is stored in the event and lost when it is written and deleted. * Better error messages in Append_block et al. events. * The slave now logs (log-slave-updates) the Create_file et al. events in mysql_load() (they are not directly copied from the events in the relay log, because this prevented filtering by binlog-*-db rules). Before, mysql_load() in the slave did no logging, now it does the logging, as in any regular thread. sql/log_event.h: New member 'db' for Append_block et al. events. sql/slave.cc: Removed useless code. Why was it useless: - CREATE_FILE_EVENT is not defined in 3.23. It appeared in 4.0. - in queue_old_event(), which is called only if the master is 3.23, we had a case CREATE_FILE_EVENT: so this case can be removed. - this case was the only caller of process_io_create_file() so this function can be removed. sql/sql_load.cc: Pass the db to events, so that they can be well filtered. sql/sql_repl.cc: Pass the db to events so that they can be well filtered.
View Lorry Controller Status