summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix for bug #13825 "Triggers: crash if release savepoint" and for generalunknown2005-11-197-14/+411
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling of savepoints in stored routines. Fixed ha_rollback_to_savepoint()/ha_savepoint()/ha_release_savepoint() functions to properly handle savepoints inside of stored functions and triggers. Also now when we invoke stored function or trigger we create new savepoint level. We destroy it at the end of function/trigger execution and return back to old savepoint level. mysql-test/r/sp_trans.result: Added test for bug #13825 "Triggers: crash if release savepoint" and for general handling of savepoints in stored routines. mysql-test/t/sp_trans.test: Added test for bug #13825 "Triggers: crash if release savepoint" and for general handling of savepoints in stored routines. sql/ha_innodb.cc: innobase_savepoint(): Replaced check which always failed due to similar check in caller with assertion. sql/handler.cc: ha_rollback_to_savepoint()/ha_savepoint()/ha_release_savepoint(): Changed functions to properly support handling of savepoints inside of stored functions and triggers. sql/sql_class.cc: THD::reset_sub_statement_state()/restore_sub_statement_state(): When we invoke stored function or trigger we should create new savepoint level. We should destroy it at the end of function/trigger execution and return back to old savepoint level. To support this behavior we should save and reset list of current savepoints on entering function and restore old list when we leave it. sql/sql_class.h: Sub_statement_state: When we invoke stored function or trigger we should create new savepoint level. We should destroy it at the end of function/trigger execution and return back to old savepoint level. To support this behavior added "savepoint" member which is used to save/restore list of current savepoints on entering/leaving function. sql/sql_parse.cc: mysql_execute_command(): Changed processing of SQLCOM_SAVEPOINT so now it is not ignored when we are in autocommit mode and savepoint is set inside of stored function or trigger.
* Merge bk-internal:/home/bk/mysql-5.0unknown2005-10-284-1/+18
|\ | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean sql/item_func.cc: Auto merged
| * Update test with changed result after mergeunknown2005-10-281-1/+1
| | | | | | | | | | mysql-test/r/type_newdecimal.result: Update result
| * Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-10-273-0/+17
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/t/func_math.test: Auto merged mysql-test/r/func_math.result: Resolve conflict sql/item_func.cc: Resolve conflict
| | * Merge mysql.com:/home/jimw/my/mysql-4.1-14009unknown2005-10-27101-1015/+1333
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean sql/item_func.cc: Auto merged
| | * | Fix Item_func_abs::fix_length_and_dec() to set maybe_null properly. (Bug #14009)unknown2005-10-173-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_math.result: Add new results mysql-test/t/func_math.test: Add new regression test sql/item_func.cc: Set maybe_null in Item_func_abs::fix_length_and_dec().
* | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-10-285-4/+75
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/pem/bug14256/mysql-5.0 mysql-test/r/view.result: Auto merged mysql-test/r/view_grant.result: Merge fix. mysql-test/t/view_grant.test: Merge fix.
| * | | | Fixed BUG#14256: definer in view definition is not fully qualifiedunknown2005-10-285-4/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the parser test for wildcards in hostname to checking for empty strings instead (analogous with the test in default_view_definer()), since wildcards do appear in the definer's host-part sometimes. mysql-test/r/view.result: Updated result. mysql-test/r/view_grant.result: Added test for BUG#14256. mysql-test/t/view.test: Changed test for explicit definer; wildcards in host are ok, empty host-part is not. mysql-test/t/view_grant.test: Added test for BUG#14256. sql/sql_yacc.yy: Changed test for wildcards in hostpart of explicit view definer to test for empty host part instead. (Analogous with sql_parse.cc:default_view_definer().)
* | | | | disabling archive_gisunknown2005-10-281-0/+1
| | | | |
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-10-284-10/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
| * \ \ \ \ Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-284-9/+49
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin server-tools/instance-manager/listener.cc: Auto merged
| | * | | | | fix Bug #14103 IM tests fail on SCOunknown2005-10-284-9/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/listener.cc: every new connection should have sufficient thread stack to handle all IM commands server-tools/instance-manager/manager.cc: change stack size of listener and guardian threads server-tools/instance-manager/priv.cc: Add a new function, which is a wrapper around pthread_create to increase the stack size server-tools/instance-manager/priv.h: declare new function
| * | | | | | fix a typounknown2005-10-281-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-10-2876-925/+894
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0 sql/item.cc: Auto merged sql/sql_update.cc: Auto merged
| * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-281-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
| | * | | | | Makefile.am:unknown2005-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added "base64.h" to enable "make dist" to work include/Makefile.am: Added "base64.h" to enable "make dist" to work
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-2875-924/+893
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
| | * | | | | Merge 4.1 - 5.0unknown2005-10-287-320/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/insert_select.result: Merge from 4.1 to 5.0. mysql-test/r/select.result: Merge from 4.1 to 5.0. mysql-test/t/insert_select.test: Merge from 4.1 to 5.0. mysys/my_handler.c: Merge from 4.1 to 5.0. sql/item.cc: Merge from 4.1 to 5.0. sql/item_timefunc.cc: Imported bug fix from 4.1 to 5.0. (Bug#14016) sql/item_timefunc.h: Imported bug fix from 4.1 to 5.0. (Bug#14016)
| | * | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1unknown2005-10-2774-923/+1163
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp heap/_check.c: Auto merged heap/hp_create.c: Auto merged include/config-netware.h: Auto merged include/my_base.h: Auto merged include/my_handler.h: Auto merged include/myisam.h: Auto merged innobase/include/Makefile.am: Auto merged myisam/mi_check.c: Auto merged myisam/mi_delete.c: Auto merged myisam/mi_rnext_same.c: Auto merged myisam/mi_search.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamdef.h: Auto merged myisam/sort.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/update.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/update.test: Auto merged mysys/my_getopt.c: Auto merged mysys/my_handler.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisam.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/records.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_select.cc: Auto merged sql/structs.h: Auto merged strings/conf_to_src.c: Auto merged strings/ctype-win1250ch.c: Auto merged Makefile.am: Merged from 4.1 myisam/myisamchk.c: Merged from 4.1 mysql-test/mysql-test-run.pl: Merged from 4.1 mysql-test/r/insert_select.result: Merged from 4.1 mysql-test/r/myisam.result: Merged from 4.1 mysql-test/r/select.result: Merged from 4.1 mysql-test/t/insert_select.test: Merged from 4.1 mysql-test/t/myisam.test: Merged from 4.1 netware/mysql_test_run.c: Merged from 4.1 sql/item.cc: Merged from 4.1 sql/mysqld.cc: Merged from 4.1 sql/sql_update.cc: Merged from 4.1 tests/mysql_client_test.c: Merged from 4.1
| | | * | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-274-1/+19
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/13855-bug-4.1-mysql
| | | | * | | | select.result:unknown2005-10-271-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fix mysql-test/r/select.result: After merge fix
| | | | * | | | Manually mergedunknown2005-10-274-1/+19
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/config-netware.h: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/select.result: Manually merged fix for bug#13855 mysql-test/t/select.test: Manuall merged fix for bug#13855
| | | | | * \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-10-252-1/+5
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.0
| | | | | | * | | | Imported fixes from 4.1 and 5.0 to 4.0.unknown2005-10-252-1/+5
| | | | | | | | | |
| | | | | * | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-threadunknown2005-10-252-9/+25
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.0
| | | | | * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-10-143-0/+18
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/13855-bug-4.0-mysql
| | | | | | * | | | | Fix bug #13855 select distinct with group by caused server crashunknown2005-10-143-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DISTINCT wasn't optimized away and caused creation of tmp table in wrong case. This result in integer overrun and running out of memory. Fix backported from 4.1. Now if optimizer founds that in result be only 1 row it removes distinct. sql/sql_select.cc: Fix bug #13855 select distinct with group by caused server crash mysql-test/r/select.result: Test case for bug#13855 select distinct with group by caused server crash mysql-test/t/select.test: Test case for bug#13855 select distinct with group by caused server crash
| | | | | * | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-10-131-4/+11
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| | | * | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-2733-654/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/dev/mysql-4.1-innobase
| | | | * | | | | | | Removed innobase/my_cnf, innobase/include/makefilewin.i,unknown2005-10-2633-654/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and innobase/*/makefilewin (which are unused now). BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2: Delete: innobase/include/makefilewin.i BitKeeper/deleted/.del-makefilewin~78000390c783b1c5: Delete: innobase/btr/makefilewin BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995: Delete: innobase/buf/makefilewin BitKeeper/deleted/.del-makefilewin~d37b6b303348c871: Delete: innobase/data/makefilewin BitKeeper/deleted/.del-makefilewin~5104767c73775697: Delete: innobase/dict/makefilewin BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f: Delete: innobase/dyn/makefilewin BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95: Delete: innobase/eval/makefilewin BitKeeper/deleted/.del-makefilewin~4d139e182457e553: Delete: innobase/fil/makefilewin BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73: Delete: innobase/fsp/makefilewin BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db: Delete: innobase/fut/makefilewin BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3: Delete: innobase/ha/makefilewin BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e: Delete: innobase/ibuf/makefilewin BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5: Delete: innobase/lock/makefilewin BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac: Delete: innobase/log/makefilewin BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0: Delete: innobase/mach/makefilewin BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db: Delete: innobase/mem/makefilewin BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8: Delete: innobase/mtr/makefilewin BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b: Delete: innobase/os/makefilewin BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5: Delete: innobase/page/makefilewin BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be: Delete: innobase/pars/makefilewin BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7: Delete: innobase/que/makefilewin BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365: Delete: innobase/read/makefilewin BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34: Delete: innobase/rem/makefilewin BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd: Delete: innobase/row/makefilewin BitKeeper/deleted/.del-makefilewin~63acd666293282a: Delete: innobase/srv/makefilewin BitKeeper/deleted/.del-makefilewin~13888739357b3025: Delete: innobase/sync/makefilewin BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb: Delete: innobase/thr/makefilewin BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de: Delete: innobase/trx/makefilewin BitKeeper/deleted/.del-makefilewin~72a64128bacce71b: Delete: innobase/usr/makefilewin BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79: Delete: innobase/ut/makefilewin BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd: Delete: innobase/makefilewin BitKeeper/deleted/.del-my_cnf~977f69858affc57b: Delete: innobase/my_cnf innobase/include/Makefile.am: Removed ref to Makefilewin.i (it is unused now).
| | | * | | | | | | | conf_to_src.c:unknown2005-10-271-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump MY_CS_CSSORT when it's necessary. strings/conf_to_src.c: Dump MY_CS_CSSORT when it's necessary.
| | | * | | | | | | | conf_to_src.c:unknown2005-10-271-26/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating to conform the current CHARSET_INFO structure. strings/conf_to_src.c: Updating to conform the current structure.
| | | * | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-273-34/+120
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b13347
| | | | * | | | | | | | Bug#13347: empty result from query with like and cp1250 charsetunknown2005-10-253-34/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ctype-win1250ch.c: Like range prefix tables were wrong. ctype_cp1250_ch.result, ctype_cp1250_ch.test: Adding test case. strings/ctype-win1250ch.c: Bug#13347: empty result from query with like and cp1250 charset Like range prefix tables were wrong. mysql-test/t/ctype_cp1250_ch.test: Adding test case. mysql-test/r/ctype_cp1250_ch.result: Adding test case.
| | | * | | | | | | | | Imported fix from 5.0.unknown2005-10-261-1/+1
| | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | mysql-test-run.pl:unknown2005-10-261-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added MTR_BUILD_THREAD to control the port range mysql-test/mysql-test-run.pl: Added MTR_BUILD_THREAD to control the port range
| | | * | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-2511-10/+85
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1
| | | | * \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-12925unknown2005-10-253-5/+24
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean tests/mysql_client_test.c: Auto merged
| | | | | * | | | | | | | Fix incorrect casts in my_getopt code that capped the maximum of longlongunknown2005-10-253-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options to the wrong value. (Bug #12925) mysql-test/t/mysql_client_test.test: Add parameter for testing getopt bug mysys/my_getopt.c: Remove incorrect and unnecessary casts tests/mysql_client_test.c: Add test case for Bug #12925 (my_getopt bug)
| | | | * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-253-0/+26
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/14016-bug-4.1-mysql
| | | | | * | | | | | | | | Fix bug #14016 date_format() 2nd parameter was compared using case insensitive unknown2005-10-253-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collation By default constant strings in second parameter of date_time() have case insensitive collation. Because of this expressions date_format(f,'%m') and date_format(f,'%M') wrongly becomes equal, which results in choosing wrong column to sort by. Now if second parameter of date_format() is constant then it's collation is changed to case sensitive. sql/item_timefunc.cc: Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation. If second parameter of date_format() is constant then it's collation is changed to case sensitive. mysql-test/r/date_formats.result: Test case for bug#14016 2nd parameter was compared using case insensitive collation mysql-test/t/date_formats.test: Test case for bug#14016 2nd parameter was compared using case insensitive collation
| | | | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-253-0/+27
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/13392-bug-4.1-mysql
| | | | | * | | | | | | | | | Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATEunknown2005-10-253-0/+27
| | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VALUES() can only refer to table insert going to. But Item_insert_value::fix_fields() were passing to it's arg full table list, This results in finding second column which shouldn't be found, and failing with error about ambiguous field. Item_insert_value::fix_fields() now passes only first table of full table list. sql/item.cc: Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation. If second parameter of date_format() is constant then it's collation is changed to case sensitive. mysql-test/r/insert_select.result: Test case for bug#14016 2nd parameter was compared using case insensitive collation mysql-test/t/insert_select.test: Test case for bug#14016 2nd parameter was compared using case insensitive collation
| | | | * | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-250-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| | | | | * | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-130-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1 scripts/make_binary_distribution.sh: Auto merged
| | | | | | * \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-130-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1 scripts/make_binary_distribution.sh: Auto merged
| | | | | | | * \ \ \ \ \ \ \ \ Merge mysql.com:/M41/clone-4.1-current into mysql.com:/M41/mysql-4.1unknown2005-10-1310-28/+2464
| | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/make_binary_distribution.sh: Auto merged
| | | | * | | | \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-252-5/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 myisam/mi_check.c: Auto merged
| | | | | * | | | | | | | | | | | Changed some dbug print options.unknown2005-10-252-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/mi_check.c: Changed print style for keyoffset. myisam/mi_delete.c: Changed print style for keypos.
| | | * | | | | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-threadunknown2005-10-252-17/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | / / / / | | | | | |_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1