summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* After merge fixesunknown2006-05-0415-21/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove compiler warnings Fix some broken tests Workaround for syncronization bug in NDB (Bug #16445) client/mysqltest.c: Added more information to output from abort_not_supported_test() Removed compiler warnings include/my_sys.h: Added function to print names of open files include/mysys_err.h: Print names of open files mysql-test/include/have_ndb.inc: Added comment mysql-test/lib/mtr_report.pl: Only print warning once mysql-test/r/mysqldump.result: After merge fix mysql-test/r/ndb_basic.result: Workaround for syncronization bug in NDB mysql-test/r/ndb_config.result: Remove not portable test mysql-test/t/ndb_basic.test: Workaround for syncronization bug in NDB mysql-test/t/ndb_config.test: Remove not portable test mysys/errors.c: Print names of open files mysys/my_file.c: Ensure that structs are cleared and copyied properly so that my_print_open_files() works. mysys/my_init.c: In case of EXTRA_DEBUG, print names of open files mysys/my_open.c: Added function to print names of open files sql/sql_table.cc: Fixed file-not-closed error
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-0444-182/+629
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1 mysql-test/t/mysqldump.test: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/sql_table.cc: After merge fix sql/sql_show.cc: Auto merged
| * Cleanups after review of WL#602unknown2006-05-0310-35/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed warnings from test suite Some fixes in mysql-test-run script to catch more warnings mysql-test/lib/mtr_report.pl: Catch more warnings mysql-test/mysql-test-run.sh: Catch warnings from mysqld mysql-test/t/mysqldump.test: Add key_block_size to catch future changes in information schema mysys/errors.c: Ensure that mysql-test-run catches if we call my_close() too many times sql/handler.cc: Initialize all elements sql/log.cc: true -> TRUE sql/sql_class.h: Review change: key_info -> key_create_info sql/sql_lex.h: Review change: key_info -> key_create_info sql/sql_table.cc: Review change: key_info -> key_create_info Don't call mysql_close() if init_ddl_log is not called. Better error handling in init_ddl_log sql/sql_yacc.yy: Review change: key_info -> key_create_info
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-0339-168/+605
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1 include/my_sys.h: Auto merged sql/sql_parse.cc: Auto merged
| | * Added support for key_block_size for key and table level (WL#602)unknown2006-05-0339-168/+605
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for key_block_size to MyISAM. Simplify interface to 'new Key' to make it easier to add new key options. mysqld option --new is used to define where key options are printed. (In 5.3 we should move all key options to after key part definition to avoid problem with reserved names) Fixed some compiler warnings and a memory leak in ssl include/my_base.h: Added flag to check if block size for key was secified include/my_sys.h: Added new support function to round up to a power of two include/myisam.h: Rename block_size -> block_size_index to avoid confusion with 'block_size' include/violite.h: Added function to free memory after new_VioSSLAcceptorFd (Will rename all vio_ssl functions in a future changeset) mysql-test/mysql-test-run.pl: Don't print port number info when we use --extern mysql-test/r/myisam.result: Added test for key_block_size mysql-test/t/myisam.test: Added test for key_block_size mysys/mf_keycache.c: Simplify code mysys/my_bit.c: Added new support function to round up to a power of two sql/ha_myisam.cc: Tell MyISAM to use the specified key_block_size MyISAM also updates the global key_block_size from the used values. sql/handler.cc: Added 'default_key_create_info' to be used as 'dummy' argument to 'new Key' sql/handler.h: Added KEY_CREATE_INFO, to be used as for general options for KEY's sql/item_func.h: Removed compiler warning sql/lex.h: Added new symbol sql/mysqld.cc: Fixed memory leak in ssl (new_VioSSLAcceptorFd) sql/sql_class.h: Change 'new Key' to use KEY_CREATE_INFO instead of 'algoritm', parser, key_page_size. This makes it easier to add new key options in the future. sql/sql_lex.h: Added key create options sql/sql_parse.cc: Use new interface to 'new Key' sql/sql_show.cc: Added support for key_block_size If --new is used, key options are printed after the key part definition. sql/sql_table.cc: Use new interface to 'new Key' Add support for key_block_size sql/sql_yacc.yy: Add support for key_block_size Allow key options before and after key_parts (In future they should be always after the key_part defintion) Use new interface to 'new Key' sql/structs.h: Added block_size to keys sql/table.cc: Remmeber and read key_block_size for table and key level sql/table.h: Added default key_block_size for table sql/unireg.cc: Remember key_block_size for key storage/myisam/ft_eval.c: Set block_length to 0 to get default key page size storage/myisam/ft_test1.c: Set block_length to 0 to get default key page size storage/myisam/mi_check.c: block_size -> block_size_index storage/myisam/mi_create.c: Added support for block size per key. Block size is rounded up to next power of two and enforced between MIN and MAX KEY_BLOCK_LENGTH. Align start of key block to start at an even offset of max_key_block_length to ensure key cache works good if all key pages are of same size. storage/myisam/mi_open.c: block_size -> block_size_index storage/myisam/mi_page.c: block_size -> block_size_index storage/myisam/mi_test1.c: Set block_length to 0 to get default key page size storage/myisam/mi_test2.c: Set block_length to 0 to get default key page size storage/myisam/mi_test3.c: Set block_length to 0 to get default key page size storage/myisam/myisamdef.h: block_size -> block_size_index to avoid confusion with 'block_size' in MySQL Added block_size as argument to MI_BLOCK_SIZE Added missing prototypes to get rid of compiler warnings storage/myisam/myisampack.c: Removed compiler warning block_size -> block_size_index vio/viosslfactories.c: Fixed memory leak in ssl (new_VioSSLAcceptorFd) mysql-test/r/myisam-system.result: New BitKeeper file ``mysql-test/r/myisam-system.result'' mysql-test/t/myisam-system.test: New BitKeeper file ``mysql-test/t/myisam-system.test''
* | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-031-5/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into zim.(none):/home/mikael/bug19313
| * \ \ Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-031-5/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zim.(none):/home/mikael/bug19313 sql/sql_table.cc: Auto merged
| | * | | BUG#19313: Crash after mysqld starts and stops immediately afterwards.unknown2006-04-251-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_table.cc: Making sure all initialisations are properly done even when memory allocations fail.
* | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-040-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
| * \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old02unknown2006-05-040-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new sql/sql_base.cc: Auto merged
| | * \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.1-releaseunknown2006-03-011-2/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
| | | * | | | | Removing unnecessary assertion.unknown2006-03-011-2/+0
| | | | | | | |
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-05-031-6/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| * | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-wl2852unknown2006-05-031-6/+52
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean client/mysql.cc: Resolve conflict
| | * | | | | | | In the command-line client, try to abort the current query by issuing aunknown2005-10-051-6/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KILL command on a second connection when handling Ctrl-C. (WL#2852) Based on patch by Harrison Fisk. client/mysql.cc: When a query is executing, handle Ctrl-C by trying to make a second connection to the server and issuing a KILL command against the original connection.
* | | | | | | | | fix include path in windows buildunknown2006-05-033-3/+7
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage/archive/cmakelists.txt: fix include path storage/blackhole/cmakelists.txt: fix include path storage/csv/cmakelists.txt: fix include path
* | | | | | | | fix legacy configure option handlingunknown2006-05-031-2/+3
| | | | | | | |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-033-9/+48
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-033-9/+48
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078 VC++Files/mysql.sln: Auto merged VC++Files/mysys/mysys.vcproj: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/timezone2.result: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/ps_1general.test: Auto merged sql/sql_prepare.cc: Auto merged sql/tztime.cc: Auto merged sql/tztime.h: Auto merged tests/Makefile.am: Auto merged tests/mysql_client_test.c: Auto merged
| | * | | | | | | Added code to remove closing comment code from event text, as would beunknown2006-05-033-9/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supplied inside a /*!VERSION event-text */ segment. (Fixes Bug#18078 mysql-test/t/disabled.def: Enabling 'mysqldump' test because events should load normally now. mysql-test/t/mysqldump.test: Add spaces and tabs to the end of statements, to prove trimming of whitespace. sql/event_timed.cc: Remove */ close-comment characters at the end, just as sp_head does. The parser should be smarter about not giving us text that jumps semantic levels, but that's an issue for another day.
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-0216-46/+292
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078 BitKeeper/etc/config: Auto merged VC++Files/mysql.sln: Auto merged VC++Files/mysys/mysys.vcproj: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/timezone2.result: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/ps_1general.test: Auto merged sql/sql_prepare.cc: Auto merged sql/tztime.cc: Auto merged sql/tztime.h: Auto merged tests/Makefile.am: Auto merged tests/mysql_client_test.c: Auto merged
| | | * | | | | | | pekka:get - push push pushunknown2006-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/config: pekka:get
| | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-021-1/+5
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
* | | | \ \ \ \ \ \ \ Merge acurtis@bk-internal:/home/bk/mysql-5.1-newunknown2006-05-0340-114/+780
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/home/antony/work2/wl3201-final sql/ha_innodb.cc: Auto merged sql/sql_show.cc: Auto merged
| * \ \ \ \ \ \ \ \ \ \ Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-043-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/dev/mysql-5.1-wl3148 mysql-test/r/information_schema.result: Auto merged sql/sql_show.cc: Auto merged
| | * | | | | | | | | | | WL#3148: Modifying sizes of i_s.processlist columns ('time', 'info').unknown2006-05-023-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/information_schema.result: Fixing test case result (after modifying the size of the i_s.processlist.info column). sql/mysql_priv.h: Defined new constant used as the size of the i_s.processlist.info column. sql/sql_show.cc: Modifying sizes of i_s.processlist columns ('time', 'info').
| * | | | | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb/mysql-5.1
| | * | | | | | | | | | | Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-workunknown2006-05-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb/mysql-5.1 storage/innobase/include/dict0dict.ic: SCCS merged
| | | * | | | | | | | | | | Applied innodb-5.0-ss521 snapshot.unknown2006-05-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed BUG#19366: "consistent_snapshot.test fails". innobase/include/dict0dict.ic: Applied innodb-5.0-ss521 snapshot. Remove too strict assertions from some dict_table_t accessor functions (bug #19366).
| | * | | | | | | | | | | | Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-workunknown2006-05-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | / / / | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb/mysql-5.1 Null-merge. storage/innobase/include/dict0dict.ic: Null-merge.
| | | * | | | | | | | | | Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss26-workunknown2006-05-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work Null-merge. innobase/include/dict0dict.ic: Null-merge.
| | | | * | | | | | | | | Applied innodb-4.1-ss26 snapshot.unknown2006-05-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed BUG#19366: "consistent_snapshot.test fails". innobase/include/dict0dict.ic: Applied innodb-4.1-ss26 snapshot. Remove too strict assertions from some dict_table_t accessor functions (Bug#19366).
| * | | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-033-1/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.b18170
| | * | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-5.1-newunknown2006-05-033-1/+42
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.b18170 mysql-test/r/xml.result: Auto merged mysql-test/t/xml.test: Auto merged sql/item_xmlfunc.cc: Auto merged
| | | * | | | | | | | | | | Bug#18170: XML: ExtractValue(): XPath expression can't use QNames (colon in ↵unknown2006-04-173-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | names) Problem source: Qualified names (aka QName) didn't work as tag names and attribute names, because the parser lacked a real rule to scan QName, so it understood only non-qualified names without prefixes. Solution: New rule was added to check both "ident" and "ident:ident" sequences. mysql-test/r/xml.result: Adding test case mysql-test/t/xml.test: Adding test case sql/item_xmlfunc.cc: Adding real QName parser rule and using it in NodeTest rule.
| * | | | | | | | | | | | | Windows build fixes for CMakeunknown2006-05-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/cmakelists.txt: Add new file to build. tests/cmakelists.txt: Add new dependency on mysys
| * | | | | | | | | | | | | Merge mysql.com:/home/dlenev/mysql-5.0-bg11081unknown2006-05-0216-46/+292
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | / / / / / / | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/mysql-5.1-merges VC++Files/mysql.sln: Auto merged VC++Files/mysys/mysys.vcproj: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/timezone2.result: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/ps_1general.test: Auto merged sql/sql_prepare.cc: Auto merged sql/tztime.cc: Auto merged sql/tztime.h: Auto merged tests/Makefile.am: Auto merged tests/mysql_client_test.c: Auto merged
| | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-0210-41/+241
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/mysql-5.0-bg11081
| | | * | | | | | | | | | | A fix and a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE unknown2006-04-256-9/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported in SP but not in PS": just enable them in prepared statements, the supporting functionality was implemented when they were enabled in stored procedures. mysql-test/r/ps.result: Bug#19308: test results fixed. mysql-test/r/ps_1general.result: Adjust existing test cases (ANALYZE/OPTIMIZE/REPAIR are now allowed in prepared statements. mysql-test/r/sp-dynamic.result: Adjust existing test cases (ANALYZE/OPTIMIZE/REPAIR are now allowed in prepared statements. mysql-test/t/ps.test: Add a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE supported in SP but not in PS" mysql-test/t/ps_1general.test: Adjust existing test cases (ANALYZE/OPTIMIZE/REPAIR are now allowed in prepared statements. sql/sql_prepare.cc: Enable ANALYZE, OPTIMIZE, REPAIR in prepared statements.
| | | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2006-04-244-32/+98
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/mysql-5.0-bg11081
| | | | * | | | | | | | | | | Fix for bug#11081 "Using a CONVERT_TZ function in a stored function orunknown2006-04-244-32/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trigger fails". In cases when CONVERT_TZ() function was used in trigger or stored function (or in stored procedure which was called from trigger or stored function) error about non existing '.' table was reported. Statements that use CONVERT_TZ() function should have time zone related tables in their table list. tz_init_table_list() function which is used to produce part of table list containing those tables didn't set TABLE_LIST::db_length/table_name_length members properly. As result time zone tables needed for CONVERT_TZ() function were incorrectly handled by prelocking algorithm and "Table '.' doesn't exist' error was emitted. This fix changes tz_init_table_list() in such way that it properly inits TABLE_LIST::table_name_length/db_length members and thus produces table list which can be handled by prelocking algorithm correctly. mysql-test/r/timezone2.result: Added test for bug #11081 "Using a CONVERT_TZ function in a stored function or trigger fails". mysql-test/t/timezone2.test: Added test for bug #11081 "Using a CONVERT_TZ function in a stored function or trigger fails". sql/tztime.cc: Now tz_init_table_list() inits table_name_length and db_length members in TABLE_LIST objects, so table lists produced with its help can be handled by prelocking algorithm properly. Also two clean-ups are included: - Now we use MY_TZ_TABLES_COUNT instead of magical number 4 in places where it is appropriate. - TZ_NAMES_ENTRY structure was converted to Tz_names_entry class in order to emphasize its non-POD nature. sql/tztime.h: Added MY_TZ_TABLES_COUNT constant to be used as number of time zone related tables which are needed for dynamical loading of time zone descriptions.
| | * | | | | | | | | | | | | Fix a bunch of non-Linux compile failures.unknown2006-05-025-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/mysql.sln: mysql_client_test depends on mysys. VC++Files/mysys/mysys.vcproj: Add new file missing in previous push. mysys/my_memmem.c: Fix illegal pointer arithmetics on void *. tests/Makefile.am: -L must go before -l tests/mysql_client_test.c: No declarations after statement in C code.
| | * | | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-021-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.clean
| | | * | | | | | | | | | | | | Win build fixunknown2006-05-021-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-029-23/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
| | * | | | | | | | | | | | | | | More merging assistence.unknown2006-05-022-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging behavior changed in early 5.1. (The filename was never right, but the "opt" file is unnecessary in 5.0 anyway.) mysql-test/t/mysql_client_test-master.opt: Logging behavior changed in early 5.1.
| | * | | | | | | | | | | | | | | Manually mergedunknown2006-05-022-161/+375
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667unknown2006-05-029-397/+385
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | / / / / / / | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667 include/my_sys.h: Auto merged mysys/Makefile.am: Auto merged tests/Makefile.am: Auto merged
| | | * | | | | | | | | | | | | An update to as-yet unused new feature of snprintf, which was added to bring unknown2006-05-021-1/+5
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our sprintf()-alike in sync with our fprintf()-alike features. strings/my_vsnprintf.c: Advance the destination pointer properly. Also, pay attention to the "n" in snprintf() -- never write too much.
| | | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-019-23/+220
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667 mysys/Makefile.am: Auto merged sql/sql_parse.cc: Auto merged