summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-06-051-2/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 client/mysqldump.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-05-281-2/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt client/mysqldump.c: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged sql/field.h: Auto merged sql/item_func.cc: Auto merged sql/my_decimal.h: Auto merged sql/sql_base.cc: Auto merged
| | * Fixed bug #28522:unknown2007-05-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes `mysqldump --hex-blob' overruned output buffer by '\0' byte. The dump_table() function has been fixed to reserve 1 byte more for the last '\0' byte of dumped string. client/mysqldump.c: Fixed bug #28522. The dump_table() function has been fixed to reserve 1 byte more for the last '\0' byte of dumped string. mysql-test/t/mysqldump.test: Updated test case for bug #28522. mysql-test/r/mysqldump.result: Updated test case for bug #28522.
* | | Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maintunknown2007-06-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
| * | | Move code after variable delcarationunknown2007-06-011-1/+1
| | | |
* | | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-06-011-34/+205
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
| * \ \ \ Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_valueunknown2007-06-011-34/+205
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497 client/mysqltest.c: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged
| | * | Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test ↵unknown2007-06-011-34/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failures - Add funtion "query_get_value to allow reading a fields value into a $variable client/mysqltest.c: - Add function "let $var= query_get_value(<query>,<colname>,<row>)" making it possible to read a value from a specific field in a query into a $variable. mysql-test/r/mysqltest.result: Add test cases for "query_get_value" mysql-test/t/mysqltest.test: Add test cases for "query_get_value"
* | | | mysqldump.c:unknown2007-05-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix harmless typo (caught thanks to warning) client/mysqldump.c: Fix harmless typo (caught thanks to warning)
* | | | Bug #24733 RESET MASTER run before dump with --delete-master-logsunknown2007-05-271-4/+53
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed by using flush logs, dumping, then doing PURGE MASTER LOGS TO 'binfile', instead of deleting the log files at the beginning. NOTE: previously the delete-master-logs would reset the log names back to filename.00001. Now the trailing number doesn't get reset. This may need to be documented. client/mysqldump.c: changed the code the --delete-master-logs option is used from this: take locks delete bin logs do dump (if this is a lock-based dump) release locks do dump (if this is a consistent-read-dump) to this: take locks flush logs remember the name of the new log do dump (if this is a lock-based dump) release locks do dump (if this is a consistent-read-dump) fflush output sql file if specified, to ensure the backup is commited to disk --- yes, dump succeeded --- do PURGE MASTER LOGS TO up to the new log
* | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-05-181-6/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-05-181-6/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: SCCS merged
| | * | WL#2247 mysqltest: add option for sorting resultsunknown2007-05-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Final touchups client/mysqltest.c: Final touch ups, rename sorted_results to sorted_result mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Update results with additional subtests for empty result set, NULL values and 1024 rows
| | * | WL#2247 mysqltest: add option for sorting resultsunknown2007-05-161-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change from "query_sorted <query>" to "sorted_results" client/mysqltest.c: Replace "query_sorted <query>" with the ability to turn on "one shot result sorting" with the command "sorted_results" mysql-test/r/mysqltest.result: Update test and result mysql-test/t/mysqltest.test: Update test and result
* | | | Merge siva.hindu.god:/home/tsmith/m/bk/50unknown2007-05-171-7/+7
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/50 mysql-test/r/type_datetime.result: Auto merged mysql-test/t/outfile.test: Auto merged mysql-test/t/type_datetime.test: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/my_decimal.h: Auto merged sql/mysql_priv.h: Auto merged sql/sp.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged
| * | Format corrections for various "Makefile.am": Leading tab, no trailing blank.unknown2007-05-021-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. libmysqld/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. netware/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. scripts/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. win/Makefile.am: After a backslash (to mark a continuation line) there must not be a trailing blank.
* | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-05-161-0/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
| * | Bug#28470 mysqltest scripts need to know protocolunknown2007-05-161-0/+5
| | | | | | | | | | | | | | | client/mysqltest.c: Make it possible for test scripts to know what protocol is being used
* | | Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ↵unknown2007-05-161-2/+8
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ever setting it - mysqldump generated output that set OLD_SQL_MODE twice, to different values (for triggers), or not at all (for routines) in some cases. client/mysqldump.c: Only save SQL_MODE in dump_triggers if in --compact mode. Otherwise, it's already been saved in write_header(). Likewise for dumpe_routines, where it was never saved. mysql-test/r/mysqldump.result: mysqldump output has subtly changed. Adjust test-results. This also shows OLD_SQL_MODE is always set exactly once now
* | Bug#27293: mysqldump crashes when dumping procedure defined by different userunknown2007-04-301-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqldump didn't properly handle getting no data on SHOW CREATE PROCEDURE. If S/C/P fails (due to dumping user's insufficient privileges on mysql.proc, say), mysqldump will print a comment to that effect to the output and return an error-code. If the -f (force) option is used, the dump will continue, otherwise, it will abort right there and then. Also fixes Bug#22761, "mysqldump reports no errors when using --routines without mysql.proc privileges" --- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into mysql.com:/home/tnurnberg/27293/50-27293 client/mysqldump.c: Bug#27293: mysqldump crashes when dumping procedure defined by different user handle failure of SHOW CREATE PROCEDURE, give user diagnostics, heed -f (force) option mysql-test/r/mysqldump.result: Bug#27293: mysqldump crashes when dumping procedure defined by different user show that trying to mysqldump --routines with insufficient privileges will no longer crash the client --- manual merge mysql-test/t/mysqldump.test: Bug#27293: mysqldump crashes when dumping procedure defined by different user show that trying to mysqldump --routines with insufficient privileges will no longer crash the client --- manual merge
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-04-231-0/+14
|\ \ | | | | | | | | | | | | | | | into recycle.(none):/src/bug24732/my50-bug24732
| * | Bug#24732 Executables do not include Vista manifestsunknown2007-04-231-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added script to generate application specific manifest. - Added new CMake MACRO to add customer build events which will first generate a manifest and then embeds that manifest into an executable. BitKeeper/etc/ignore: Bug#24732 Executables do not include Vista manifests - Revise ignore rules to disallow auto-generated cmake files but to allow custom macros defined in a .cmake file. CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Added logic for EMBED_MANIFESTS configuration option. client/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for client executables. extra/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for my_print_default executable. libmysql/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for myTest executable. myisam/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for myisam executables. server-tools/instance-manager/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for mysqlmanager executable. sql/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for mysqld executable. win/README: Bug#24732 Executables do not include Vista manifests - Added new configuration option documentation. win/configure.js: Bug#24732 Executables do not include Vista manifests - Added new EMBED_MANIFESTS configuration option. win/create_manifest.js: Bug#24732 Executables do not include Vista manifests - Manifest generator. This script generates a basic manifest. win/mysql_manifest.cmake: Bug#24732 Executables do not include Vista manifests - Define new CMake MACRO for adding Windows manifests to executables.
* | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0unknown2007-04-231-0/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysql.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
| * | Merge romeo.(none):/home/bkroot/mysql-5.0-rplunknown2007-04-201-0/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into romeo.(none):/home/bk/merge-mysql-5.0 client/mysql.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sql_class.cc: Auto merged
| | * \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rplunknown2007-04-101-0/+11
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge sql/mysql_priv.h: Auto merged
| | | * | bug#27608 XML output is not well-formedunknown2007-04-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: output was empty if the result is empty. Fix: print XML header and footer, even if the result is empty, to produce well-formed XML output. client/mysql.cc: Print header and footer even on empty set, when --xml mysql-test/r/client_xml.result: Adding test case mysql-test/t/client_xml.test: Adding test case
* | | | | Use a temp variable "error" for storing return code of pcloseunknown2007-04-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so the WEXITSTATUS macro can "fiddle" with it as it so pleases
* | | | | It's not possible to use the return value of fputs unknown2007-04-231-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to check if the creation of mysql_upgrade_info suceeded. Instead use 'upgrade_already_done' to check that file was created properly.
* | | | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-04-233-552/+631
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint Makefile.am: Auto merged client/mysql_upgrade.c: Auto merged sql/mysql_priv.h: Auto merged tests/mysql_client_test.c: Auto merged
| * | | | | Remove commentunknown2007-04-201-1/+1
| | | | | |
| * | | | | mysql_upgrade portability fixesunknown2007-04-191-76/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql_upgrade.c: Add defines for WEXITSTATUS Pass arguments on command line instead of --defaults-file=<temp file> mysql-test/r/mysql_upgrade.result: When testing that mysql_upgrade detect if mysqlcheck fails, use an option that is used on all platforms. mysql-test/t/mysql_upgrade.test: When testing that mysql_upgrade detect if mysqlcheck fails, use an option that is used on all platforms. scripts/comp_sql.c: Some compilers have a max string length, insert a newline at every 512th char in long strings
| * | | | | mysql_upgrade depends on GenFixPrivsunknown2007-04-191-0/+1
| | | | | |
| * | | | | mysql_upgrade win fixesunknown2007-04-191-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql_upgrade.c: Windows fix scripts/CMakeLists.txt: Fix problems with CMakeList causing build to fail scripts/comp_sql.c: Improve comp_sql.c to generate output file with shorter strings
| * | | | | Remove the check for value_start(if any it should be *value_start)unknown2007-04-181-1/+1
| | | | | |
| * | | | | Use my_snprintf instead of snprintfunknown2007-04-181-3/+3
| | | | | |
| * | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-181-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
| | * | | | Use my_snprintf instead of snprintfunknown2007-04-181-1/+1
| | | | | |
| * | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-181-9/+19
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
| | * | | | Add mysql builtin $MYSQL_SERVER_VERSION and some function to makeunknown2007-04-181-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it easier to set a variable from string or int
| * | | | | Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgradeunknown2007-04-181-541/+647
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union CMakeLists.txt: Auto merged Makefile.am: Auto merged include/my_global.h: Auto merged sql/mysql_priv.h: Auto merged
| | * | | | | Bug#25452 mysql_upgrade access deniedunknown2007-04-181-541/+647
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improve mysql_upgrade and add comments describing it's logic - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade was started from - Don't look for mysql_fix_privilege_tables.sql randomly, compile in the mysql_fix_privilege_tables.sql file and use that to upgrade the system tables of MySQL - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL - Fix bug#26639, bug#24248 and bug#25405 BitKeeper/etc/ignore: Added scripts/comp_sql scripts/mysql_fix_privilege_tables_sql.c to the ignore list CMakeLists.txt: Build files also in scripts/ Makefile.am: Build scripts/ a little earlier to make the scripts/mysql_fix_privilege_tables_sql.c file available when client/ is built client/mysql_upgrade.c: Updated version of mysql_upgrade with comments and logical functions include/my_global.h: Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h mysql-test/r/mysql_upgrade.result: Update result mysql-test/t/mysql_upgrade.test: Add more tests for different bugs related to mysql_upgrade scripts/Makefile.am: Build comp_sql and mysql_fix_privilege_tables_sql.c sql/mysql_priv.h: Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h scripts/CMakeLists.txt: New BitKeeper file ``scripts/CMakeLists.txt'' scripts/comp_sql.c: New BitKeeper file ``scripts/comp_sql.c''
* | | | | | | Merge mysql.com:/home/ram/work/mysql-5.0-maintunknown2007-04-191-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b26851/b26851.5.0 client/mysql.cc: Auto merged
| * | | | | | | Fix for unknown2007-04-161-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug #27715: mysqld --character-sets-dir buffer overflow bug ##26851: Mysql Client --pager Buffer Overflow Using strmov() to copy an argument may cause overflow if the argument's length is bigger than the buffer: use strmake instead. Also, we have to encrease the error message buffer size to fit the longest message. client/mysql.cc: Fix for bug #27715: mysqld --character-sets-dir buffer overflow bug ##26851: Mysql Client --pager Buffer Overflow - use strmake() instead of strmov() to avoid buffer overflow. mysql-test/r/mysql.result: Fix for bug #27715: mysqld --character-sets-dir buffer overflow bug ##26851: Mysql Client --pager Buffer Overflow - test result. mysql-test/t/mysql.test: Fix for bug #27715: mysqld --character-sets-dir buffer overflow bug ##26851: Mysql Client --pager Buffer Overflow - test case. mysys/charset.c: Fix for bug #27715: mysqld --character-sets-dir buffer overflow bug ##26851: Mysql Client --pager Buffer Overflow - encrease error message buffer size to fit the (possible) longest message.
* | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/50unknown2007-04-181-71/+193
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/50 mysys/my_alloc.c: Auto merged sql/mysqld.cc: Auto merged
| * | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-101-3/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
| | * | | | Take into account wether vertical_results are in effectunknown2007-04-101-1/+1
| | | | | |
| | * | | | Init dying to 1 just after passing the guardunknown2007-04-101-0/+1
| | | | | |
| | * | | | Add OPT_LOG_DIRunknown2007-04-101-2/+2
| | | | | |
| * | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-101-4/+11
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Manual merge
| | * | | | Add --logdir option ot mysqltestunknown2007-04-101-5/+12
| | | | | |
View Lorry Controller Status