summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Small cleanup of derived tables handling.unknown2004-12-191-5/+0
| | | | | | | | | | | | | | We should not call free_tmp_table() for derived table in mysql_derived_filling(), since by this moment this table is already registered in THD::derived_tables list and thus free_tmp_table() will be called for it automatically in close_thread_tables(). sql/sql_derived.cc: We should not call free_tmp_table() for derived table in mysql_derived_filling(), since by this moment this table is already registered in THD::derived_tables list and thus free_tmp_table() will be called for it automatically in close_thread_tables().
* Fix of test-suite failures which popped up after addition of federatedunknown2004-12-172-2/+2
| | | | | | | | | | | storage engine. mysql-test/mysql-test-run.sh: We should skip starting of slave server only if test is BOTH not replication related and not federated storage engine related. mysql-test/r/ps_1general.result: Fixed test result after federated storage engine was added.
* WL# 2094 Federated Storage Handler, added fixes per suggestions by Bar and ↵unknown2004-12-164-124/+277
| | | | | | | | | | | | | | | | Antony mysql-test/r/federated.result: new test results mysql-test/t/federated.test: added order by, group by sql/ha_federated.cc: - added 'scheme' to URL - added proper escaping - made sure &my_charset_bin is being used throughout handler - made sure create_table catches improper URL in comment upon table creation sql/ha_federated.h: added scheme to share
* Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-1616-3/+2888
|\ | | | | | | | | | | | | | | | | | | | | | | into patrick-galbraiths-computer.local:/Users/patg/5.0-federated sql/Makefile.am: Auto merged sql/field.h: Auto merged sql/mysql_priv.h: Auto merged
| * First commit to mysql-5.0 tree to include MySQL Federated Storage Handler. ↵unknown2004-12-1116-3/+2888
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes both the source and header files, test (results, test, require), and modifications to server and handler base files, and autoconf modifications to properly build federated handler. configure.in: inclusion of federated handler autoheader macro mysql-test/mysql-test-run.sh: allow usage of replication tests for federated handler sql/Makefile.am: inclusion of federated header and source file sql/field.h: overloaded method val_str() to work with fields in 'old_data' in 'update_row()' sql/handler.cc: added code to include federated handler sql/handler.h: add db type for federated sql/mysql_priv.h: added code for federated handler sql/mysqld.cc: added code for federated handler sql/set_var.cc: added code for federated handler
* | Clean up from code review. unknown2004-12-161-13/+4
| | | | | | | | | | sql/examples/ha_archive.cc: Fixed from code review. Cleaned up comment and fixed issue with mean length of row.
* | Mergeunknown2004-12-164-40/+1276
|\ \
| * | A few simple fixes plus the added support of being able to repair the meta ↵unknown2004-12-094-40/+1276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data file via REPAIR TABLE. More information is now provided in SHOW TABLE STATUS. mysql-test/r/archive.result: Added REPAIR TABLE test mysql-test/t/archive.test: Added REPAIR TABLE tests. sql/examples/ha_archive.cc: Added additional code to show more information during a SHOW TABLE STATUS. Curren size of the compressed file is now shown. Also added global "crashed" flag to mark when a table is crashed. Removed autorebuild during open table. Removed a few unneeded actions in OPTIMIZE TABLE. Fixed DBUG_ENTER for end_build_insert(). sql/examples/ha_archive.h: Added repair options
* | | Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-161-416/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into arthur.local:/my/mysql-5.0-clean
| * | | Removed incorrect messages; fixed serbian messages.unknown2004-12-161-416/+28
| | | | | | | | | | | | | | | | | | | | sql/share/errmsg.txt: Removed incorrect error messages; Fixed serbian messages.
* | | | Fix for BUG#7266.unknown2004-12-162-7/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | mysql-test/r/greedy_optimizer.result: Adjusted query costs accordingly. sql/sql_select.cc: Someone added this 0.001 cost factor to best_extension_by_limited_search(), but forgot to add it to the old version of the optimizer - find_best().
* | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-1615-32/+174
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/new/mysql-5.0
| * | | errmsg.txt:unknown2004-12-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My attempt N3 sql/share/errmsg.txt: My attempt N3
| * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-163-1/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6843
| | * | | Fix for bug#7211: information_schema: crash if bad view(after review)unknown2004-12-163-1/+25
| | | | |
| * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-161-0/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6843
| | * | | A fix (Bug #6843: Wrong function name crashes MySQL if mysql.proc table is missiunknown2004-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sp.cc: A fix (Bug #6843: Wrong function name crashes MySQL if mysql.proc table is missi We test current_select (in case of error) in the my_message_sql().
| * | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-168-14/+117
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
| | * \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-168-14/+117
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
| | | * | | | Fix for bug#7212: information_schema: "Can't find file" errors if storage ↵unknown2004-12-168-14/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | engine gone(after review)
| * | | | | | Merge mysql.com:/home/mydev/mysql-5.0unknown2004-12-161-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-wl2126
| | * | | | | | Changed C++-ism into C in client_test.c.unknown2004-12-161-1/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests/client_test.c: Moved variable declaration to the beginning of the block. (It's a C file, not C++)
| * | | | | | Merge mysql.com:/home/mydev/mysql-5.0unknown2004-12-163-3/+16
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-wl2126
| | * | | | | Enlarged group item key_length by a varstring length field.unknown2004-12-163-3/+16
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group item fields are implemented as varstrings nowadays. Made init_connect.test robust against existing t1. mysql-test/r/init_connect.result: Made init_connect.test robust against existing t1. mysql-test/t/init_connect.test: Made init_connect.test robust against existing t1. sql/sql_select.cc: Enlarged group item key_length by a varstring length field. Group item fields are implemented as varstrings nowadays.
| * | | | | Portability fix in libmysql (FreeBSD)unknown2004-12-162-11/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: Define UINT_MAX8 libmysql/libmysql.c: Replace defines for insteger limits with their custom MySQL versions.
* | | | | Added support for a CREATE TABLE...AUTO_INCREMENT = x in InnoDB.unknown2004-12-161-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_innodb.cc: Added support for a CREATE TABLE...AUTO_INCREMENT = x; Note that the new value for auto increment field is set if the new values is creater than the maximum value in the column.
* | | | Data truncation reporting implementation (libmysql) + post reviewunknown2004-12-169-428/+1050
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes. Still to do: - deploy my_strtoll10 in limbysql.c - add mysql_options option to switch MYSQL_DATA_TRUNCATED on and off. include/my_time.h: More calls are shared between client and server (libmysql now performs more intelligent date->number and number->date conversions). TODO: rename those which are not starting with 'my_' include/mysql.h: MYSQL_BIND: - more elaborated comment - some of the ex-private members were given public names - it's sometimes convenient to set bind->error to &bind->error_value. However Monty questions the idea, so it should be given more thought in future. - added new members to support data truncation. Added new return value of mysql_stmt_fetch, MYSQL_DATA_TRUNCATED. libmysql/libmysql.c: - added support for data truncation during fetch - implementation for is_binary_compatible: now conversion functions are used less frequently - we now use number_to_datetime and TIME_to_ulonglong for date->number and number->date conversions sql-common/my_time.c: - added implementation of date->number and number->date calls shared between client and server (moved from time.cc). sql/field.cc: - implemented Field_time::store_time() to better support date->time conversions in prepared mode. After-review fixes. sql/field.h: - Field::store_time now returns int sql/mysql_priv.h: - removed date->number and number->date conversion functions headers (moved to my_time.h) sql/time.cc: - removed implementation of date->number and number->date conversion functions (moved to my_time.c) tests/client_test.c: - added a test case for data truncation; other test cases adjusted. - fixed my_process_stmt_result to set STMT_ATTR_UPDATE_MAX_LENGTH (tables are now printed out prettier).
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0
| * | | | Fix for IM compilation failure (reported be Ramil).unknown2004-12-151-1/+1
| |/ / / | | | | | | | | | | | | | | | | server-tools/instance-manager/thread_registry.h: Fix for the problem, encountered by Ramil
* | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-151-1/+16
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/new/mysql-5.0
| * | | Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug ↵unknown2004-12-131-41/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #7061). sql/ha_innodb.cc: Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061). It cant be put on commit because ALTER TABLE will commit on every 10000 rows. Therefore, this change must be done when a new temporary table is created in the ALTER TABLE.
| * | | Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug ↵unknown2004-12-131-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #7061). sql/ha_innodb.cc: Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061). If AUTO_INCREMENT is given in the ALTER TABLE, this value is now set to the auto increment value of the table if the new value is creater or equal than the current value of the auto increment value. If the new value is less than the old value no error message is given and the old value is not changed.
* | | | Fixed compile error in extra/comp_err.c with -debug for some compilers.unknown2004-12-141-2/+1
| | | | | | | | | | | | | | | | | | | | extra/comp_err.c: Fixed compile error with -debug for some compilers.
* | | | Fix for bug #7220: information_schema: errors in "character_sets"unknown2004-12-142-15/+37
| | | |
* | | | Fx for bug#7221: information_schema: errors in "key_column_usage"unknown2004-12-143-22/+11
| | | |
* | | | Fix bug#7222 information_schema: errors in "routines"unknown2004-12-143-10/+26
| | | |
* | | | Fix for bug #7223: information_schema: error in "views"unknown2004-12-142-6/+6
| | | |
* | | | Fixed typounknown2004-12-141-3/+3
| | | |
* | | | Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; unknown2004-12-146-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: added extra/created_include_files extra/Makefile.am: Make sure that mysqld_error.h and sql_state.h are not build in the same time. extra/comp_err.c: Fixed segfault bug libmysqld/Makefile.am: Added path to mysqld_error.h and sql_state.h libmysqld/examples/Makefile.am: Added path to mysqld_error.h and sql_state.h scripts/make_win_src_distribution.sh: Windows version fix
* | | | Added missing errmsg.txtunknown2004-12-132-0/+5625
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: added extra/sql_state.h
* | | | WL#1051, more maintanable error messages.unknown2004-12-1336-10484/+873
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-mysqld_error.h~9dac75782467aab7: Delete: include/mysqld_error.h BitKeeper/deleted/.del-sql_state.h~4307ea5f1fe99019: Delete: include/sql_state.h BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a: Delete: sql/share/czech/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9: Delete: sql/share/danish/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7: Delete: sql/share/dutch/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16: Delete: sql/share/french/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72: Delete: sql/share/estonian/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~898865062c970766: Delete: sql/share/greek/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d: Delete: sql/share/german/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e: Delete: sql/share/english/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72: Delete: sql/share/norwegian/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1: Delete: sql/share/italian/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1: Delete: sql/share/korean/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c: Delete: sql/share/japanese/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23: Delete: sql/share/hungarian/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e: Delete: sql/share/portuguese/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c: Delete: sql/share/polish/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06: Delete: sql/share/norwegian-ny/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795: Delete: sql/share/romanian/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84: Delete: sql/share/russian/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150: Delete: sql/share/serbian/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89: Delete: sql/share/slovak/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0: Delete: sql/share/swedish/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964: Delete: sql/share/spanish/errmsg.txt BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4: Delete: sql/share/ukrainian/errmsg.txt client/Makefile.am: Added pass to mysqld_error.j and sql_state.h extra/Makefile.am: Added rules to create mysqld_error.h and sql_state.h extra/comp_err.c: WL#1051 include/Makefile.am: Added pass to mysqld_error.h and sql_state.h libmysql/Makefile.am: Added pass to mysqld_error.h and sql_state.h libmysql_r/Makefile.am: Added pass to mysqld_error.h and sql_state.h server-tools/instance-manager/Makefile.am: Added pass to mysqld_error.h and sql_state.h sql/Makefile.am: Added pass to mysqld_error.h and sql_state.h sql/share/Makefile.am: Removed unnecessary loop over all languages; addred rule to creat <lang>.sys files tools/Makefile.am: Added pass to mysqld_error.h and sql_state.h BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | flush_read_lock_kill-master.opt:unknown2004-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't make non-debug builds fail the testsuite mysql-test/t/flush_read_lock_kill-master.opt: don't make non-debug builds fail the testsuite
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-126-15/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0
| * | | | fix autobuild failuresunknown2004-12-126-15/+18
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/buffer.cc: fix typo server-tools/instance-manager/commands.cc: get rid of compiler warnings server-tools/instance-manager/guardian.cc: fix compiler warning server-tools/instance-manager/instance.cc: fix warnings server-tools/instance-manager/instance_map.cc: fix return value server-tools/instance-manager/instance_map.h: fix problem, caused autobuild failure. Looks like a gcc problem - "friend class <name>" doesn't work if specified before enclosed class <name> (this is not present in newer gcc versions)
* | | | Fix test results that may change from run to rununknown2004-12-124-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added comments (from code review on pull) mysql-test/r/heap.result: Fix results that may change from run to run mysql-test/r/ps_5merge.result: Fix wrong result mysql-test/t/heap.test: Make results predictable sql/sql_show.cc: Add comments Fixed typo
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-1231-253/+537
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| * | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-103-6/+71
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
| | * \ \ Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-103-6/+71
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/j/mysql-5.0
| | | * | | InnoDB: Reduce the stack space consumption of ON UPDATE CASCADEunknown2004-12-103-6/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operations. innobase/include/lock0lock.h: Added lock_clust_rec_read_check_and_lock_alt(), a variant of lock_clust_rec_read_check_and_lock() without the parameter "offsets". innobase/lock/lock0lock.c: Added lock_clust_rec_read_check_and_lock_alt(), a variant of lock_clust_rec_read_check_and_lock() without the parameter "offsets". innobase/row/row0ins.c: row_ins_foreign_check_on_constraint(): Do not allocate offsets from stack. This reduces the stack space consumption of ON UPDATE CASCADE operations by 400 bytes per cascaded UPDATE operation.
| * | | | | fix according to reviewunknown2004-12-103-14/+37
| | | | | |
View Lorry Controller Status