summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-4.1-8731bunknown2005-10-121-32/+5
|\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean configure.in: Auto merged sql/mysqld.cc: Auto merged
| * Fix wait_timeout (and kill) handling on Mac OS X by cleaning up howunknown2005-10-111-32/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signal handlers are set up, the blocking flags for sockets are set, and which thread-related functions are used. (Bug #8731) configure.in: Fix flags for Darwin 6 and later. Simplify Darwin 7-9 blocks to simply be a catch-all for *darwin* so that future Darwin releases get the latest flags. include/config-win.h: Define my_sigset() instead of sigset(). include/my_pthread.h: Define my_sigset() instead of trying to monkey with sigset(), and favor an implementation based on sigaction(). mysys/my_pthread.c: Remove pthread_signal(), which is identical to the new my_sigset() macro. mysys/thr_alarm.c: Use my_sigset() instead of sigset(). sql/mysqld.cc: Use my_sigset() instead of signal() and sigset(), remove unnecessary definition of sigset on __amiga__. Remove unused THREAD_SPECIFIC_SIGPIPE code. A future improvement would be to re-assess the use of sigaction() here and convert its usage to use my_sigset(). vio/vio.c: Always call fcntl() to initialize flags of socket in initialization to avoid problems on systems that don't report the flags on a socket correctly right after it has been returned from accept(), such as FreeBSD, Mac OS X, and possibly other BSD-derived systems. vio/viosocket.c: If fcntl() fails in vio_blocking(), restore the flags stored in the vio struct. mysql-test/r/wait_timeout.result: New BitKeeper file ``mysql-test/r/wait_timeout.result'' mysql-test/t/wait_timeout-master.opt: New BitKeeper file ``mysql-test/t/wait_timeout-master.opt'' mysql-test/t/wait_timeout.test: New BitKeeper file ``mysql-test/t/wait_timeout.test''
* | Merge mysql.com:/home/jimw/my/mysql-4.1-13344unknown2005-10-121-0/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean mysql-test/r/cast.result: Auto merged mysql-test/t/cast.test: Auto merged sql/item.h: Auto merged
| * | Fix CAST(1.0e+300 TO SIGNED). (Bug #13344)unknown2005-09-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/cast.result: Update results mysql-test/t/cast.test: Add regression test sql/item.h: Cap Item_real::val_int() to LONGLONG_MIN and LONGLONG_MAX.
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-13619unknown2005-10-121-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * | | Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619)unknown2005-10-061-1/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_crypt.result: Add new results mysql-test/t/func_crypt.test: Add new regression test sql/item_strfunc.cc: Handle NULL result from call to crypt().
* | | mergeunknown2005-10-127-115/+162
|\ \ \
| * | | sql_yacc.yy:unknown2005-10-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #10308: Parse 'purge master logs' with subselect correctly. subselect.test: Bug #10308: Test for 'purge master logs' with subselect. subselect.result: Bug #10308: Test result for 'purge master logs' with subselect. mysql-test/r/subselect.result: Bug #10308: Test result for 'purge master logs' with subselect. mysql-test/t/subselect.test: Bug #10308: Test for 'purge master logs' with subselect. sql/sql_yacc.yy: Bug #10308: Parse 'purge master logs' with subselect correctly.
| * | | Fix for bug#9270 multiple SSL race conditions (for 5.0 tree)unknown2005-10-111-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix is needed to perform locking on shared data structures This is modification of patch proposed by Leandro Santi (see http://webs.sinectis.com.ar/lesanti/misc/mysql-4.0.23a-openssl_locking.patch) sql/mysqld.cc: Fix for bug#9270 multiple SSL race conditions (for 5.0 tree) The fix is needed to perform locking on shared data structures
| * | | Added missing HAVE_REPLICATION defineunknown2005-10-101-1/+3
| | | |
| * | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2005-10-101-2/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.13372 sql/item.cc: Auto merged
| | * | | additional fix to the bug #13372 (decimal union)unknown2005-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/type_float.result: test result fixed sql/item.cc: we have to limit the max_length
| | * | | Fix for bug #13372 (decimal union)unknown2005-09-271-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/type_decimal.result: test result fixed mysql-test/r/type_float.result: test result fixed mysql-test/t/type_decimal.test: test case added mysql-test/t/type_float.test: test case added sql/item.cc: Fixed counting of the max_length for the REAL_RESULT
| * | | | BUG#12618: Removing fake lockingunknown2005-10-102-85/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/rpl_multi_update3.result: New test case mysql-test/t/rpl_multi_update3.test: New test case sql/sql_parse.cc: Removed fake locking Changed so that filtering is done later for multi-update Removed redundant code sql/sql_update.cc: Moved call to sql_parse.cc
| * | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-10-081-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"unknown2005-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't allow STOP SLAVE if global read lock is in taken
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-071-22/+11
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * | | | Review of new code since last pullunknown2005-10-071-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use %lx instead of %p as %p is not portable - Don't replace ROW item with Item_null myisam/mi_rkey.c: Use %lx instead of %p as %p is not portable myisam/mi_search.c: Use %lx instead of %p as %p is not portable mysql-test/r/select.result: More test for ROW comparison mysql-test/t/select.test: More test for ROW comparison sql/item.cc: We can't replace a ROW item with Item_null because: - Arg_comparator is still using the orignal row items and it's not good to have args[0] different from what is actually compared - If we are using the <=> comparator, NULL can still be compared as true - We would break things if we would ever use resolve_const_item() for operators like >, < etc.
| * | | | | Mergeunknown2005-10-061-1/+1
| |\ \ \ \ \
| | * | | | | Many files:unknown2005-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New VC7 project files des_key_file.cc: Visual C++ wants '"' for local include mysql.cc: Cast my_cgets() argument for VC6 and VC7 dummy.cpp: Added to convince VS .Net generate a lib for mysqlserver VC++Files/mysqlserver/dummy.cpp: Added to convince VS .Net generate a lib for mysqlserver VC++Files/bdb/bdb.vcproj: New VC7 project files VC++Files/client/mysql.vcproj: New VC7 project files VC++Files/client/mysqladmin.vcproj: New VC7 project files VC++Files/client/mysqlclient.vcproj: New VC7 project files VC++Files/client/mysqldump.vcproj: New VC7 project files VC++Files/client/mysqlimport.vcproj: New VC7 project files VC++Files/client/mysqlshow.vcproj: New VC7 project files VC++Files/client/mysqltest.vcproj: New VC7 project files VC++Files/comp_err/comp_err.vcproj: New VC7 project files VC++Files/dbug/dbug.vcproj: New VC7 project files VC++Files/heap/heap.vcproj: New VC7 project files VC++Files/innobase/innobase.vcproj: New VC7 project files VC++Files/libmysql/libmysql.vcproj: New VC7 project files VC++Files/libmysqld/examples/test_libmysqld.vcproj: New VC7 project files VC++Files/libmysqld/libmysqld.vcproj: New VC7 project files VC++Files/libmysqltest/myTest.vcproj: New VC7 project files VC++Files/my_print_defaults/my_print_defaults.vcproj: New VC7 project files VC++Files/myisam/myisam.vcproj: New VC7 project files VC++Files/myisam_ftdump/myisam_ftdump.vcproj: New VC7 project files VC++Files/myisamchk/myisamchk.vcproj: New VC7 project files VC++Files/myisamlog/myisamlog.vcproj: New VC7 project files VC++Files/myisammrg/myisammrg.vcproj: New VC7 project files VC++Files/myisampack/myisampack.vcproj: New VC7 project files VC++Files/mysql-test/mysql_test_run_new.vcproj: New VC7 project files VC++Files/mysql.sln: New VC7 project files VC++Files/mysqlbinlog/mysqlbinlog.vcproj: New VC7 project files VC++Files/mysqlcheck/mysqlcheck.vcproj: New VC7 project files VC++Files/mysqldemb/mysqldemb.vcproj: New VC7 project files VC++Files/mysqlserver/mysqlserver.vcproj: New VC7 project files VC++Files/mysys/mysys.vcproj: New VC7 project files VC++Files/perror/perror.vcproj: New VC7 project files VC++Files/regex/regex.vcproj: New VC7 project files VC++Files/replace/replace.vcproj: New VC7 project files VC++Files/sql/mysqld.vcproj: New VC7 project files VC++Files/strings/strings.vcproj: New VC7 project files VC++Files/test1/test1.vcproj: New VC7 project files VC++Files/tests/mysql_client_test.vcproj: New VC7 project files VC++Files/thr_test/thr_test.vcproj: New VC7 project files VC++Files/vio/vio.vcproj: New VC7 project files VC++Files/zlib/zlib.vcproj: New VC7 project files client/mysql.cc: Cast my_cgets() argument for VC6 and VC7 sql/des_key_file.cc: Visual C++ wants '"' for local include scripts/make_win_src_distribution.sh: New VC7 project files
| * | | | | | item_cmpfunc.cc:unknown2005-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong variable. sql/item_cmpfunc.cc: Wrong variable.
| * | | | | | item_cmpfunc.cc:unknown2005-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong variable. sql/item_cmpfunc.cc: wrong variable.
| * | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-051-2/+3
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b13046
| | * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-291-2/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b13046 sql/item_cmpfunc.cc: Auto merged
| | | * \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-281-2/+3
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b13046
| | | | * \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-231-2/+3
| | | | |\ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b13046
| | | | | * | | | Bug#13046: LIKE pattern matching using prefixunknown2005-09-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index doesn't return correct result item_cmpfunc.cc: Use charset of LIKE to decide whether to use 8bit or Unicode "escape" value. But use charset of "escape" to scan escape character. strings/ctype-xxx.c: We cannot reduce "end" pointer using charpos(), because of possible escape characters in the string. Limit the loop using count of written characters instead. ctype_like_escape.inc: new file mysql-test/t/ctype_xxx: mysql-test/r/ctype_xxx: Adding test case. strings/ctype-big5.c: Bug#13046: LIKE pattern matching using prefix index doesn't return correct result We cannot change "end" pointer using charpos(), because of possible escape characters. Use limit by count of written characters instead. strings/ctype-cp932.c: Bug#13046: LIKE pattern matching using prefix index doesn't return correct result We cannot change "end" pointer using charpos(), because of possible escape characters. Use limit by count of written characters instead strings/ctype-gbk.c: Bug#13046: LIKE pattern matching using prefix index doesn't return correct result We cannot change "end" pointer using charpos(), because of possible escape characters. Use limit by count of written characters instead strings/ctype-mb.c: Bug#13046: LIKE pattern matching using prefix index doesn't return correct result We cannot change "end" pointer using charpos(), because of possible escape characters. Use limit by count of written characters instead strings/ctype-simple.c: Bug#13046: LIKE pattern matching using prefix index doesn't return correct result We cannot change "end" pointer using charpos(), because of possible escape characters. Use limit by count of written characters instead strings/ctype-sjis.c: Bug#13046: LIKE pattern matching using prefix index doesn't return correct result We cannot change "end" pointer using charpos(), because of possible escape characters. Use limit by count of written characters instead strings/ctype-tis620.c: Bug#13046: LIKE pattern matching using prefix index doesn't return correct result We cannot change "end" pointer using charpos(), because of possible escape characters. Use limit by count of written characters instead strings/ctype-ucs2.c: Bug#13046: LIKE pattern matching using prefix index doesn't return correct result We cannot change "end" pointer using charpos(), because of possible escape characters. Use limit by count of written characters instead mysql-test/t/ctype_big5.test: Adding test case. mysql-test/t/ctype_cp932.test: Adding test case. mysql-test/t/ctype_gbk.test: Adding test case. mysql-test/t/ctype_latin1.test: Adding test case. mysql-test/t/ctype_sjis.test: Adding test case. mysql-test/t/ctype_tis620.test: Adding test case. mysql-test/t/ctype_uca.test: Adding test case. mysql-test/t/ctype_ucs.test: Adding test case. mysql-test/t/ctype_ujis.test: Adding test case. mysql-test/t/ctype_utf8.test: Adding test case. mysql-test/r/ctype_big5.result: Adding test case. mysql-test/r/ctype_cp932.result: Adding test case. mysql-test/r/ctype_gbk.result: Adding test case. mysql-test/r/ctype_latin1.result: Adding test case. mysql-test/r/ctype_sjis.result: Adding test case. mysql-test/r/ctype_tis620.result: Adding test case. mysql-test/r/ctype_uca.result: Adding test case. mysql-test/r/ctype_ucs.result: Adding test case. mysql-test/r/ctype_ujis.result: Adding test case. mysql-test/r/ctype_utf8.result: Adding test case. sql/item_cmpfunc.cc: More fixes.
* | | | | | | | | Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in ↵unknown2005-10-125-41/+174
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slave.cc; in short we now record whenever the slave I/O thread ignores a master's event because of its server id, and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored* executed one, which may not be the last of the master's binlog (and so the slave *looks* behind the master though it's data-wise it's not). mysql-test/t/rpl_dual_pos_advance-master.opt: empty; its goal is just to trigger a server restart after running the test, so that the master forgets that it was a slave (otherwise it affects the following tests). sql/log.cc: No more default arguments for Rotate_log_event constructor. MYSQL_LOG::appendv() is now called without mutex. sql/log_event.cc: Moving one Rotate_log_event constructor from log_event.h. Support for on-demand choice of duplicating the string argument of the constructor or not (because there now are needs for both alternatives, see slave.cc). sql/log_event.h: We now have a case where a Rotate_log_event is executed by the slave SQL thread while not being in the relay log, so it needs to pretend its length is 0: a ZERO_LEN flag for that; a flag DUP_NAME (replaces "bool alloced") to be able to choose if we want the constructor to duplicate the string argument or not. sql/slave.cc: A comment for BUG#13861 (to be fixed). llstr() instead of %ld as the number is ulonglong. mi->rli becomes rli in some places. Fix for BUG#13023: - in the slave I/O thread, whenever we ignore an event because of its server id we update a couple of coordinates in memory - in the slave SQL thread, whenever we bump into the end of the latest relay log, we check this couple of coordinates to see if we should advance our Exec_master_log_pos. - when the slave I/O thread terminates it saves these in-memory coordinates into a Rotate event in the relay log, so that they are durable. sql/slave.h: A couple of coordinates in RELAY_LOG_INFO to keep track of the last ignored events received by the slave I/O thread (ignored because of the server id). mysql-test/r/rpl_dual_pos_advance.result: New BitKeeper file ``mysql-test/r/rpl_dual_pos_advance.result'' mysql-test/t/rpl_dual_pos_advance.test: Test for BUG#13023 (with a part, disabled, to test BUG#13861 when I fix it). Before the fix, this test used to hang.
* | | | | | | | Merge hundin.mysql.fi:/home/marko/mysql-4.0unknown2005-10-031-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1 (Bug #13002) sql/ha_innodb.cc: Merged
| * | | | | | | | InnoDB: Display an error message in /* */ commentsunknown2005-10-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in SHOW CREATE TABLE if a temporary file cannot be created. (Bug #13002) sql/ha_innodb.cc: ha_innobase::get_foreign_key_create_info(): Display an error message to the user if a temporary file cannot be created.
| * | | | | | | | Bug#12920 - key_read_requests counter appears to re-setunknown2005-09-142-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enlarged the counter variables to ulonglong.
* | | | | | | | | InnoDB: After review fixunknown2005-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_innodb.cc: Avoid bitwise arithmetics, as it might be difficult to read. The added readability costs one register and two instructions on x86.
* | | | | | | | | InnoDB: On UPDATE, trim UCS2 columns correctly. (Bug #12178)unknown2005-09-301-10/+30
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_innodb.cc: innobase_convert_and_store_changed_col(), calc_row_difference(): Replace parameter "is_unsigned" with "prtype". innobase_convert_and_store_changed_col(): When trimming spaces, note that UCS2 spaces are 0x0020, not 0x20.
* | | | | | | | Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_incrementunknown2005-09-291-4/+6
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "CHARACTER SET", "COLLATE", and "DEFAULT" are always printed(excepting MODE_MYSQL323 and MODE_MYSQL40) "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only if NO_FIELD_OPTIONS is not set. mysql-test/r/sql_mode.result: Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment test case mysql-test/t/sql_mode.test: Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment test case
* | | | | | | Many files:unknown2005-09-293-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. my_regex.h: Rename: regex/regex.h -> regex/my_regex.h client/mysqltest.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. os2/MySQL-Source.icc: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/Makefile.am: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/debug.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/debug.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/engine.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/engine.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/main.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/main.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regcomp.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regerror.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regerror.ih: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/my_regex.h: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regexec.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/regfree.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. regex/reginit.c: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. sql/item_cmpfunc.cc: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. sql/item_cmpfunc.h: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib. sql/mysqld.cc: Prefix regex functions/types with "my_" as our library is not compatible with normal regex lib.
* | | | | | | Fixed a bug checksum table locks the InnoDB table and does not use aunknown2005-09-281-0/+7
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent read (Bug #12669). mysql-test/r/innodb.result: Added test results for a checksum test. mysql-test/t/innodb.test: Added test case for a checksum bug #12669. sql/ha_innodb.cc: Use consistent read for checksum table and convert MySQL lock type to the TL_READ because at the moment MySQL uses TL_READ_NO_INSERT.
* | | | | | Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.unknown2005-09-281-0/+29
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolve_const_item() assumed to be not called for Item_row items. For ensuring that DBUG_ASSERT(0) was set there. This patch adds section for Item_row items. If it can it recursively calls resolve_const_item() for each item the Item_row contains. If any of the contained items is null then whole Item_row substitued by Item_null. Otherwise it just returns. sql/item.cc: Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items. Added section to resolve_const_item() for Item_row items. If it can it recursively calls resolve_const_item() for each item the Item_row contains. If any of the contained items is null then Item_row is substituted by Item_null. Otherwise it just returns. Comment moved closer to function it belongs to. mysql-test/t/select.test: Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items. mysql-test/r/select.result: Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.
* | | | | Fixed gcc error on AMD64: cast from 'char*' to 'unsigned int' loses precisionunknown2005-09-261-2/+2
| | | | |
* | | | | Fixed error found during review of new pushed codeunknown2005-09-256-16/+16
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Don't use c_ptr() for cgets() and ensure buffer is not overwritten mysql-test/r/cast.result: More test for CAST(0x.... as signed) sql/opt_sum.cc: Fix bugs found during review - Changed code to be able to remove one if - Ensure that count == 0 only if is_exact_count == TRUE sql/sql_delete.cc: Ensure 'allow_sum_func' is reset before call to setup_conds sql/sql_lex.cc: allow_sum_func doesn't have to be reset for each query (It's to be reset in setup_fields() or before call to setup_conds() sql/sql_load.cc: Move set of auto_increment_field_not_null so that it's not set if field value is NULL sql/sql_prepare.cc: allow_sum_func doesn't have to be reset for each query (It's to be reset in setup_fields() or before call to setup_conds() sql/sql_update.cc: Ensure 'allow_sum_func' is reset before call to setup_conds
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-249-42/+102
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-242-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug13419
| | * | | | BUG#12232: Addressing docs team feedback: s/inequal/unequal/unknown2005-09-242-5/+5
| | | | | |
| | * | | | mysqld.cc:unknown2005-09-231-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix out-of-order status variable. sql/mysqld.cc: Fix out-of-order status variable.
| * | | | Fix for BUG#13419: In "ref" optimizer, take into account that ↵unknown2005-09-231-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | item=Item_func_in(x,y) is not equivalent to "x=y" when item->negated == TRUE. mysql-test/r/func_in.result: Testcase for BUG#13419 mysql-test/t/func_in.test: Testcase for BUG#13419 sql/sql_select.cc: Fix for BUG#13419: * Take into account that item=Item_func_in(x,y) is not equivalent to "x=y" when item->negated == TRUE. * Removed comment that is no longer true.
| * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-221-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.1.b11553
| | * | | Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO settingunknown2005-09-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set auto_increment_field_not_null to true to preserve zero values for autoincrement fields during LOAD DATA execution if NO_AUTO_VALUE_ON_ZERO sql mode is set mysql-test/r/loaddata.result: Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting test case mysql-test/t/loaddata.test: Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting test case
| * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-221-4/+20
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.1.b11553 sql/sql_yacc.yy: Auto merged
| | * | | a fix (#11553: gives error if aggregate user-defined function in HAVING clause).unknown2005-09-221-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_yacc.yy: a fix (#11553: gives error if aggregate user-defined function in HAVING clause). udf_sum_expr_list rule introduced and used for aggregate udf functions: - call inc_in_sum_expr() before udf_expr_list parsing (as in_sum_expr rule does).
| * | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-222-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/13180-bug-4.1-mysql
| | * | | | Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing.unknown2005-09-222-0/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thd->allow_sum_func was left 'true' after previous statement thus allowing sum funcs to be present in conditions. thd->allow_sum_func should be set to 0 for each query and each prepared statement reinitialization. This is done in lex_start() and reset_stmt_for_execute(). sql/sql_lex.cc: Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing. thd->allow_sum_func is set to 0 in lex_start(). sql/sql_prepare.cc: Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing. thd->allow_sum_func is set to 0 in reset_stmt_for_execute(). mysql-test/t/update.test: Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query processing. mysql-test/r/update.result: Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query processing.
View Lorry Controller Status