summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* set_var.cc:unknown2003-04-231-6/+0
| | | | | | | | We don't need this code any more. It was used to initialize CONVERT structure in 4.0. sql/set_var.cc: We don't need this code any more. It was used to initialize CONVERT structure in 4.0.
* Variable names have been renamed:unknown2003-04-2313-117/+116
| | | | | | | | | | client_collation -> collation_client result_collation -> collation_results connection_collation -> collation_connection BitKeeper/etc/ignore: Added client/ssl_test to the ignore list
* Fix bug#68: ssl_test.c does not compile/workunknown2003-04-232-4/+5
|
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-04-236-13/+76
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1 mysql-test/r/subselect.result: Auto merged mysql-test/t/subselect.test: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * processing of subselect in global ORDER BY (fifed crash of server)unknown2003-03-116-13/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this implementation have limitation: prohibited subselect in ORDER BY dependence of most outer query (will be solved after removing passing first select_lex as fake select for global mysql_select()) mysql-test/r/subselect.result: test of subselect in global ORDER BY mysql-test/t/subselect.test: test of subselect in global ORDER BY sql/sql_lex.cc: fixed comments processing of subselect in global ORDER BY sql/sql_lex.h: processing of subselect in global ORDER BY sql/sql_parse.cc: processing of subselect in global ORDER BY sql/sql_yacc.yy: processing of subselect in global ORDER BY
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-04-238-10/+103
|\ \ | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1 sql/item_cmpfunc.cc: Auto merged
| * | fixed bug 185 (constant IN (SELECT field ...) do not return NULL correctly)unknown2003-04-238-10/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: new test results test of bug 185 mysql-test/t/subselect.test: test of bug 185 sql/item.h: new method sql/item_cmpfunc.cc: new Item to control NULL value in HAVING clouse sql/item_cmpfunc.h: new Item to control NULL value in HAVING clouse sql/item_subselect.cc: if IN was rewrited through WHERE thien it will be rewrited in following way: WHERE left_expr=item or is null(item) heving is_not_null_test(item) sql/item_subselect.h: Item_is_not_null_test can change was_null flag sql/sql_select.cc: some layout fix
* | | Added --delimiter option to mysqlunknown2003-04-232-38/+78
| | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Added --delimiter option to mysql. Statement terminator can be a character (';' by default) or a string. Code clean up
* | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2003-04-227-39/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1
| * | | small compress/uncompress modification after monty's reviewunknown2003-04-227-39/+43
| | | |
* | | | sql_base.cc:unknown2003-04-221-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Table name cache is case-sensitive now like in 4.0. sql/sql_base.cc: Table name cache is case-sensitive now like in 4.0.
* | | I renamed system variable literal_collation into connection_collationunknown2003-04-226-26/+26
| | |
* | | item_cmpfunc.cc:unknown2003-04-221-1/+1
|/ / | | | | | | | | | | | | | | Turbo() is not used anymore for multibyte charsets. sql/item_cmpfunc.cc: Turbo() is not used anymore for multibyte charsets.
* | my_vsnprintf.c:unknown2003-04-211-1/+1
| | | | | | | | | | | | | | | | The last character was not printed into out string strings/my_vsnprintf.c: The last character was not printed into out string
* | fixed bug in processing transaction in query cache (inserted lost lines)unknown2003-04-201-0/+9
| |
* | new result of Query Cache with Innodbunknown2003-04-171-2/+2
| |
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-04-178-37/+92
|\ \ | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
| * \ mergingunknown2003-04-168-37/+92
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_innodb.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged
| | * \ Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2003-02-188-37/+92
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1 mysql-test/r/innodb_cache.result: Auto merged sql/ha_berkeley.h: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/handler.cc: Auto merged sql/sql_cache.cc: Auto merged
| | | * | aftermerging fixunknown2003-02-181-2/+3
| | | | |
| | | * | mergingunknown2002-12-118-36/+90
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-bdb_cache.result: Delete: mysql-test/r/bdb_cache.result BitKeeper/deleted/.del-bdb_cache-master.opt: Delete: mysql-test/t/bdb_cache-master.opt BitKeeper/deleted/.del-bdb_cache.test: Delete: mysql-test/t/bdb_cache.test sql/ha_berkeley.h: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/handler.h: Auto merged sql/sql_cache.h: Auto merged
| | | | * | Fix to make working new innodb query cache beahaviourunknown2002-11-061-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix grammar Fix debuging methods to be workable with switched off query cache (2Heikki: it is for you) sql/sql_cache.cc: Fix to make working new innodb query cache beahaviour Fix grammar Fix debuging methods to be workable with switched off query cache
| | | | * | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2002-11-0611-27/+237
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1 sql/sql_cache.cc: Auto merged
| | | | | * | new innodb query cache behaviour (recommit because of problem with 4.1 ↵unknown2002-11-0311-27/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repository pushing) fixed bug in quqry cache dbd transaction processing mysql-test/r/innodb_cache.result: new innodb query cache behaviour sql/ha_berkeley.h: new innodb query cache behaviour sql/ha_innodb.cc: new innodb query cache behaviour sql/ha_innodb.h: new innodb query cache behaviour sql/handler.cc: new innodb query cache behaviour fixed bug in transaction support of bdb sql/handler.h: new innodb query cache behaviour sql/sql_cache.cc: new innodb query cache behaviour sql/sql_cache.h: new innodb query cache behaviour
* | | | | | | Added the missed OK packet status to internals.texiunknown2003-04-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/internals.texi: Added the missed OK packet status
* | | | | | | Fix to have a reserved OK byte (prepare result)unknown2003-04-162-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_prepare.cc: FFix to send a reserved OK byte on a prepared call
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-169-37/+680
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1 sql/sql_yacc.yy: Auto merged
| * | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-161-3/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
| | * | | | | | Bugfix for segfault in mysql with embedded libraryunknown2003-04-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/default.c: Fix for bug in mysql with embedded library we can get NULL in *argv
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-165-5/+642
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1 sql/lex.h: Auto merged sql/sql_yacc.yy: Auto merged
| | * | | | | | Add mysys specific error messagesunknown2003-04-165-5/+642
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make RELAY_THREAD and alias for IO_THREAD Added new interface for string -> (unsigned) long long. include/my_sys.h: Add mysys specific error messages sql/lex.h: Make RELAY_THREAD an alias for IO_THREAD sql/sql_yacc.yy: Make RELAY_THREAD an alias for IO_THREAD
| * | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-161-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
| | * | | | | | | Fix for bug #212unknown2003-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_list.h: Here we should reset item::last sometimes
| * | | | | | | | replace default separator in group_concat, correct a bugunknown2003-04-163-29/+31
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_gconcat.result: replace default separator sql/item_sum.h: add fix_length_and_dec() and copy_or_same() sql/sql_yacc.yy: replace default separator
* | | | | | | | Fix broken windows distribution workspace file (libmysql.dsp), which is ↵unknown2003-04-169-32/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Added the support of statement result navigation APIsunknown2003-04-162-15/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysql/libmysql.c: Added statement result set navigation APIs (buffered results only) include/mysql.h: Prototypes for new stmt result navigation APIs
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-1291-581/+1256
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1 sql/sql_class.h: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | | | | correct codes of warnings in result fileunknown2003-04-121-2/+2
| | | | | | | |
| * | | | | | | Exported functions claimed by MySQLCCunknown2003-04-111-0/+2
| | | | | | | |
| * | | | | | | - make sure to generate the BDB tags file, otherwise s_symlink will createunknown2003-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a lot of broken symlinks to the non-existing tags file (which magically causes the source distribution to grow about three times in size (most likely a bug in GNU tar - need to investigate if it still happens with recent versions)
| * | | | | | | For to use the /libmysql/libmysql.def file insteadunknown2003-04-101-117/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c: Delete: VC++Files/libmysql/libmysql.def
| * | | | | | | Mergeunknown2003-04-1038-24/+355
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0938-2/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysql_priv.h: added have_compress variable sql/mysqld.cc: added have_compress variable sql/set_var.cc: added have_compress variable
| * | | | | | | | Merge bk-internal:/home/bk/mysql-4.1unknown2003-04-097-2/+303
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
| | * | | | | | | | don't increment LAST_INSERT_ID() when incremented value cannot be stored in ↵unknown2003-03-313-2/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | auto_increment column (e.g. is too big) mysql-test/r/auto_increment.result: more tests mysql-test/t/auto_increment.test: more tests
| | * | | | | | | | ft benchmark suite: initial checkinunknown2003-03-294-0/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added myisam/ftbench/data myisam/ftbench/t to the ignore list
| * | | | | | | | | - bumped up version number to 4.1.1-alpha now that 4.0.1 has been taggedunknown2003-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - tagged ChangeSet@1.1529 as mysql-4.1.0
| * | | | | | | | | Use of CHARSWT_INFO *result_collationunknown2003-04-0810-77/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of bool convert_result_charset SET CHARACTER SET inststead of SET NAMES in tests
| * | | | | | | | | SET NAMES doesn't start recodingunknown2003-04-087-26/+27
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SET CHARACTER SET does
| * | | | | | | | A better fix for UNION and slow query log.unknown2003-04-081-27/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_union.cc: A better fix for UNION and slow query log. This patch also fixes some indentation issues