summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* .del-xml.c~d20ceb97a91fcc2d:unknown2003-01-101-374/+0
| | | | | | | | | | | | Delete: mysys/xml.c xml.c: Rename: BitKeeper/deleted/.del-xml.c~d20ceb97a91fcc2d -> mysys/xml.c It is actually moved to /strings BitKeeper/deleted/.del-xml.c~d20ceb97a91fcc2d: Delete: mysys/xml.c
* xml.c has been moved to /strings from /mysysunknown2003-01-103-7/+7
| | | | | | | | This is to reuse code to generate charset related C files from ther descriptions written in XML files
* xml.c:unknown2003-01-101-0/+374
| | | | | | | new file
* Added prepared statements sample from manual as a testunknown2003-01-091-25/+177
|
* Remove/change unwanted variables in client protocolunknown2003-01-094-17/+34
| | | | | | | | | Add missed mysql_stmt_affected_rows() sql_yacc.yy : Fix the compilation error .. bison 1.75 sql/sql_yacc.yy: Fix the compilarion error .. bison 1.75
* Merge venu@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-0937-227/+707
|\ | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1
| * Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1unknown2003-01-0937-227/+707
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/mem/mem0pool.c: Auto merged sql/sql_lex.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged
| | * Post merge fixunknown2003-01-097-67/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow empty key list in USE|IGNORE|FORCE INDEX() mysql-test/r/myisam.result: New explain format mysql-test/t/myisam.test: test of index() mysys/my_handler.c: Updated ha_key_cmp() to be as latest _mi_key_cmp() in 4.0 sql/sql_lex.cc: Post merge fix sql/sql_lex.h: Post merge fix sql/sql_parse.cc: Post merge fix sql/sql_yacc.yy: Post merge fix for FORCE INDEX () Allow empty key list in USE|IGNORE|FORCE INDEX()
| | * merge with 4.0.9unknown2003-01-0936-197/+601
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys client/mysqladmin.c: Auto merged client/mysqltest.c: Auto merged extra/Makefile.am: Auto merged include/my_base.h: Auto merged innobase/log/log0log.c: Auto merged myisam/ft_nlq_search.c: Auto merged myisam/mi_open.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/myisam.result: Auto merged sql/lex.h: Auto merged sql/log_event.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/protocol.cc: Auto merged sql/slave.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_select.cc: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql/sql_show.cc: Auto merged sql/table.h: Auto merged configure.in: merge with 4.0.9 innobase/btr/btr0pcur.c: merge with 4.0.9 myisam/mi_check.c: merge with 4.0.9 myisam/mi_search.c: merge with 4.0.9 mysql-test/t/myisam.test: merge with 4.0.9 sql/log_event.cc: merge with 4.0.9 sql/mysql_priv.h: merge with 4.0.9 sql/sql_lex.h: merge with 4.0.9 sql/sql_parse.cc: merge with 4.0.9 sql/sql_yacc.yy: merge with 4.0.9
| | | * Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0unknown2003-01-0917-52/+207
| | | |\
| | | | * Don't count NULL values in cardinalty for MyISAM tables.unknown2003-01-0917-52/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Free row buffer cache after each query for MyISAM tables. Added table join option FORCE INDEX Fixed core dump bug when connecting with hostname that could not be resolved. include/my_base.h: Don't count NULL values in cardinalty myisam/mi_check.c: Don't count NULL values in cardinalty myisam/mi_extra.c: Free row buffer cache after each query myisam/mi_open.c: Avoid realloc if cache size doesn't change myisam/mi_search.c: Don't count NULL values in cardinalty myisam/myisamdef.h: Change buffer length from uint to uint32 to make it more portable/predictable mysql-test/r/myisam.result: Test case for cardinality with NULL keys and FORCE INDEX mysql-test/t/myisam.test: Test case for cardinality with NULL keys and FORCE INDEX sql/lex.h: Added table join option FORCE INDEX sql/mysql_priv.h: Added table join option FORCE INDEX sql/opt_range.cc: Added table join option FORCE INDEX sql/sql_base.cc: Added table join option FORCE INDEX sql/sql_lex.h: Added table join option FORCE INDEX sql/sql_parse.cc: Added table join option FORCE INDEX Don't use strlen() on hostname without first checking if it's not NULL sql/sql_select.cc: Added table join option FORCE INDEX sql/sql_yacc.yy: Added table join option FORCE INDEX sql/table.h: Added table join option FORCE INDEX
| | | * | Merge work:/home/bk/mysql-4.0unknown2003-01-081-0/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
| | | | * | ft_nlq_search.c:unknown2003-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no _mi_search_next() bug fixed myisam/ft_nlq_search.c: no _mi_search_next() bug fixed
| | | * | | Merge work:/home/bk/mysql-4.0 into hynda.(none):/home/my/bk/mysql-4.0unknown2003-01-081-5/+5
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Fixed a couple of bugs.unknown2003-01-081-5/+5
| | | | | |
| | | * | | mergeunknown2003-01-084-15/+88
| | | |\ \ \
| | | | * | | Fix embedded server crashunknown2003-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_show.cc: fix embedded server crash
| | | | * | | mem0pool.c:unknown2003-01-071-13/+0
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the warning message that mem allocation spills from the additional mem pool to the OS; this does not hit performance with modern malloc libraries innobase/mem/mem0pool.c: Remove the warning message that mem allocation spills from the additional mem pool to the OS; this does not hit performance with modern malloc libraries
| | | | * | Added new program, mysql_waitpid.unknown2003-01-072-1/+87
| | | | | |
| | | * | | Fix for bug in LOAD DATA INFILE and replicationunknown2003-01-086-15/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for SHOW VARIABLES in embedded server Docs/internals.texi: Added documentation for join_buffer_size configure.in: Changed version number sql/log_event.cc: Fix for bug in LOAD DATA INFILE sql/log_event.h: Fix for bug in LOAD DATA INFILE sql/slave.cc: Fix for bug in LOAD DATA INFILE sql/sql_show.cc: Fix for SHOW VARIABLES in embedded server
| | | * | | Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0unknown2003-01-0712-129/+233
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Portability fixesunknown2003-01-0712-129/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed test suite for HPUX 10.20 and MacOSX Build-tools/Do-compile: Added timeout to mysqladmin shutdown commands Kill old running mysqld started by earlier runs Removed run time warning from LD_LIBRARY_PATH client/mysqladmin.c: Return 1 if pid file isn't deleted on shutdown. Fix error message if pid file is not deleted client/mysqltest.c: Always allow --debug flag (Makes it easier to run mysql-test-run) mysql-test/mysql-test-run.sh: A lot of safety fixes. This fixes some problems with test suite for HPUX 10.20 and MacOSX sql-bench/bench-init.pl.sh: Allow tests to change time limit. sql-bench/crash-me.sh: Indentation cleanups Added DROP for a created table sql-bench/test-alter-table.sh: Added default time limit Changed test to be estimated to get down run time. Fixed that add_multi_col is detected sql-bench/test-insert.sh: Comment cleanup sql/mysql_priv.h: Removed not needed prototype. sql/mysqld.cc: Removed DBUG warnings Removed default argument for clean_up() and made it static. More comments. Ignore SIGHUP during shutdown sql/net_pkg.cc: More comments sql/slave.cc: Added DBUG_PRINT messages
| | | * | | btr0pcur.c:unknown2003-01-052-11/+26
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug: an index cursor can theoretically be restored in a wrong place log0log.c: Fix bug: if combined log file size is >= 2 GB in a 32-bit computer InnoDB can write log to a wrong position innobase/log/log0log.c: Fix bug: if combined log file size is >= 2 GB in a 32-bit computer InnoDB can write log to a wrong position innobase/btr/btr0pcur.c: Fix bug: an index cursor can theoretically be restored in a wrong place
| | * | | Add TYPE as an alias for specifying key typeunknown2003-01-091-0/+1
| | | | |
* | | | | Merge work.mysql.com:/home/bk/mysql-4.1unknown2003-01-097-97/+1075
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/bk/src-4.1 mysql-test/r/create.result: Auto merged
| * | | | Simple misc cases - warningsunknown2003-01-074-2/+26
| | | | |
| * | | | Code cleaup to fix the conversion routines - binary protocolunknown2003-01-072-50/+34
| | | | |
| * | | | Protocol conversion testsunknown2003-01-071-45/+1015
| | | | |
* | | | | .del-koi8_u.xml~ec104975f7e009bf:unknown2003-01-092-239/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete: sql/share/charsets/koi8_u.xml .del-koi8_r.xml~f95ebf1fb19f94cf: Delete: sql/share/charsets/koi8_r.xml BitKeeper/deleted/.del-koi8_r.xml~f95ebf1fb19f94cf: Delete: sql/share/charsets/koi8_r.xml BitKeeper/deleted/.del-koi8_u.xml~ec104975f7e009bf: Delete: sql/share/charsets/koi8_u.xml
* | | | | euc_kr, koi8_r and koi8_u have been renamed so that nowunknown2003-01-095-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all charset names don't have "_" sign.
* | | | | koi8u.xml, koi8r.xml:unknown2003-01-092-0/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file
* | | | | do not call get_charset_by_name() with string "DEFAULT" unknown2003-01-091-3/+5
| | | | |
* | | | | Separating CHARSET and COLLATION termsunknown2003-01-0914-218/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/alter_table.result: SHOW FIELDS and SHOW CREATE TABLE now displays collation mysql-test/r/create.result: SHOW FIELDS and SHOW CREATE TABLE now displays collation mysql-test/r/innodb.result: SHOW FIELDS and SHOW CREATE TABLE now displays collation mysql-test/r/isam.result: SHOW FIELDS and SHOW CREATE TABLE now displays collation mysql-test/r/select.result: SHOW FIELDS and SHOW CREATE TABLE now displays collation mysql-test/r/show_check.result: SHOW FIELDS and SHOW CREATE TABLE now displays collation mysql-test/r/type_blob.result: SHOW FIELDS and SHOW CREATE TABLE now displays collation mysql-test/r/type_float.result: SHOW FIELDS and SHOW CREATE TABLE now displays collation mysql-test/r/type_ranges.result: SHOW FIELDS and SHOW CREATE TABLE now displays collation sql/field.cc: In field type charset rather than collation name is displayed sql/sql_db.cc: COLLATE clause has been added into SHOW CREATE DATABASE sql/sql_lex.cc: Detect charset names rather than collation names sql/sql_show.cc: COLLATION field has been added into SHOW FIELDS sql/sql_yacc.yy: COLLATE syntax has been added in CREATE TABLE/DATABASE
* | | | | fixed order_by test to make it repeatableunknown2003-01-092-18/+18
| | | | |
* | | | | buf0buf.c:unknown2003-01-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a sanity check awe mem >= buf pool size innobase/buf/buf0buf.c: Add a sanity check awe mem >= buf pool size
* | | | | os0proc.c:unknown2003-01-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos innobase/os/os0proc.c: Fix typos
* | | | | srv0srv.c, mem0pool.c, mem0pool.h, buf0buf.h, buf0buf.c:unknown2003-01-095-32/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make smaller buffer headers and the lock table; fix AWE high_end bug innobase/buf/buf0buf.c: Make smaller buffer headers and the lock table; fix AWE high_end bug innobase/include/buf0buf.h: Make smaller buffer headers and the lock table; fix AWE high_end bug innobase/include/mem0pool.h: Make smaller buffer headers and the lock table; fix AWE high_end bug innobase/mem/mem0pool.c: Make smaller buffer headers and the lock table; fix AWE high_end bug innobase/srv/srv0srv.c: Make smaller buffer headers and the lock table; fix AWE high_end bug
* | | | | Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-081-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean sql/item_strfunc.cc: Auto merged
| * | | | | Fix for the bug about point(subselect(...))unknown2003-01-081-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_strfunc.cc: null_value-s was indefined here
* | | | | | Merge abarkov@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-081-13/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| * | | | | | Renamed to look in common styleunknown2003-01-081-13/+5
| | | | | | |
* | | | | | | Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-082-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
| * | | | | | fix for readline buildingunknown2003-01-082-6/+6
| | | | | | |
* | | | | | | charset.c:unknown2003-01-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find only primary collations mysys/charset.c: find only primary collations
* | | | | | | New function to search for charset using charset name rather than collation nameunknown2003-01-082-9/+31
| | | | | | |
* | | | | | | Merge abarkov@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-081-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| * | | | | | COLLATE is field attribute not field typeunknown2003-01-081-2/+2
| | |_|/ / / | |/| | | |
* | | | | | resolving type conflict of BC and UP variables on FreeBSDunknown2003-01-082-6/+6
| | | | | |
* | | | | | Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-083-0/+139
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1 mysql-test/r/order_by.result: Auto merged mysql-test/t/order_by.test: Auto merged sql/sql_select.cc: Auto merged
| * | | | | Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-063-0/+139
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
View Lorry Controller Status