summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Moved spatial functions to the sql/item_geofunc.cc file.unknown2003-05-3012-1053/+1018
| | | | | BitKeeper/etc/ignore: Added libmysqld/item_geofunc.cc to the ignore list
* Merge mysql.r18.ru:/usr/home/bk/mysql-4.1unknown2003-05-301-2/+2
|\ | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.1.latest
| * Fix for the bug #537 (UDF example broken on 4.1).unknown2003-05-301-2/+2
| |
* | new version of helpunknown2003-05-2913-931/+1653
|/
* manual types casting to satisfy gcc 3.2.1 compilerunknown2003-05-281-2/+2
|
* CAST(expr AS char) now supports character set with conversion:unknown2003-05-285-14/+41
| | | | | | | SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)
* ctype-win1250ch.c:unknown2003-05-281-1/+1
| | | | | | | | bug #521 fix: ('3'='4') was true in cp1250_czech_ci strings/ctype-win1250ch.c: bug #521 fix: ('3'='4') was true in cp1250_czech_ci
* --with-collation argument for configure. Now one can for example use this:unknown2003-05-288-14/+178
| | | | | | | ./configure --with-charset=latin1 --with-collation=latin1_danish_ci
* ctype-win1250ch.c:unknown2003-05-281-6/+7
| | | | | | | | ifdef wrong structure has been fixed strings/ctype-win1250ch.c: ifdef wrong structure has been fixed
* "mysql" now sends client character set to server.unknown2003-05-283-1/+12
|
* after-review fixunknown2003-05-281-44/+45
|
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-05-283-13/+49
|\ | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| * fixed priority checking bug in sub select handlingunknown2003-05-283-13/+49
| | | | | | | | | | | | | | mysql-test/r/subselect.result: fixed subselect test mysql-test/t/subselect.test: fixed subselect test
* | - removed all traces of internals.texi from Docs/Makefile.am to avoidunknown2003-05-271-48/+0
| | | | | | | | | | | | | | | | compile problems Docs/Makefile.am: - removed all traces of internals.texi to avoid compile problems
* | ORDER BY optimizationunknown2003-05-277-20/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed new bug when reading field types client/mysql.cc: Fixed output for -T libmysql/libmysql.c: Filled missing fields in new MYSQL_FIELD structure Fixed new bug when reading field types mysql-test/r/order_by.result: Result after new order by optimization sql/opt_range.cc: New ORDER BY optimization sql/opt_range.h: New ORDER BY optimization sql/set_var.cc: Speed optimization sql/sql_select.cc: New ORDER BY optimization This alllows MySQL to change a ref/range index from (a,b) to (a,c) when 'b' was not used to find rows and one did ORDER BY a,c or ORDER BY c
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-05-276-6380/+41
|\ \ | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1
| * | Deleted internals.texi (moved to mysqldoc tree - Monty req).unknown2003-05-271-6338/+0
| | | | | | | | | | | | | | | BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43: Delete: Docs/internals.texi
| * | fixed small merge bugunknown2003-05-272-1/+2
| | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | conf_to_src.c:unknown2003-05-271-39/+25
| | | | | | | | | | | | | | | | | | | | | | | | Changes according to CHARSET_INFO structure strings/conf_to_src.c: Changes according to CHARSET_INFO structure
| * | Index.xml:unknown2003-05-271-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | utf8 was not marked as compiled sql/share/charsets/Index.xml: utf8 was not marked as compiled
| * | Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4smunknown2003-05-271-0/+6
| |\ \ | | |/ | |/| | | | | | | sql/mysqld.cc: Auto merged
| | * add check of __NT__ definition for shared_memory for tree 4.1unknown2003-05-211-0/+6
| | |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-05-261-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1 sql/field.h: Auto merged
| * | Portability fixunknown2003-05-261-1/+2
| | |
* | | ixed wrong unlock of tables (new bug)unknown2003-05-264-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_delete.cc: Comment cleanup sql/sql_insert.cc: Comment cleanup sql/sql_load.cc: Comment cleanup sql/sql_update.cc: Fixed wrong unlock of tables. (Unlock must be done after writing to binary log
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-05-265-46/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1-narttu
| * | | ha_innodb.cc:unknown2003-05-265-46/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove accidenatlly committed debug printfs when query cache is used sql_update.cc, sql_load.cc, sql_insert.cc, sql_delete.cc: For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated. sql/sql_delete.cc: For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated. sql/sql_insert.cc: For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated. sql/sql_load.cc: For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated. sql/sql_update.cc: For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated. sql/ha_innodb.cc: Remove accidenatlly committed debug printfs when query cache is used
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-05-2612-164/+279
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1-narttu sql/field.cc: Auto merged sql/field.h: Auto merged sql/mysqld.cc: Auto merged
| * | | New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character setunknown2003-05-2612-164/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/internals.texi: Updated protocol information include/mysql.h: Added catalog to MYSQL_FIELD Added sqlstate handling to protocol include/mysql_com.h: New 4.1 protocol libmysql/libmysql.c: Added sqlstate handling Added CLIENT_MULTI_RESULTS sql/field.cc: Indentation cleanup sql/field.h: Indentation cleanup sql/mysql_priv.h: Changed arguments to close_connection() sql/mysqld.cc: Changed arguments to close_connection() Added checking of extra arguments to mysqld sql/protocol.cc: Fixed bug in TIME handling Added SQLSTATE on errors Removed net_send_error() sql/protocol.h: Removed net_send_error() sql/repl_failsafe.cc: Fixed arguments to close_connection() sql/sql_parse.cc: New 4.1 protocol
* | | | --with-charset was not up to dateunknown2003-05-269-112/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ctype_ucs2 and ctype_ujis were skipped in mistake
* | | | Index.xml:unknown2003-05-261-1/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | cp1250_czech_ci was displayed even when not compiled-in in mistake. sql/share/charsets/Index.xml: cp1250_czech_ci was displayed even when not compiled-in in mistake.
* | | symlink.result:unknown2003-05-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Character set in this test results was displayed dispite the fact that the table has the same character set mysql-test/r/symlink.result: Character set in this test results was displayed dispite the fact that the table has the same character set
* | | latin7.xml:unknown2003-05-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c Index.xml: Collation names form lati7 were mixed sql/share/charsets/Index.xml: Collation names form lati7 were mixed sql/share/charsets/latin7.xml: c
* | | BINARY collations for every character setunknown2003-05-2312-23/+300
| | |
* | | CHARSET_INFO structure reorganization for easier maintainanceunknown2003-05-2327-535/+611
| | |
* | | Character set sets now check if required non-dynamic charsets were really ↵unknown2003-05-239-11/+35
| | | | | | | | | | | | | | | | | | | | | compiled BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9: Delete: mysql-test/t/ctype_ujis-master.opt
* | | charset.c:unknown2003-05-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug fix: if latin2_czech_ci is not compiled, loader din't load other latin2 collations mysys/charset.c: Bug fix: if latin2_czech_ci is not compiled, loader din't load other latin2 collations
* | | convert.cc was removedunknown2003-05-233-467/+2
| | | | | | | | | | | | | | | BitKeeper/deleted/.del-convert.cc~437689acaffb7446: Delete: sql/convert.cc
* | | SHOW FIELDS changes, more SQL99 INFORMATION_SCHEMA.COLUMNS compatibility:unknown2003-05-2314-205/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Character set is not displayed in "Type" column anymore In "Collation" column NULL instead of BINARY is now displayd for for non-character data types mysql-test/r/alter_table.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore mysql-test/r/create.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore mysql-test/r/ctype_collate.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore mysql-test/r/ctype_recoding.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore mysql-test/r/gis.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore mysql-test/r/innodb.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore mysql-test/r/select.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore mysql-test/r/show_check.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore mysql-test/r/type_blob.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore mysql-test/r/type_float.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore mysql-test/r/type_ranges.result: Character set is not displayed in "Type" column of SHOW FIELDS anymore sql/field.cc: Character set is not displayed in "Type" column of SHOW FIELDS anymore sql/field.h: Character set is not displayed in "Type" column of SHOW FIELDS anymore sql/sql_show.cc: Character set is not displayed in "Type" column of SHOW FIELDS anymore
* | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-05-233-1/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| * | | CREATE TABLE t1 SELECT left(_latin2'a',1) didn't work, the charset got lostunknown2003-05-233-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collation and coercibility tests for string functions mysql-test/r/func_str.result: Collation and coercibility tests for string functions mysql-test/t/func_str.test: Collation and coercibility tests for string functions sql/item_strfunc.cc: Collation and coercibility tests for string functions
* | | | Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-05-232-43/+44
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into light.hegel.local:C:/mysql-dev/mysql-4.1
| * | | Translation English -> Protugueseunknown2003-05-232-43/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/share/portuguese/errmsg.txt: Translation English -> Portuguese BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | More tests for system functionsunknown2003-05-232-4/+64
| | | |
* | | | Automatic conversion into supersets (utf8, ucs2) for comparison in some casesunknown2003-05-233-7/+65
|/ / / | | | | | | | | | | | | | | | | | | USER(), DATABASE() and VERSION() return in utf8 now
* | | Cleaning DROP TABLE which is important if the tests are run in a certain order.unknown2003-05-222-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because rpl_relayrotate.test uses InnoDB. Example of a failing sequence: rpl_relayrotate.test repl_user_variables.test rpl_relayrotate.test Explaination in the files. Btw all other tests which use InnoDB (innodb*.test) already have this final DROP TABLE. Removed a wrong comment of mine. mysql-test/r/rpl_relayrotate.result: result update mysql-test/t/rpl_relayrotate.test: cleaning DROP TABLE which is important if the tests are run in a certain order.
* | | USER, DATABASE and VERSION functions returns now IMPLICIT coercibilityunknown2003-05-222-3/+3
| | |
* | | mysqld.cc:unknown2003-05-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | default_collation is now displayed correctly in mysqld --help mysqld --help now displays default_collation corretly, according to --default-character-set sql/mysqld.cc: default_collation is now displayed correctly in mysqld --help
* | | Variables were rename, binary collation names were addedunknown2003-05-2217-80/+59
| | | | | | | | | | | | | | | | | | | | | Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled
* | | Index.xml:unknown2003-05-221-3/+3
|/ / | | | | | | | | | | | | | | Typos fixes sql/share/charsets/Index.xml: Typos fixes