summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
Commit message (Collapse)AuthorAgeFilesLines
* A separate, better error message when it's impossible to aggregate strings ↵unknown2003-05-201-3/+12
| | | | for some operation
* Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344),unknown2003-05-131-0/+12
| | | | | | | | | | | | new test for this. sql/item_create.cc: Proper replication of CONNECTION_ID() (bug 177). This is just for replication; mysqlbinlog|mysql still does not work with CONNECTION_ID(), it will wait for row-level binlogging. sql/item_strfunc.cc: Proper replication of the new 4.1 PASSWORD() (bug 344)
* Mergeunknown2003-05-021-3/+4
|\ | | | | | | | | | | | | tests/ssl_test.c: Auto merged sql/item_strfunc.cc: Merge + removed wrong bug fix (?)
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-231-2/+4
| |\ | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1 sql/item_strfunc.cc: Auto merged
| | * Removed some not used filesunknown2003-04-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the 'fs' file systems as this is not maintained. Moved programs from client to tests tests/deadlock_test.c: Rename: div/deadlock_test.c -> tests/deadlock_test.c BitKeeper/deleted/.del-CorbaFS.idl~719ba9d93c206620: Delete: fs/CorbaFS.idl BitKeeper/deleted/.del-Makefile.am~95f21e278745904c: Delete: fs/Makefile.am BitKeeper/deleted/.del-RunServer.sh~34ea2653535fbb5c: Delete: fs/RunServer.sh BitKeeper/deleted/.del-database.c~af098622e818ce0d: Delete: fs/database.c BitKeeper/deleted/.del-dump.sql~68646092f0c5bc96: Delete: fs/dump.sql BitKeeper/deleted/.del-korbit-kernel-2.4.1-patch~742e5e67c1132b2e: Delete: fs/korbit-kernel-2.4.1-patch BitKeeper/deleted/.del-libmysqlfs.c~70cc07d61deedd16: Delete: fs/libmysqlfs.c BitKeeper/deleted/.del-libmysqlfs.h~7b60f308be50370e: Delete: fs/libmysqlfs.h BitKeeper/deleted/.del-my.cnf~bbd975fd6377e704: Delete: fs/my.cnf BitKeeper/deleted/.del-mysqlcorbafs.c~fc58c116eeea996a: Delete: fs/mysqlcorbafs.c BitKeeper/deleted/.del-mysqlcorbafs.h~414821d6836e655a: Delete: fs/mysqlcorbafs.h BitKeeper/deleted/.del-mysqlcorbafs_test.c~8bb3afa230542e05: Delete: fs/mysqlcorbafs_test.c BitKeeper/deleted/.del-README~b9f437fbd6dce7a5: Delete: fs/README BitKeeper/deleted/.del-mysqlfsck~247a2d2b9729b95e: Delete: fs/mysqlfsck tests/insert_test.c: Rename: client/insert_test.c -> tests/insert_test.c tests/list_test.c: Rename: client/list_test.c -> tests/list_test.c tests/select_test.c: Rename: client/select_test.c -> tests/select_test.c BitKeeper/deleted/.del-thimble.cc~3fa3754a4c639242: Delete: client/thimble.cc tests/thread_test.c: Rename: client/thread_test.c -> tests/thread_test.c tests/connect_test.c: Rename: client/connect_test.c -> tests/connect_test.c tests/showdb_test.c: Rename: client/showdb_test.c -> tests/showdb_test.c tests/ssl_test.c: Rename: client/ssl_test.c -> tests/ssl_test.c BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92: Delete: extra/mysql_install.c BitKeeper/deleted/.del-cache_manager.cc~c506b365b140d30c: Delete: sql/cache_manager.cc BitKeeper/deleted/.del-cache_manager.h~adb8639e510c6f6e: Delete: sql/cache_manager.h client/Makefile.am: Move insert_test, select_test and thread_test under 'tests' extra/Makefile.am: Remove not used program mysql_install sql/item_strfunc.cc: Simple optimization sql/item_sum.cc: Simple code cleanup. tests/Makefile.am: Added test programs
* | | Fixed bug in Item_func_compress::val_str() on MacOS X (bigendian); the lengthunknown2003-04-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was not properly stored in the buffer. sql/item_strfunc.cc: Made it work on MacOS X (bigendian) where int4store is a macro that expands the arguments several times. It's possible this should be done differently, like not side-stepping the String methods the way it's done here, or fixing String::c_ptr(), but this simple fix was the quickest way.
* | | merge fixunknown2003-04-261-18/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged
| * | | added '.' to end of compressed stringunknown2003-04-241-1/+10
| |/ /
| * | small compress/uncompress modification after monty's reviewunknown2003-04-221-24/+15
| |/
* | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-171-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/item.cc: Auto merged sql/item_strfunc.cc: Auto merged
| * Fix broken windows distribution workspace file (libmysql.dsp), which is ↵unknown2003-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | causing VC IDE to crash while loading Remove ctype_latin1_de.c from respective dsp files Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files VC++Files/libmysql/libmysql.dsp: Fix the broken file
* | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-141-0/+88
|\ \ | |/ | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/item_strfunc.cc: Auto merged
| * Mergeunknown2003-04-101-0/+88
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/lex.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged include/mysqld_error.h: merge. sql/share/czech/errmsg.txt: SCCS merged sql/share/danish/errmsg.txt: merge. sql/share/dutch/errmsg.txt: merge . sql/share/english/errmsg.txt: merge. sql/share/estonian/errmsg.txt: merge. sql/share/french/errmsg.txt: merge. sql/share/german/errmsg.txt: merge. sql/share/greek/errmsg.txt: merge. sql/share/hungarian/errmsg.txt: e merge. sql/share/italian/errmsg.txt: merge. sql/share/japanese/errmsg.txt: merge. sql/share/korean/errmsg.txt: merge. sql/share/norwegian/errmsg.txt: merge. sql/share/norwegian-ny/errmsg.txt: merge. sql/share/polish/errmsg.txt: merge. sql/share/portuguese/errmsg.txt: merge. sql/share/romanian/errmsg.txt: SCCS merged sql/share/russian/errmsg.txt: merge. sql/share/serbian/errmsg.txt: merge. sql/share/slovak/errmsg.txt: merge. sql/share/spanish/errmsg.txt: merge. sql/share/swedish/errmsg.txt: merge. sql/share/ukrainian/errmsg.txt: merge.
| | * added compress/uncompress functionunknown2003-04-091-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysql_priv.h: added have_compress variable sql/mysqld.cc: added have_compress variable sql/set_var.cc: added have_compress variable
* | | fix for a :unknown2003-04-091-1/+2
|/ / | | | | | | | | | | | | SELECT USER();
* | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-041-8/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp sql/item_strfunc.cc: Auto merged
| * | Fixed envelope() function.unknown2003-04-041-8/+9
| | |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-031-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1 BitKeeper/etc/logging_ok: auto-union sql/item_strfunc.cc: Auto merged sql/mysqld.cc: Auto merged
| * | Merge with 4.0unknown2003-04-031-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c: Auto merged BitKeeper/deleted/.del-mysql.xdc: Delete: netware/mysql.xdc BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716: Auto merged BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e: Auto merged BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9: Auto merged client/mysql.cc: Auto merged include/my_pthread.h: Auto merged libmysqld/examples/Makefile.am: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/t/backup.test: Auto merged mysql-test/t/myisam.test: Auto merged mysys/default.c: Auto merged mysys/my_init.c: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_mutex.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisam.cc: Auto merged sql/log.cc: Auto merged sql-bench/crash-me.sh: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_show.cc: Auto merged strings/my_vsnprintf.c: Auto merged sql/sql_parse.cc: Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave) mysql-test/r/rpl_loaddata.result: Auto merged
| | * | truncating REPLACE result bug fixunknown2003-03-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_str.result: test result for truncating REPLACE result mysql-test/t/func_str.test: test with long arguments for REPLACE sql/item_strfunc.cc: fix for counting REPLACE result length
* | | | AsWKB() function has been added.unknown2003-04-031-0/+21
|/ / /
* | | Better error messageunknown2003-04-011-9/+3
| | |
* | | small addition to fix of truncating in replaceunknown2003-03-281-1/+1
| | | | | | | | | | | | | | | sql/item_strfunc.cc: uint is better here
* | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-03-281-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.rpc sql/item_strfunc.cc: Auto merged
| * | | Fix of the #173 bugunknown2003-03-261-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | (Truncating of Replace result) sql/item_strfunc.cc: max_length for Replace function was counted in wrong way
* | | Merge with 4.0.13unknown2003-03-261-4/+10
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union myisam/sort.c: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/r/update.result: Auto merged mysql-test/t/bdb-crash.test: Auto merged mysql-test/t/group_by.test: Auto merged mysql-test/t/join_outer.test: Auto merged mysql-test/t/order_by.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/type_blob.test: Auto merged mysql-test/t/type_decimal.test: Auto merged mysql-test/t/type_ranges.test: Auto merged mysql-test/t/update.test: Auto merged sql-bench/crash-me.sh: Auto merged client/mysql.cc: Keep old code
| * Fix for #178 Replicating INSERT VALUES(USER()) crashes (SEGV) the slaveunknown2003-03-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | Now it does not SEGV, but USER() is still badly replicated (it is replicated to ""), which is a lower priority bug. sql/item_strfunc.cc: Fix for #178 Replicating INSERT VALUES(USER()) crashes (SEGV) the slave Now it does not SEGV, but USER() is still badly replicated (it is replicated to ""), which is a lower priority bug.
* | item_strfunc.cc:unknown2003-03-241-6/+11
| | | | | | | | | | | | | | | | | | | | Fixed that concat() didn't set character set in val_str concat_ws() now honors coercibility sql/item_strfunc.cc: Fixed that concat() didn't set character set in val_str concat_ws() now honors coercibility
* | item_strfunc.cc:unknown2003-03-241-1/+4
| | | | | | | | | | | | | | | | The result didn't return proper collation sql/item_strfunc.cc: The result didn't return proper collation
* | item_strfunc.cc:unknown2003-03-241-1/+13
| | | | | | | | | | | | | | | | | | | | A bug has been fixed. ELT() didn't honor the second argument. Coercibility support has been added. sql/item_strfunc.cc: A bug has been fixed. ELT() didn't honor the second argument. Coercibility support has been added.
* | All charset related actions have been moved from fix_fields() to ↵unknown2003-03-211-42/+7
| | | | | | | | fix_length_and_dec()
* | Produce an error when arguments are not compatible for CONCAT()unknown2003-03-191-2/+6
| |
* | Getting closer to be more SQL99 in dyadic operationsunknown2003-03-191-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ctype_collate.result: NO COLLATION has less coercibility than IMPLICIT and COERCIBLE sql/item.cc: Function to choose collation for dyadic operations sql/item.h: NO COLLATION has less coercibility than IMPLICIT and COERCIBLE sql/item_func.cc: Function to choose collation for dyadic operations sql/item_strfunc.cc: Function to choose collation for dyadic operations sql/item_strfunc.h: Use arg's attributes
* | SRID support.unknown2003-03-181-67/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GeomertyFromWKB() function. SRID() function. ::store() methods for Field_geom. Code cleanup. myisam/sp_key.c: SRID support. mysql-test/r/gis.result: We should use GeometryFromWKB(). mysql-test/t/gis.test: We should use GeometryFromWKB(). sql/field.cc: SRID support. ::store() methods for Field_geom. Code cleanup. sql/field.h: SRID support. ::store() methods for Field_geom. Code cleanup. sql/item_cmpfunc.cc: SRID support. Code cleanup. sql/item_create.cc: Code cleanup. sql/item_create.h: Code cleanup. sql/item_func.cc: SRID support. Code cleanup. sql/item_func.h: SRID support. sql/item_strfunc.cc: SRID support. GeometryFromWKB() function. Code cleanup. sql/item_strfunc.h: SRID support. GeometryFromWKB() function. Code cleanup. sql/lex.h: GeometryFromWKB() function. SRID() function. sql/spatial.cc: Code cleanup. sql/spatial.h: Code cleanup. sql/sql_yacc.yy: Fix for xxxFromText() functions. GeometryFromWKB() function.
* | mysql-test/t/ctype_many.test:unknown2003-03-171-53/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic client-server charset recoding has been added mysys/charset.c: Automatic client-server charset recoding has been added sql/item.cc: Automatic client-server charset recoding has been added sql/item.h: Automatic client-server charset recoding has been added sql/item_cmpfunc.cc: Automatic client-server charset recoding has been added sql/item_func.cc: Automatic client-server charset recoding has been added sql/item_strfunc.cc: Automatic client-server charset recoding has been added sql/mysqld.cc: Automatic client-server charset recoding has been added sql/protocol.cc: Automatic client-server charset recoding has been added sql/sql_string.cc: Automatic client-server charset recoding has been added sql/sql_yacc.yy: Automatic client-server charset recoding has been added strings/ctype-utf8.c: Automatic client-server charset recoding has been added
* | New function my_charset_same()unknown2003-03-161-1/+1
| | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | filesort.cc, sql_analyse.cc, item_func.cc, item_strfunc.cc, field.cc:unknown2003-03-131-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unnesessary binary() calls have been removed sql/field.cc: Unnesessary binary() calls have been removed sql/item_strfunc.cc: Unnesessary binary() calls have been removed sql/item_func.cc: Unnesessary binary() calls have been removed sql/sql_analyse.cc: Unnesessary binary() calls have been removed sql/filesort.cc: Unnesessary binary() calls have been removed
* | SELECT BINARY expr unknown2003-03-041-9/+27
| | | | | | | | | | | | | | | | is now synonim for SELECT expr COLLATE <expr_charset>_bin
* | Strings which appear without charset context, unknown2003-03-031-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | like number-to-string-convertion-result, now takes current database character set, instead of thread character set. This makes it easy to be SQL99 conformant and 4.0 compatible. Item->thd_charset() is renamed to Item->default_charset() as old name doesn't describe its nature anymore.
* | New error message for situation like:unknown2003-03-021-1/+10
| | | | | | | | | | | | | | SELECT latin1_expr COLLATE anpther_charset_collation
* | item_strfunc.cc:unknown2003-02-281-0/+1
| | | | | | | | | | | | | | | | Charset conversion function changes coercibility to IMPLICIT sql/item_strfunc.cc: Charset conversion function changes coercibility to IMPLICIT
* | sql_yacc.yy:unknown2003-02-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | _charset cast changes coercibility to implicit item_strfunc.cc: Collation cast change coercibility to EXPLICIT sql/item_strfunc.cc: Collation cast change coercibility to EXPLICIT sql/sql_yacc.yy: _charset cast changes coercibility to implicit
* | sql_yacc.yy, item_strfunc.cc:unknown2003-02-271-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Two separate functions charset() and collatio() item_strfunc.h: Two separate functions charset() and collation() sql/item_strfunc.cc: Two separate functions charset() and collatio() sql/item_strfunc.h: Two separate functions charset() and collation() sql/sql_yacc.yy: Two separate functions charset() and collatio()
* | item_strfunc.cc:unknown2003-02-131-2/+2
| | | | | | | | | | | | | | | | Fix sql/item_strfunc.cc: Fix
* | item_strfunc.cc:unknown2003-02-131-8/+8
| | | | | | | | | | | | | | | | Fix sql/item_strfunc.cc: Fix
* | Fixed a lot of wrong memory references as reported by valgrindunknown2003-02-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portability fixes Added new client function: mysql_get_server_version() New server help code (From Victor Vagin) Fixed wrong usage of binary() Disabled RTREE usage for now. BitKeeper/etc/ignore: added scripts/fill_help_tables.sql client/mysql.cc: Some fixes when using 'help' cmd-line-utils/libedit/compat.h: Portability fix cmd-line-utils/libedit/fgetln.c: Portability fix include/mysql.h: Added new client function: mysql_get_server_version() libmysql/libmysql.c: Added new client function: mysql_get_server_version() libmysqld/libmysqld.c: Fixed prototype mysql-test/install_test_db.sh: Added creation of help tables mysql-test/r/connect.result: Added help tables mysql-test/r/myisam.result: Test of RTREE index mysql-test/r/type_ranges.result: updated results mysql-test/t/myisam.test: Test of RTREE index mysql-test/t/type_ranges.test: Updated test mysys/charset.c: Indentation change mysys/my_symlink.c: Removed compiler warning scripts/fill_help_tables.sh: Update for new help tables sql/field.cc: Indentation changes sql/filesort.cc: Optimized character set usage sql/item_cmpfunc.cc: Fix wrong usage of binary() sql/item_cmpfunc.h: Fix wrong usage of binary() sql/item_func.cc: Fix wrong usage of binary() sql/item_func.h: Fix wrong usage of binary() sql/item_strfunc.cc: Fix wrong usage of binary() sql/item_sum.cc: Fix wrong usage of binary() sql/item_sum.h: Fix wrong usage of binary() sql/key.cc: Indentation change sql/lex.h: HELP -> HELP_SYM sql/mysql_priv.h: Make get_field() more general sql/password.c: Indentation change + variable initialisation moved sql/sql_acl.cc: Make get_field() more general sql/sql_base.cc: Added comments + assertion for double call to mysql_lock_tables sql/sql_cache.cc: Indentation changes sql/sql_class.h: Added need_strxnfrm to SORT_FIELD to be able to optimise character set handling in filesort sql/sql_derived.cc: Renamed variables sql/sql_help.cc: New help functions (from Victor Vagin) sql/sql_lex.cc: Removed variables that doesn't have to be initialized for each query sql/sql_lex.h: Removed not used variable (olap) sql/sql_parse.cc: Fixed (not fatal) access of unitialized memory Indentation / code cleanup sql/sql_prepare.cc: Indentaion cleanup sql/sql_table.cc: Disabled RTREE until 5.0 sql/sql_udf.cc: Make get_field() more general sql/sql_yacc.yy: Removed access to uninitialized memory Always set offset_limit and select_limit when using LIMIT (removed warnings) Allow usage of 'help week' sql/table.cc: Make get_field() more general More comments sql/table.h: Fixded type of TABLE_LIST->derived sql/time.cc: Stricter date / datetime handling (to be able to handle timestamps with days and microseconds) strings/ctype-bin.c: Added cha
* | After merge fixes & remove compiler warningsunknown2003-02-071-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added lengths for all MYSQL_FIELD string parameters Changed field length to 2 byte in .frm files configure.in: After merge fixes include/ft_global.h: Fixed copyright include/my_sys.h: Remove compiler warnings include/mysql.h: Added lengths for all MYSQL_FIELD string parameters include/mysql_com.h: Remove compiler warning myisam/ft_boolean_search.c: Removed compiler warnings myisam/ft_dump.c: Removed compiler warnings myisam/ft_stopwords.c: Copy file from MySQL 4.0 myisam/mi_delete.c: Fixed compiler warning myisam/sort.c: Indentation changes myisam/sp_test.c: Remove compiler warnings mysql-test/r/func_group.result: After merge fixes mysql-test/r/group_by.result: After merge fixes mysql-test/r/rpl_insert_id.result: After merge fixes mysql-test/r/rpl_master_pos_wait.result: After merge fixes mysql-test/t/rpl000009.test: After merge fixes mysql-test/t/rpl_insert_id.test: After merge fixes mysql-test/t/subselect.test: After merge fixes sql/item_cmpfunc.cc: After merge fixes sql/item_cmpfunc.h: After merge fixes sql/item_func.cc: After merge fixes sql/item_func.h: After merge fixes sql/item_strfunc.cc: After merge fixes sql/item_strfunc.h: After merge fixes sql/log.cc: After merge fixes sql/mysql_priv.h: After merge fixes sql/mysqld.cc: After merge fixes sql/sql_db.cc: After merge fixes sql/sql_handler.cc: After merge fixes sql/sql_parse.cc: After merge fixes sql/sql_show.cc: After merge fixes sql/sql_udf.cc: After merge fixes sql/table.cc: Changed field length to 2 byte in .frm files sql/unireg.cc: Changed field length to 2 byte in .frm files
* | Merge with 4.0.11unknown2003-02-041-0/+39
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union Makefile.am: Auto merged bdb/os/os_handle.c: Auto merged client/mysqladmin.c: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged extra/resolveip.c: Auto merged include/Makefile.am: Auto merged include/config-win.h: Auto merged include/my_base.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/os/os0file.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged libmysql/Makefile.am: Auto merged libmysql/Makefile.shared: Auto merged libmysql/manager.c: Auto merged libmysqld/libmysqld.c: Auto merged myisam/ft_static.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_test3.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/handler.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/backup.test: Auto merged mysql-test/t/bigint.test: Auto merged mysql-test/t/binary.test: Auto merged mysql-test/t/count_distinct.test: Auto merged mysql-test/t/func_crypt.test: Auto merged mysql-test/t/func_group.test: Auto merged mysql-test/t/grant_cache.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/rpl000015.test: Auto merged mysql-test/t/rpl000017.test: Auto merged mysys/default.c: Auto merged mysys/my_getwd.c: Auto merged mysys/my_init.c: Auto merged sql/Makefile.am: Auto merged sql/des_key_file.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/handler.cc: Auto merged sql/hostname.cc: Auto merged sql/item.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/lex.h: Auto merged sql/net_serv.cc: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_udf.cc: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql/share/english/errmsg.txt: Auto merged sql/table.cc: Auto merged Docs/manual.texi: Use remote version client/mysql.cc: Merge configure.in: Merge libmysql/libmysql.c: Merge libmysqld/lib_sql.cc: Merge myisam/ft_stopwords.c: Merge myisam/myisamchk.c: Merge mysql-test/r/bigint.result: Merge mysql-test/r/group_by.result: Merge mysql-test/r/rpl000009.result: Merge mysql-test/t/group_by.test: Merge mysql-test/t/rpl000009.test: Merge mysql-test/t/rpl_rotate_logs.test: Merge mysys/Makefile.am: Merge mysys/charset.c: Merge sql/item.h: Merge sql/item_cmpfunc.cc: Merge sql/item_cmpfunc.h: Merge sql/item_create.cc: Merge sql/item_func.cc: Merge sql/item_strfunc.h: Merge sql/log.cc: Merge sql/mysql_priv.h: Merge sql/mysqld.cc: Merge sql/protocol.cc: Merge sql/slave.cc: Merge sql/sql_class.h: Merge sql/sql_db.cc: Merge sql/sql_handler.cc: Merge sql/sql_parse.cc: Merge sql/sql_select.cc: Merge sql/sql_yacc.yy: Merge
| * merge with 3.23.56 to get patches for --lower-case-table-names andunknown2003-01-291-0/+39
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proper handling of SUM() in some functions. BitKeeper/etc/logging_ok: auto-union sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_show.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/group_by.result: merge with 3.23.56 mysql-test/t/group_by.test: merge with 3.23.56 sql/item_strfunc.h: merge with 3.23.56 sql/mysqld.cc: merge with 3.23.56 sql/sql_parse.cc: merge with 3.23.56 sql/sql_yacc.yy: merge with 3.23.56
| | * fixed functions to be able work with group function as argumentunknown2003-01-291-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | made bisone 1.75 compatible code mysql-test/r/group_by.result: test of function with agregate function inside mysql-test/t/group_by.test: test of function with agregate function inside sql/item_cmpfunc.cc: fixed functions to be able work with group function as argument sql/item_cmpfunc.h: fixed functions to be able work with group function as argument sql/item_func.cc: fixed functions to be able work with group function as argument sql/item_func.h: fixed functions to be able work with group function as argument sql/item_strfunc.cc: fixed functions to be able work with group function as argument sql/item_strfunc.h: fixed functions to be able work with group function as argument sql/sql_yacc.yy: made bisone 1.75 compatible code BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted