summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Bug#12920 - key_read_requests counter appears to re-setunknown2005-09-144-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fix. include/keycache.h: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Status variables moved into KEY_CACHE in 4.1. Enlarging them there. include/my_sys.h: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Status variables moved into KEY_CACHE in 4.1. Removed unused global variables. myisam/mi_test2.c: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Status variables moved into KEY_CACHE in 4.1. Changed to print default key cache status. mysys/mf_keycache.c: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Status variables moved into KEY_CACHE in 4.1. Changed their debug printout. sql/mysqld.cc: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Changed to print full value. sql/sql_show.cc: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Added a branch for long long values. sql/sql_test.cc: Bug#12920 - key_read_requests counter appears to re-set After merge fix. changed to print full values. sql/structs.h: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Added a branch for long long keycache values.
* Merge mysql.com:/home/mydev/mysql-4.0-4000unknown2005-09-131-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100 configure.in: Auto merged include/my_global.h: Auto merged sql/sql_base.cc: Auto merged
| * Bug#12845 - Stress test: Server crashes on CREATE .. SELECT statementunknown2005-09-131-0/+7
| | | | | | | | | | | | | | | | | | | | Solution for 4.0 and 4.1. If the caller cannot re-open table(s), it gives a NULL 'refresh' argument to open_table(). We used to ignore flushes then. Now we ignore drops too.
* | Merged code. Removed unneccessary repeating.unknown2005-09-131-10/+8
| |
* | Merge bk-internal:/home/bk/mysql-4.1unknown2005-09-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * \ Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-121-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#05588-mysql-4.1 include/my_global.h: Auto merged
| | * \ Merge selena.:H:/MYSQL/src/#05588-mysql-4.0unknown2005-09-071-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#05588-mysql-4.1 BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220: Auto merged BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged include/violite.h: Auto merged sql/net_serv.cc: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged include/my_global.h: SCCS merged
| | | * Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-09-062-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#05588-mysql-4.0
| | | | * Fixes bug #5588. vio_was_interrupted() function was added to detectunknown2005-08-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read timeout properly on win32. include/my_global.h: Added win32 specific socket timeout error code. include/violite.h: Added vio_was_interrupted function that returns true if operation was not completed due to timeout. sql/mini_client.cc: added a check that replication read was not completed due to timeout. sql/net_serv.cc: net->last_errno should be equal to ER_NET_READ_INTERRUPTED in case if read operation was not completed due to timeout. vio/vio.c: added initialization code for vio_was_interrupted() function. vio/viosocket.c: Added vio_was_interrupted function that returns true if operation was not completed due to timeout.
* | | | | Merge mysqldev@production.mysql.com:jimw/mysql-4.1-scounknown2005-09-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean configure.in: Auto merged include/my_pthread.h: Auto merged sql/examples/ha_archive.cc: Auto merged
| * | | | When first creating the ARZ file for an archive table, use "wb" as the mode forunknown2005-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gzdopen() because the file itself was only opened for writing (and truncated), and some libc implementations (like SCO) don't like to do a fdopen(..., "a") on a fd that was not opened using O_APPEND. sql/examples/ha_archive.cc: Use "wb" instead of "ab" since we just opened this file for writing
| * | | | Last minor things to finish MySQL 4.1.10a:unknown2005-04-012-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - some wordings, - RPM packaging improvements. configure.in: Set the version string. scripts/mysql_create_system_tables.sh: Security change: Reduce the risk caused by predefined anonymous logins. sql/mysqld.cc: Correct a message text; align variable order with other versions. sql/sql_udf.cc: Fix an erroneous takeover of 4.0 wording. support-files/mysql.spec.sh: Fix date formatting, add missing change descriptions.
| * | | | after merge fixesunknown2005-03-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally contained in 2005/03/03 23:57:48+01:00 serg@serg.mylan; contained in MySQL 4.1.10a; re-committed for archival purposes. sql/sql_udf.cc: after merge fixes
| * | | | typos fixedunknown2005-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally contained in 2005/03/03 23:10:23+01:00 serg@serg.mylan; contained in MySQL 4.1.10a; re-committed for archival purposes. sql/mysqld.cc: typos fixed
| * | | | uninit variable fixedunknown2005-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally contained in 2005/03/03 21:13:33+01:00 serg@serg.mylan; contained in MySQL 4.1.10a; re-committed for archival purposes. sql/ha_myisam.cc: uninit variable fixed
| * | | | Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)unknown2005-03-316-44/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally contained in 2005/03/03 19:51:29+01:00 serg@serg.mylan; contained in MySQL 4.1.10a; re-committed for archival purposes. include/my_global.h: O_NOFOLLOW isam/create.c: create table files with O_EXCL|O_NOFOLLOW merge/mrg_create.c: create table files with O_EXCL|O_NOFOLLOW myisam/mi_create.c: create files of temporary tables with O_EXCL|O_NOFOLLOW myisammrg/myrg_create.c: create table files with O_EXCL|O_NOFOLLOW mysys/mf_tempfile.c: create temporary files with O_EXCL|O_NOFOLLOW sql/ha_myisam.cc: let mi_create know if the table is TEMPORARY sql/mysql_priv.h: --allow_suspicious_udfs sql/mysqld.cc: --allow_suspicious_udfs sql/share/english/errmsg.txt: typo sql/sql_udf.cc: --allow_suspicious_udfs don't allow xxx() udf without any of xxx_init/deinit/add/reset check paths when loading from mysql.func sql/table.cc: create frm of temporary table with O_EXCL|O_NOFOLLOW
* | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-123-14/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
| * | | | | Review fixes since last pullunknown2005-09-123-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug #13025; Server crash in filesort because wrong call to handler::position() client/mysqltest.c: Code cleanup during review mysql-test/r/innodb.result: Added test case for bug #13025; Server crash in filesort because wrong call to handler::position() mysql-test/t/innodb.test: Added test case for bug #13025; Server crash in filesort because wrong call to handler::position() sql/filesort.cc: Don't call handler::position() if row was not found sql/item_cmpfunc.cc: Indentation changes sql/sql_select.cc: Moved variable to outer level
* | | | | | Fix for bug #6008: MySQL does not create warnings when creating database and ↵unknown2005-09-122-13/+21
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using IF NOT EXISTS produce warning for 'create database if not exists' if database exists do not update database options in this case produce warning for 'create table if not exists' if table exists mysql-test/r/create.result: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS updated test case result mysql-test/r/temp_table.result: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS updated test case result mysql-test/r/warnings.result: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS updated test case result mysql-test/t/create.test: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS test case sql/sql_db.cc: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS produce warning for 'create database if not exists' if database exists do not update database options in this case sql/sql_table.cc: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS produce warning for 'create table if not exists' if table exists
* | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-111-3/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
| * | | | | Removed redundant reset_one_shot_variables callsunknown2005-09-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_parse.cc: Optimization, this reset is executed below anyway
* | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-091-5/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
| * | | | | Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field ↵unknown2005-09-091-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type Added test case.
* | | | | | Merge mysql.com:/home/alexi/mysql-4.1unknown2005-09-091-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/dev/mysql-4.1-12101
| * | | | | BUG #12101: Additional fix.unknown2005-09-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_cmpfunc.cc: Modified Item_func_between::print(), Item_func_in::print(). Item_func_between/in objects represent now [NOT]BETWEEN/IN expressions.
* | | | | | Bug#12817 SHOW STATUS now blob fieldsunknown2005-09-092-41/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is cancellation of ChangeSet 1.2329 05/07/12 08:35:30 reggie@linux.site +8 -0 Bug 7142 Show Fields from fails using Borland's dbExpress interface The reason is we can't fix bug#7142 without breaking of existing applications/APIs that worked fine with earlier 4.1 bug 7142 is fixed in 5.0 mysql-test/r/ps_1general.result: Bug #12817 SHOW STATUS now blob fields mysql-test/r/ps_2myisam.result: Bug #12817 SHOW STATUS now blob fields mysql-test/r/ps_3innodb.result: Bug #12817 SHOW STATUS now blob fields mysql-test/r/ps_4heap.result: Bug #12817 SHOW STATUS now blob fields mysql-test/r/ps_5merge.result: Bug #12817 SHOW STATUS now blob fields sql/item.cc: Bug #12817 SHOW STATUS now blob fields sql/sql_show.cc: Bug #12817 SHOW STATUS now blob fields tests/mysql_client_test.c: Bug #12817 SHOW STATUS now blob fields
* | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-09-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * \ \ \ \ \ Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-09-081-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/item_cmpfunc.h: Auto merged
| | * | | | | | BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cacheunknown2005-09-081-1/+1
| | | | | | | |
* | | | | | | | sql_select.cc:unknown2005-09-081-3/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug #12885. Forced inheritence of the maybe_null flag for the expressions containing GROUP BY attributes in selects with ROLLUP. olap.test, olap.result: Added test case for bug #12885. mysql-test/r/olap.result: Added test case for bug #12885. mysql-test/t/olap.test: Added test case for bug #12885. sql/sql_select.cc: Fixed bug #12885. Forced inheritence of the maybe_null flag for the expressions containing GROUP BY attributes in selects with ROLLUP.
* | | | | | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-081-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#12517-mysql-4.1
| * | | | | | | Fixes bug #12517. Clear user variables and replication events before unknown2005-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closing temp tables in thread cleanup. mysql-test/r/connect.result: added results for test of bug #12517 mysql-test/t/connect.test: added test of bug #12517 sql/sql_class.cc: Clear user variables and replication events before closing temp tables in thread cleanup.
* | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-09-076-35/+258
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 mysql-test/r/func_gconcat.result: Auto merged mysql-test/t/func_gconcat.test: Auto merged sql/item_sum.cc: Auto merged
| * | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-071-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/mysql-4.1
| | * | | | | | | Small tweak for random read performance (we shouldn't always tell the OS ↵unknown2005-09-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that we will be doing a linear scan). sql/examples/ha_tina.cc: Small tweak for random read performance.
| * | | | | | | | Merge mysql.com:/home/alexi/mysql-4.1unknown2005-09-074-32/+218
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/dev/mysql-4.1-0 sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged
| | * | | | | | | item_cmpfunc.h:unknown2005-09-064-32/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bugs #12101, #12102: wrong calculation of not_null_tables() for some expressions. The classes Item_func_between, Item_func_if, Item_func_in are modified. Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions. The class Item_func_opt_neg is added to factor out the functionality common for the modified classes Item_func_between and Item_func_in. item_cmpfunc.cc: Fixed bugs #12101, #12102: wrong calculation of not_null_tables() for some expressions. Added Item_func_between::fix_fields(), Item_func_if::fix_fields(), Item_func_in::fix_fields(). They correct generic calculation of the not_null_tables attribute when it is needed. Modified Item_func_between::val_int(), Item_func_in::val_int(). opt_range.cc: Fixed bugs #12101, #12102: wrong calculation of not_null_tables() for some expressions. The function get_mm_tree() is modified. There cannot be NOT before BETWEEN/IN anymore. Rather Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions. sql_yacc.yy: Fixed bugs #12101, #12102: wrong calculation of not_null_tables() for some expressions. Item_func_between/in objects can represent now [NOT]BETWEEN/IN expresions. join_outer.result: Fixed some testcases results (bugs #12101, #12102) join_outer.test: Added testcases for bugs #12101, #12102 mysql-test/t/join_outer.test: Added testcases for bugs #12101, #12102 mysql-test/r/join_outer.result: Fixed some testcases results (bugs #12101, #12102) sql/sql_yacc.yy: Fixed bugs #12101, #12102: wrong calculation of not_null_tables() for some expressions. Item_func_between/in objects can represent now [NOT]BETWEEN/IN expresions. sql/opt_range.cc: Fixed bugs #12101, #12102: wrong calculation of not_null_tables() for some expressions. The function get_mm_tree() is modified. There cannot be NOT before BETWEEN/IN anymore. Rather Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions. sql/item_cmpfunc.cc: Fixed bugs #12101, #12102: wrong calculation of not_null_tables() for some expressions. Added Item_func_between::fix_fields(), Item_func_if::fix_fields(), Item_func_in::fix_fields(). They correct generic calculation of the not_null_tables attribute when it is needed. Modified Item_func_between::val_int(), Item_func_in::val_int(). sql/item_cmpfunc.h: Fixed bugs #12101, #12102: wrong calculation of not_null_tables() for some expressions. The classes Item_func_between, Item_func_if, Item_func_in are modified. Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions. The class Item_func_opt_neg is added to factor out the functionality common for the modified classes Item_func_between and Item_func_in.
| * | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-072-2/+37
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b12611
| | * | | | | | | func_like.result, func_like.test:unknown2005-09-061-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding test case. item_cmpfunc.cc: Bug#12611 ESCAPE + LIKE do not work when the escape char is a multibyte one Additional fix for 8bit character sets: escape character must be converted into operation character set. sql/item_cmpfunc.cc: Bug#12611 ESCAPE + LIKE do not work when the escape char is a multibyte one Additional fix for 8bit character sets: escape character must be converted into operation character set. mysql-test/t/func_like.test: adding test case. mysql-test/r/func_like.result: adding test case.
| | * | | | | | | item_cmpfunc.h:unknown2005-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 12611 : ESCAPE + LIKE do not work when the escape char is a multibyte one Forgot to commit this file in the previous changeset, together with other files. sql/item_cmpfunc.h: Bug 12611 : ESCAPE + LIKE do not work when the escape char is a multibyte one Forgot to commit this file in the previous changeset, together with other files.
| | * | | | | | | Bug#12611: ESCAPE + LIKE do not work when the escape char is a multibyte oneunknown2005-08-311-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | item_cmpfunc.cc: Pass unicode value as "escape" argument to my_wildcmp if a multibyte character set is used. For single byte character set nothing has changed: native (non-unicode) character code is still passed. ctype_utf8.result, ctype_utf8.test: adding test case sql/item_cmpfunc.cc: Bug#12611: ESCAPE + LIKE do not work when the escape char is a multibyte one Pass unicode code instead of native code as "escape" argument to my_wildcmp. mysql-test/t/ctype_utf8.test: adding test mysql-test/r/ctype_utf8.result: adding test
| * | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-071-0/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b12829 mysql-test/r/func_gconcat.result: Auto merged mysql-test/t/func_gconcat.test: Auto merged sql/item_sum.cc: Auto merged
| | * | | | | | | Bug #12829unknown2005-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cannot convert the charset of a GROUP_CONCAT result: item_sum.cc: "result" character set was not set into proper value. func_gconcat.result, func_gconcat.test: Fixing tests accordingly. sql/item_sum.cc: Bug #12829 Cannot convert the charset of a GROUP_CONCAT result: "result" character set was not set into proper value. mysql-test/t/func_gconcat.test: Bug #12829 mysql-test/r/func_gconcat.result: Bug #12829
* | | | | | | | | func_gconcat.result, func_gconcat.test:unknown2005-09-062-3/+6
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test cases for bug #12863. item_sum.cc, item_sum.h: Fixed bug #12863. Added a flag to Item_func_group_concat set to FALSE after concatenation of the first element of a group. sql/item_sum.h: Fixed bug #12863. Added a flag to Item_func_group_concat set to FALSE after concatenation of the first element of a group. sql/item_sum.cc: Fixed bug #12863. Added a flag to Item_func_group_concat set to FALSE after concatenation of the first element of a group. mysql-test/t/func_gconcat.test: Added test cases for bug #12863. mysql-test/r/func_gconcat.result: Added test cases for bug #12863.
* | | | | | | | Merge eherman@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-062-21/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/eric/bktmp/mysql-4.1 sql/sql_parse.cc: Auto merged
| * | | | | | | | Backport of JimW's localhost patch to 4.1 tree.unknown2005-09-022-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle systems like default FC4 where 127.0.0.1 doesn't always map to 'localhost' first. (Bug #11822) sql/hostname.cc: Short-circuit ip_to_hostname() lookup for INADDR_LOOPBACK to allways return 'localhost'. sql/sql_parse.cc: Push special handling of 127.0.0.1 into ip_to_hostname().
* | | | | | | | | postmerge fixunknown2005-09-061-0/+1
| | | | | | | | |
* | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-09-063-36/+85
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| * \ \ \ \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0unknown2005-09-063-36/+85
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 sql/mysql_priv.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged configure.in: merge mysql-test/r/fulltext_var.result: merge sql/mysqld.cc: merge sql/set_var.cc: merge
| | * | | | | | | | support of concurent query cache resizing (BUG#12848)unknown2005-09-064-36/+86
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysql_priv.h: initialisation moved to mysqld.cc sql/mysqld.cc: initialisation moved to mysqld.cc sql/sql_cache.cc: support of concurent query cache resizing: - resizing made atomic - check stack size after each quard mutex lock sql/sql_cache.h: initialisation moved to mysqld.cc removed uneed parameter (now it is always under guard mutex protection or called from destruction)