summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Content merge.unknown2004-12-21161-1998/+9862
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/handler.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged innobase/trx/trx0roll.c: Auto merged.
| * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-215-47/+188
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-5.0-nov-clean sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged
| | * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-11-215-47/+188
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-5.0-nov-clean sql/opt_range.cc: Auto merged
| | | * Fix for BUG#4177: unknown2004-11-215-47/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make index merge quick selects code allow perform several scans. * Delay additional handler objects creation till row retrieval is started. include/queues.h: Added trivial queue_remove_all macro mysql-test/r/index_merge.result: Testcase for BUG#4177 mysql-test/t/index_merge.test: Testcase for BUG#4177 sql/opt_range.cc: Fix for BUG#4177: * For any quick select, row retrieval can be performed several times. Now all index_merge quick selects code handles such cases properly. * In QUICK_INDEX_MERGE_SELECT we use one handler object for all merged scans, and it was possible that in destructor several cleanup functions were called * Additionally - Removed redundant QUICK_INDEX_MERGE_SELECT members. - Now QUICK_ROR_*_SELECTs create additional handler objects only when row retrieval is started So if join optimizer chooses other access method, we don't create/delete handlers.
| * | | Fix for BUG#4480: In joins with SELECT_STRAIGHT_JOIN re-order tables by ↵unknown2004-12-213-10/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outer join dependency, so we read dependent tables after tables they depend on (this is needed for outer joins) mysql-test/r/join_outer.result: Test for BUG#4480 mysql-test/t/join_outer.test: Test for BUG#4480
| * | | Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-201-4/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.local:/home/kaa/src/mysql-5.0 innobase/os/os0proc.c: Auto merged
| | * | | Fixed compilation for old Linux distributions that have no HugeTLB supportunknown2004-12-201-4/+10
| | | | |
| * | | | Changed mode of result files to -rw-rw-r--unknown2004-12-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/federated.result: Change mode to -rw-rw-r-- mysql-test/r/fulltext2.result: Change mode to -rw-rw-r-- mysql-test/r/grant2.result: Change mode to -rw-rw-r-- mysql-test/r/information_schema_inno.result: Change mode to -rw-rw-r-- mysql-test/r/innodb_handler.result: Change mode to -rw-rw-r-- mysql-test/r/insert_update.result: Change mode to -rw-rw-r-- mysql-test/r/repair.result: Change mode to -rw-rw-r-- mysql-test/r/rpl_create_database.result: Change mode to -rw-rw-r-- mysql-test/r/type_bit.result: Change mode to -rw-rw-r--
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-198-61/+131
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0 innobase/os/os0proc.c: Auto merged
| | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-191-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0
| | | * | | Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-191-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.local:/home/kaa/src/mysql-5.0
| | | | * | | Fixed cut&paste bug that broke compilation with compile-pentium-valgrind-maxunknown2004-12-191-1/+1
| | | | | | |
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-191-5/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0
| | | * | | | 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 for Bug#7386 - IM fails to compile on alpha with Compaq C++ compilerunknown2004-12-192-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/mysql_connection.cc: use enum value instead of extern const in array definition server-tools/instance-manager/priv.cc: added a comment to remind of enum value in mysql_connection.cc
| | * | | | | trx0roll.c:unknown2004-12-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put a sensible value of thread id and process no to a background rollback transaction innobase/trx/trx0roll.c: Put a sensible value of thread id and process no to a background rollback transaction
| | * | | | | trx0roll.c:unknown2004-12-181-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the rollback progress printout in crash recovery innobase/trx/trx0roll.c: Fix the rollback progress printout in crash recovery
| | * | | | | trx0roll.c:unknown2004-12-184-30/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print progress of background rollback of transactions with more than 1000 undo log entries srv0start.c, trx0roll.c, log0recv.c, trx0roll.h: Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly innobase/include/trx0roll.h: Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly innobase/log/log0recv.c: Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly innobase/srv/srv0start.c: Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly innobase/trx/trx0roll.c: Print progress of background rollback of transactions with more than 1000 undo log entries
| | * | | | | rem0rec.ic:unknown2004-12-181-25/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use short int in rem0rec.ic, since its size is not fixed in ANSI C; improve comments of the relative offset field in a record; use mach_read_from_2() to read the relative offset field to save CPU time, if the compiler does not optimize a more complex access function innobase/include/rem0rec.ic: Do not use short int in rem0rec.ic, since its size is not fixed in ANSI C; improve comments of the relative offset field in a record; use mach_read_from_2() to read the relative offset field to save CPU time, if the compiler does not optimize a more complex access function
| * | | | | | Merge with global treeunknown2004-12-1919-101/+589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some found bugs in BIT fields Added more test cases for BIT fields and varchar include/my_base.h: Merge Added HA_BIT_PART for easier test in key.cc innobase/os/os0proc.c: Fixed typo myisam/mi_dbug.c: Add printing of BIT types when debugging mysql-test/r/show_check.result: Set 'Avg_row_length' to # as this value is different between 32 and 64 bit machines mysql-test/r/type_bit.result: More tests mysql-test/r/type_varchar.result: More tests mysql-test/t/show_check.test: Set 'Avg_row_length' to # as this value is different between 32 and 64 bit machines mysql-test/t/type_bit.test: More tests mysql-test/t/type_varchar.test: More tests sql/field.cc: Added Field::val_int_as_str() to get better logging of bit fields Merged new_key_field with move_field() to fix some problems with bit fields Fixed some bugs with bit fields sql/field.h: Added Field::val_int_as_str() to get better logging of bit fields Merged new_key_field with move_field() to fix some problems with bit fields Fixed some bugs with bit fields sql/ha_myisam.cc: Fixed problem with unintialized memory (not critical) sql/key.cc: Fix so that 'key_cmp_if_same' works with bit fields. sql/opt_range.cc: Move declarations first in function Nice printing of bit fields in debug log sql/sql_prepare.cc: Fixed old merge error (not critical) sql/sql_select.cc: Use new interface to new_key_field sql/sql_select.h: Use new interface to new_key_fields() This fixes a bug with BIT fields where the upper bit of the data was not stored in the key buffer sql/structs.h: Extend key_part_flag to be able to add HA_BIT_PART to it sql/table.cc: Mark BIT key parts with HA_BIT_PART to make test in key.cc simpler
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-186-23/+67
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0 mysql-test/r/information_schema.result: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged
| | * | | | | Fix for bug #7213: information_schema: redundant non-standard TABLE_NAMES tableunknown2004-12-185-23/+31
| | | | | | |
| | * | | | | Fix for bug #7210: information_schema: can't access when table-name = ↵unknown2004-12-184-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reserved word
| * | | | | | Merge with global treeunknown2004-12-1857-460/+1405
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysys/my_handler.c: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/field_conv.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged include/my_base.h: Merge
| | * | | | | Add 0x before pointers (to help with debugging)unknown2004-12-1857-459/+1404
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for VARCHAR with 1 or 2 length bytes Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly) Give error if we got problems in temporary tables during a SELECT Don't use new table generated by ALTER TABLE if index generation fails Fixed wrong call by range_end() (Could cause an ASSERT in debug mode) BUILD/SETUP.sh: Add flags for Intel 64 dbug/dbug.c: Add 0x before pointers (to help with debugging) heap/_check.c: Add 0x before pointers (to help with debugging) heap/hp_create.c: Add support for VARCHAR with 1 or 2 length bytes heap/hp_delete.c: Add 0x before pointers heap/hp_hash.c: Add support for VARCHAR with 1 or 2 length bytes Added more debugging heap/hp_open.c: Add 0x before pointers heap/hp_rkey.c: Add 0x before pointers heap/hp_rrnd.c: Add 0x before pointers heap/hp_write.c: Add 0x before pointers include/my_base.h: Add support for VARCHAR with 1 or 2 length bytes myisam/ft_static.c: Add support for VARCHAR with 1 or 2 length bytes myisam/ft_test1.c: Add support for VARCHAR with 1 or 2 length bytes Fixed indentation (This file should probably be deleted as it doesn't compile) myisam/ft_update.c: Add support for VARCHAR with 1 or 2 length bytes Fixed indentation Removed some not needed 'else' myisam/mi_check.c: Don't give an error for tables packed with myisampack myisam/mi_checksum.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_create.c: Add support for VARCHAR with 1 or 2 length bytes Store in number of pack-length-bytes in keyseg->bit_start myisam/mi_dbug.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_dynrec.c: Add support for VARCHAR with 1 or 2 length bytes (old code in _mi_rec_unpack() didn't really work with VARCHAR's) myisam/mi_key.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_open.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_packrec.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_search.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test1.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test3.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test_all.res: Update results myisam/mi_unique.c: Add support for VARCHAR with 1 or 2 length bytes myisam/myisampack.c: Add support for VARCHAR with 1 or 2 length bytes mysql-test/include/varchar.inc: Added more tests mysql-test/r/bdb.result: Update results after new tests mysql-test/r/information_schema.result: Update results mysql-test/r/innodb.result: Update results mysql-test/r/myisam.result: Update results after new tests mysql-test/r/ps_1general.result: Update results mysql-test/t/bdb.test: Shorter comments mysys/list.c: Add 0x before pointers mysys/my_handler.c: Add support for VARCHAR with 1 or 2 length bytes mysys/raid.cc: Add 0x before pointers sql/field.cc: Add support for VARCHAR with 1 or 2 length bytes sql/field.h: Add support for VARCHAR with 1 or 2 length bytes sql/field_conv.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_berkeley.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_heap.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_myisam.cc: Ensure that enable_indexes() will report an error if it fails Enable VARCHAR packing for MyISAM files sql/item_sum.cc: Change key_cmp -> cmp() as we are comparing fields, not key segements sql/opt_range.cc: Add support for VARCHAR with 1 or 2 length bytes Change range_end to call ha_index_or_rnd_end() as in some error cases we may be in rnd mode when we abort sql/sql_base.cc: Remove compiler warning sql/sql_parse.cc: Move length checking code to sql_table.cc (as we don't have character set for fields at this stage) sql/sql_select.cc: Add support for VARCHAR with 1 or 2 length bytes Ensure that we report an error if we get an error while writing to internal temporary tables sql/sql_select.h: Add support for VARCHAR with 1 or 2 length bytes sql/sql_show.cc: Fix typo in comment sql/sql_table.cc: Don't use new table generated by ALTER TABLE if index generation fails vio/vio.c: Fixed DBUG info vio/viosocket.c: Fixed DBUG info vio/viossl.c: Fixed DBUG info vio/viosslfactories.c: Fixed DBUG info
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-183-7/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0 sql/mysqld.cc: Auto merged sql-common/client.c: Auto merged
| | * | | | | | BUG#7384 IM fails to compile on Solaris.unknown2004-12-183-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solaris doesn't define INADDR_NONE macro. This resulted in compilation failure. (advanced fix) include/my_net.h: Added INADDR_NONE define sql-common/client.c: removed INADDR_NONE define as it is moved to my_net.h sql/mysqld.cc: add my_net.h define and remove INADDR_NONE
| * | | | | | | More work on truncations in libmysql: after-review fixes.unknown2004-12-183-67/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysql/libmysql.c: More post-review fixes for truncation patch: - use my_strtoll10 - workaround for Intel FPU executive precision feature - one case when we didn't report possible truncation fixed. strings/my_strtoll10.c: Fix a comment. tests/client_test.c: One more test now passes
| * | | | | | | InnoDB: fix a compilation error due to missing typedef (Bug #7383)unknown2004-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rem0rec.ic: Replace (int16_t) with (signed short). innobase/include/rem0rec.ic: Replace (int16_t) with (signed short).
| * | | | | | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-174-5/+67
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-5.0
| | * | | | | | | Truncations patch: a post-review fix. unknown2004-12-184-5/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysql.h: Adding an option for data truncations feature. libmysql/libmysql.c: No 'smart' behaviour now for data truncations: they are always reported, unless switched off with mysql_options(mysql, MYSQL_REPORT_DATA_TRUNCATION, (my_bool*) &(option=1)); sql-common/client.c: Add support for report-data-truncation variable in my.cnf tests/client_test.c: A test for MYSQL_REPORT_DATA_TRUNCATION option.
| * | | | | | | | page0page.ic:unknown2004-12-171-13/+13
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz innobase/include/page0page.ic: Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz
| * | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-172-11/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0
| | * | | | | | | Fixing compile-time failures in recently pushed code (aCC, Sun Studio)unknown2004-12-172-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug#7381) libmysql/libmysql.c: Fixing compile-time failures in recently pushed code (aCC) tests/client_test.c: Fix a couple of -pedantic warnings.
| * | | | | | | | Merge mysql.com:/space/my/mysql-5.0unknown2004-12-1758-357/+1769
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0-build
| | * \ \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-1758-357/+1769
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0
| | | * | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-1720-33/+435
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new
| | | | * | | | | | Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-1720-33/+435
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.local:/home/kaa/src/mysql-5.0 configure.in: Auto merged sql/ha_innodb.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
| | | | | * | | | | | Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0unknown2004-12-1420-33/+435
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | | * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-1727-40/+1050
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new sql/field.h: Auto merged sql/handler.h: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged
| | | | * | | | | | | bit typeunknown2004-12-1727-40/+1050
| | | | | | | | | | |
| | | * | | | | | | | The BIT patch by ramil causes that the old data type BIT is nounknown2004-12-1711-284/+284
| | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | longer available for most storage engines. Therefore column c18 BIT is switched TINYINT . mysql-test/include/ps_conv.inc: updated comment mysql-test/include/ps_create.inc: replaced the data type bit with tinyint mysql-test/r/ps_1general.result: updated results mysql-test/r/ps_2myisam.result: updated results mysql-test/r/ps_3innodb.result: updated results mysql-test/r/ps_4heap.result: updated results mysql-test/r/ps_5merge.result: updated results mysql-test/r/ps_6bdb.result: updated results mysql-test/r/ps_7ndb.result: updated results mysql-test/t/ps_4heap.test: replaced the data type bit with tinyint mysql-test/t/ps_5merge.test: replaced the data type bit with tinyint
| * | | | | | | | | - typo fixunknown2004-12-171-1/+1
| | | | | | | | | |
| * | | | | | | | | - make sure to include sql/share/errmsg.txt into the source distributionunknown2004-12-171-0/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/share/Makefile.am: - make sure to include errmsg.txt into the source distribution
| * | | | | | | | - added file innobase/include/trx0xa.h which was missing from the sourceunknown2004-12-171-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | distribution when running "make dist" innobase/include/Makefile.am: - added file trx0xa.h which was missing from the source distribution when running "make dist"
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-172-7/+13
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-172-7/+13
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0
| | | * | | | | | Fix for pekka's IM compilation failure at ndb.mysql.comunknown2004-12-172-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/mysql_connection.cc: move constructor to .cc file server-tools/instance-manager/mysql_connection.h: move constructor to .cc file
| * | | | | | | | 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