summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal:/home/bk/mysql-5.0clone-5.0.18-buildunknown2005-12-212-8/+8
|\ | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.0 sql/sql_trigger.cc: Auto merged
| * BUG#15842: Change in "item.cc" adding Item_sp_variable breaks compile on ↵unknown2005-12-212-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | HP-UX 11.23 Fix: make explicit conversion to non-constant string (char *). Backported from 5.1 changeset 1.1968 05/12/19 17:36:20 kent@mysql.com +2 -0 sql/item.cc: Make explicit conversion to non-constant string (char *). sql/sql_trigger.cc: Make explicit conversion to non-constant string (char *).
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-213-10/+38
|\ \ | |/ |/| | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-bg14836
| * Fix for bug #14863 "Triggers: crash if create and there is no current database".unknown2005-12-113-10/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now when we create or drop trigger we check that both trigger name and trigger table always have database part specified. Thus we give an error if it they are not specified explicitly or implicitly via current database. mysql-test/r/trigger.result: Added test for bug #14863 "Triggers: crash if create and there is no current database". mysql-test/t/trigger.test: Added test for bug #14863 "Triggers: crash if create and there is no current database". sql/sql_trigger.cc: mysql_create_or_drop_trigger(): Now we check that both trigger name and trigger table have database part specified (explicitly or implicitly via current database. Note that in latter case sp_name::m_db is already set by parser). Table_triggers_list::create_trigger()/::add_table_for_trigger(): Simplified method/function's code since now they can assume that sp_name::m_db is always filled now. trigname_file_parameters: Removed comment which is no longer true.
* | Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-201-1/+5
|\ \ | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| * | Bug #15772 Aborted YaSSL connections force threads into busyloopsunknown2005-12-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Report error when there is nothing to read after wait. extra/yassl/src/handshake.cpp: Report error if there is nothing to read after a blocking read
* | | errmsg.txt:unknown2005-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix typo. sql/share/errmsg.txt: Fix typo.
* | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-191-9/+14
|\ \ \ | |/ / |/| | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| * | Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-181-9/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | * \ Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-161-9/+14
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | * \ Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-141-9/+14
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | | * \ Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-1312-14/+282
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | | * \ \ Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-126-15/+50
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | | * \ \ \ Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-121-9/+14
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | | | * \ \ \ Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0unknown2005-12-121-9/+14
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/tmp/mysql-5.0
| | | | | | * | | | mysqltest.c:unknown2005-12-121-9/+14
| | | | | | | |_|/ | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put options in proper order. client/mysqltest.c: Put options in proper order.
* | | | | | | | | Fix for bug#14271 I_S: columns has no size for (var)binary columnsunknown2005-12-193-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set character_octet_length, character_maximum_length for binary and varbinary field types mysql-test/r/information_schema.result: Fix for bug#14271 I_S: columns has no size for (var)binary columns test case mysql-test/t/information_schema.test: Fix for bug#14271 I_S: columns has no size for (var)binary columns test case
* | | | | | | | | Fix for bug#14861 aliased column names are not preserved.unknown2005-12-193-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create tmp table filed using original item name when it's necessary mysql-test/r/view.result: Fix for bug#14861 aliased column names are not preserved. test case mysql-test/t/view.test: Fix for bug#14861 aliased column names are not preserved. test case
* | | | | | | | | Bug#12770 DESC cannot display the info. about temporary tableunknown2005-12-193-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#14387 SHOW COLUMNS doesn't work on temporary tables. Bug#15224 SHOW INDEX from temporary table doesn't work. Restore thd->temporary_tables to be able to process temporary tables(only for 'show index' & 'show columns'). This should be changed when processing of temporary tables for I_S tables will be done. mysql-test/r/information_schema.result: Bug#12770 DESC cannot display the info. about temporary table Bug#14387 SHOW COLUMNS doesn't work on temporary tables. Bug#15224 SHOW INDEX from temporary table doesn't work. test case mysql-test/t/information_schema.test: Bug#12770 DESC cannot display the info. about temporary table Bug#14387 SHOW COLUMNS doesn't work on temporary tables. Bug#15224 SHOW INDEX from temporary table doesn't work. test case
* | | | | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/5.0/mainunknown2005-12-194-27/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
| * \ \ \ \ \ \ \ \ Merge mysql.com:/home/stewart/Documents/MySQL/4.1/cleanupunknown2005-12-064-27/+25
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
| | * | | | | | | | | Backup.cpp:unknown2005-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert comment to english ndb/src/kernel/blocks/backup/Backup.cpp: convert comment to english
| | * | | | | | | | | DblqhMain.cpp:unknown2005-11-301-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient. Makes it easier to grep for senders of signals to specific blocks ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.
| | * | | | | | | | | DbdihMain.cpp:unknown2005-11-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error
| | * | | | | | | | | ndb_size.pl:unknown2005-11-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix incorrect quoting of column name ndb/tools/ndb_size.pl: fix incorrect quoting of column name
| | * | | | | | | | | fix spuling mastaeke.unknown2005-11-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goup is not needed to run cluster ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: s/ownNodeGoup/ownNodeGroup/
| | * | | | | | | | | DbdihMain.cpp:unknown2005-11-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | management server performs this check on configuration. If we get this far with something incorrect, something is very wrong. ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: management server performs this check on configuration. If we get this far with something incorrect, something is very wrong.
* | | | | | | | | | | mysql-test-run.pl:unknown2005-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Script "my_print_defaults" is to be searched for as executable mysql-test/mysql-test-run.pl: Script "my_print_defaults" is to be searched for as executable
* | | | | | | | | | | Mergeunknown2005-12-185-5/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_basic.result: Auto merged mysql-test/r/ndb_multi.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged mysql-test/t/ndb_multi.test: Auto merged sql/sql_class.cc: Auto merged
| * | | | | | | | | | Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure ↵mysql-5.0.17unknown2005-12-145-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. mysql-test/r/rpl000001.result: Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. - accept 2013 error as well. mysql-test/t/flush_read_lock_kill.test: Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. - accept 2013 error as well. mysql-test/t/rpl000001.test: Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. - accept 2013 error as well. mysql-test/t/rpl_error_ignored_table.test: Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. - accept 2013 error as well. sql/sql_class.cc: Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX and bug #15668: Test 'sp-error' crashes server on Mac OS X. - don't call the close_active_vio() in case of KILL_QUERY.
| * | | | | | | | | | Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictableunknown2005-12-142-0/+2
| | | | | | | | | | |
| * | | | | | | | | | bug#15682 - ndbunknown2005-12-143-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incorrect handling of varchar in position/rnd_pos Commit for 5.0.17 release clone mysql-test/r/ndb_basic.result: bug#15682 mysql-test/t/ndb_basic.test: bug#15682 sql/ha_ndbcluster.cc: bug#15682
* | | | | | | | | | | Makefile.am:unknown2005-12-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added 5.0 specific build scripts BUILD/Makefile.am: Added 5.0 specific build scripts
* | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1unknown2005-12-181-2/+16
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0 BUILD/Makefile.am: Auto merged
| * \ \ \ \ \ \ \ \ \ \ Mergeunknown2005-12-181-2/+16
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Makefile.am:unknown2005-12-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusted listing of files to put into source TAR
| * | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-174-6/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-153-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1
* | | | | | | | | | | | | | | Fixed default values for counters to 0 unknown2005-12-161-3/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into regul.home.lan:/mnt/md/bk/mysql-5.0
| * | | | | | | | | | | | | | BUG#15805: Disabled test type_time; fails in --ps-protocol mode.unknown2005-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/disabled.def: Disabled test type_time; fails in --ps-protocol mode.
* | | | | | | | | | | | | | | Fixed stress parts in shell and perl versions of mysql-test-run script to ↵unknown2005-12-163-3/+19
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | limit stress testing with 20 test loops in case when any limit parameter was specified mysql-test/lib/mtr_stress.pl: Limit stress testing with 20 test loops in case when any limit parameter was specified mysql-test/mysql-test-run.pl: Limit stress testing with 20 test loops in case when any limit parameter was specified mysql-test/mysql-test-run.sh: Limit stress testing with 20 test loops in case when any limit parameter was specified
* | | | | | | | | | | | | | Merge mysql.com:/home/alexi/dev/mysql-4.1-12440unknown2005-12-153-6/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/dev/mysql-5.0-12440 mysql-test/r/type_time.result: Auto merged ndb/src/ndbapi/NdbImpl.hpp: Auto merged ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged sql-common/my_time.c: Auto merged zlib/Makefile.am: Auto merged
| * | | | | | | | | | | | | Fixed BUG #12440: "Incorrect processing of time values containingunknown2005-12-153-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | long fraction and/or large exponent part". mysql-test/r/type_time.result: Fixed testcases results (bug #12440) mysql-test/t/type_time.test: Added testcases for bug #12440 sql-common/my_time.c: Fixed bug #12440: "Incorrect processing of time values containing long fraction and/or large exponent part". Modified str_to_time(). Process properly fraction part containing more than 6 digits. Check for existence of exponent part which may result from %g formatting applied to time value specified as large real number.
| * | | | | | | | | | | | | Makefile.am:unknown2005-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - libtool wants spaces on parameters for its command line options zlib/Makefile.am: - libtool wants spaces on parameters for its command line options
| * | | | | | | | | | | | | Makefile.am:unknown2005-12-151-0/+2
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0 zlib/Makefile.am: - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0
| * | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-142-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-1416-2/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-12-139-10/+241
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push ndb/src/ndbapi/NdbImpl.hpp: Auto merged ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-1375-346/+813
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
View Lorry Controller Status