summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove dead code: flush_version was never increased in the server,unknown2007-03-016-14/+8
| | | | | | | | | | | | | | | | | | therefore the logic associated with it never worked. sql/ha_partition.cc: Remove dead code. Update comments. sql/mysql_priv.h: Remove dead code (flush_version). sql/mysqld.cc: Remove dead code (flush_version). sql/sql_base.cc: Remove dead code. sql/table.cc: Remove dead code. sql/table.h: Remove dead code.
* Remove DBUG_ASSERT() -- essential functionality can not beunknown2007-02-241-8/+8
| | | | | | | wrapped by DBUG_ASSERT().
* Fix merge.unknown2007-02-241-0/+6
|
* Merge booka.opbmk:/home/alik/Documents/MySQL/devel/5.0-rt-imunknown2007-02-244-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | into booka.opbmk:/home/alik/Documents/MySQL/devel/5.1-rt-im mysql-test/mysql-test-run.pl: Auto merged server-tools/instance-manager/instance_options.cc: Manual merge server-tools/instance-manager/mysqlmanager.cc: Manual merge.
| * Fix for BUG#22511: IM does not remove angel-pid-file on clean shutdownunknown2007-02-241-0/+4
| | | | | | | | | | server-tools/instance-manager/mysqlmanager.cc: Delete IM-angel pid file on exit.
| * IM test suite fix.unknown2007-02-244-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log messages from shell-scripts were put to var/log/<test id>.log file. Now, this file is used by mysql-test-run.pl. So, move log messages to var/log/<test id>.script.log. mysql-test/t/kill_n_check.sh: Log messages from shell-scripts were put to var/log/<test id>.log file. Now, this file is used by mysql-test-run.pl. So, move log messages to var/log/<test id>.script.log. mysql-test/t/log.sh: Log messages from shell-scripts were put to var/log/<test id>.log file. Now, this file is used by mysql-test-run.pl. So, move log messages to var/log/<test id>.script.log. mysql-test/t/wait_for_process.sh: Log messages from shell-scripts were put to var/log/<test id>.log file. Now, this file is used by mysql-test-run.pl. So, move log messages to var/log/<test id>.script.log. mysql-test/t/wait_for_socket.sh: Log messages from shell-scripts were put to var/log/<test id>.log file. Now, this file is used by mysql-test-run.pl. So, move log messages to var/log/<test id>.script.log.
| * Fix shutdown delay option name according to The Manual.unknown2007-02-242-2/+2
| |
* | Fix merge & update result file.unknown2007-02-232-1/+3
| | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: Fix merge. mysql-test/r/im_utils.result: Updated result file.
* | Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-buildunknown2007-02-232-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | into alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/im_daemon_life_cycle.result: Merged.
| * Fix mysql-test-run.pl: IM in 5.0 uses old incorrectunknown2007-02-231-1/+1
| | | | | | | | | | | | | | | | 'shutdown_delay' option name. mysql-test/mysql-test-run.pl: IM in 5.0 uses old incorrect 'shutdown_delay' option name.
| * Fix result file.unknown2007-02-231-1/+1
| |
* | Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-buildunknown2007-02-232-14/+18
|\ \ | |/ | | | | | | | | | | | | | | | | into alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged
| * Fix test for views with national characters,unknown2007-02-232-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which accidentally got broken during the merge on 16-Feb-2007. mysql-test/r/view.result: Updated result file. mysql-test/t/view.test: Fix test for views with national characters, which accidentally got broken during the merge on 16-Feb-2007. Now view.test is in UTF8 character set, so SET NAMES is required.
* | Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rtunknown2007-02-232-7/+13
|\ \ | |/ | | | | | | | | | | | | | | | | into alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Merged.
| * BUG#24415: im_daemon_life_cycle.imtest failsunknown2007-02-232-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | Fix timeouts. Only test suite is changed. mysql-test/mysql-test-run.pl: Decrease MySQL server shutdown delay. Trasactional storage engines are not used here, so it should be enough. mysql-test/t/im_daemon_life_cycle.imtest: Increase wait-timeout.
* | Merge fix.unknown2007-02-222-8/+11
| |
* | Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rtunknown2007-02-225-5/+31
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merge sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/t/disabled.def: Merge: enabled im_daemon_life_cycle.imtest mysql-test/t/view.test: Manual merge. server-tools/instance-manager/listener.cc: Manual merge. server-tools/instance-manager/manager.cc: Manual merge. server-tools/instance-manager/manager.h: Manual merge. server-tools/instance-manager/mysqlmanager.cc: Manual merge. server-tools/instance-manager/thread_registry.cc: Manual merge. server-tools/instance-manager/thread_registry.h: Manual merge.
| * Fix for BUG#24415: Instance manager test im_daemon_life_cycle fails randomly.unknown2007-02-207-22/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cause of im_daemon_life_cycle.imtest random failures was the following behaviour of some implementations of LINUX threads: let's suppose that a process has several threads (in LINUX threads, there is a separate process for each thread). When the main process gets killed, the parent receives SIGCHLD before all threads (child processes) die. In other words, the parent receives SIGCHLD, when its child is not completely dead. In terms of IM, that means that IM-angel receives SIGCHLD when IM-main is not dead and still holds some resources. After receiving SIGCHLD, IM-angel restarts IM-main, but IM-main failed to initialize, because previous instance (copy) of IM-main still holds server socket (TCP-port). Another problem here was that IM-angel restarted IM-main only if it was killed by signal. If it exited with error, IM-angel thought it's intended / graceful shutdown and exited itself. So, when the second instance of IM-main failed to initialize, IM-angel thought it's intended shutdown and quit. The fix is 1. to change IM-angel so that it restarts IM-main if it exited with error code; 2. to change IM-main so that it returns proper exit code in case of failure. mysql-test/t/disabled.def: Enable im_daemon_life_cycle. server-tools/instance-manager/listener.cc: Set error status if Listener failed to initialize. server-tools/instance-manager/manager.cc: Return exit code from the manager. server-tools/instance-manager/manager.h: Return exit code from the manager. server-tools/instance-manager/mysqlmanager.cc: 1. Restart IM-main if exit code is not EXIT_SUCCESS (0). 2. Log IM-main exit code in case of failure. server-tools/instance-manager/thread_registry.cc: Add support for exit code. server-tools/instance-manager/thread_registry.h: Add support for exit code.
| * Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240unknown2007-02-195-2/+27
| |\ | | | | | | | | | | | | | | | | | | | | | into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-runtime sql/sql_parse.cc: Auto merged
| * | Manual mergeunknown2007-02-164-34/+428
| | |
| * | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-baseunknown2007-02-1617-445/+917
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged
| * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-1434-86/+686
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint sql/mysql_priv.h: Auto merged
* | | | | Fix powermacg5 build failure.unknown2007-02-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/angel.cc: Include my_dir.h because MacOS defines mode constants (S_IRUSR, S_IWUSR, ...) in sys/stat.h.
* | | | | Clean up one place that misuses LOCK_open (dead code)unknown2007-02-221-8/+3
| | | | |
* | | | | Merge naruto.:C:/cpp/bug25042/my50-bug25042unknown2007-02-212-39/+122
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into naruto.:C:/cpp/mysql-5.1-runtime mysys/my_wincond.c: Auto merged include/my_pthread.h: SCCS merged
| * | | | | Bug#25042 OPTIMIZE TABLE cause race condition in IO CACHE SHAREunknown2007-02-152-43/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The condition variable implementation "lost" a signal to WaitOnSingleObject when a semaphore was released. - The signal could be consumed by a new call to pthread_cond_wait before all waiting threads had awoken. - The new implementation of pthread_cond_* uses events instead of semaphores. It also uses an extra lock to protect entry into new cond wait before the broadcast has finished. include/my_pthread.h: - New implementatin of pthread_cond_init. This version uses events instead of semaphores mysys/my_wincond.c: - New implementatin of pthread_cond_init. This version uses events instead of semaphores
* | | | | | Polishing:unknown2007-02-204-39/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. use MySQL headers instead of system ones; 2. move logical part of code into a separate function. server-tools/instance-manager/angel.cc: Polishing: try not to use system headers. Use headers from include/ directory when it is possible. server-tools/instance-manager/manager.cc: Polishing: move logical part of code into a separate function. server-tools/instance-manager/manager.h: Polishing: move logical part of code into a separate function. server-tools/instance-manager/mysqlmanager.cc: Polishing: rollback rename.
* | | | | | Fix Windows build.unknown2007-02-201-1/+1
| | | | | |
* | | | | | Fix build failures on Windows and Mac.unknown2007-02-202-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/WindowsService.cpp: Include my_global.h for DBUG_ASSERT. server-tools/instance-manager/mysqlmanager.cc: Include my_dir.h for umask().
* | | | | | Merge kpettersson@bk-internal:/home/bk/mysql-5.1-runtimeunknown2007-02-207-3/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime sql/sql_parse.cc: SCCS merged
| * \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240unknown2007-02-197-4/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged
| | * | | | | | Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00' as ↵unknown2007-02-192-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the date time - Merged from 5.0 - Removed redundant call to set_time(); now included in init_for_queries sql/ha_ndbcluster.cc: Removed redundant call to set_time(); now included in init_for_queries sql/ha_ndbcluster_binlog.cc: Removed redundant call to set_time(); now included in init_for_queries
| | * | | | | | Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240unknown2007-02-195-2/+27
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240 sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged
| | | * | | | | Bug#23240 --init_file statements with NOW() reports '1970-01-01 11:00:00'as ↵unknown2007-02-194-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the date time - Starting time of a query sent by bootstrapping wasn't initialized and starting time defaulted to 0. This later used value by NOW- item and was translated to 1970-01-01 11:00:00. - Marketing the time with thd->set_time() before the call to mysql_parse resolves this issue. - set_time was refactored to be part of the thd->init_for_queries- process. mysql-test/r/init_file.result: Manual merge from 4.1 mysql-test/std_data/init_file.dat: Manual merge from 4.1 sql/sql_class.cc: - Moved set_time into init_for_queries process.
| | | * | | | | Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my41-bug23240unknown2007-02-191-0/+9
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240 mysql-test/t/init_file.test: Auto merged BitKeeper/deleted/.del-init_file.result: Auto merged mysql-test/std_data/init_file.dat: Null merge sql/sql_parse.cc: Null merge
| | | | * | | | Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as ↵unknown2007-02-194-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the date time - Starting time of a query sent by file bootstrapping wasn't initialized and starting time defaulted to 0. This later used value by the Now- item and is translated to 1970-01-01 11:00:00. - marking the time with thd->set_time() before the call to mysql_parse resolves this issue. mysql-test/r/init_file.result: Appended test case mysql-test/std_data/init_file.dat: Appended test case mysql-test/t/init_file.test: Appended test case
* | | | | | | | Fix a merge error (4.1->5.0 merge from 2005)unknown2007-02-191-3/+0
|/ / / / / / /
* | | | | | | Patch for IM in scope of working on BUG#24415: Instance manager testunknown2007-02-1815-349/+651
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | im_daemon_life_cycle fails randomly. 1. Move IM-angel functionality into a separate file, create Angel class. 2. Be more verbose; 3. Fix typo in FLUSH INSTANCES implementation; 4. Polishing. mysql-test/r/im_options.result: Updated result file. mysql-test/t/im_cmd_line.imtest: Updated test. server-tools/instance-manager/IMService.cpp: Move HandleServiceOptions() into IMService::main(). server-tools/instance-manager/IMService.h: Move HandleServiceOptions() into IMService::main(). server-tools/instance-manager/Makefile.am: Added angel.cc and angel.h. server-tools/instance-manager/WindowsService.cpp: Initialize class-members in constructor. server-tools/instance-manager/WindowsService.h: Initialize class-members in constructor. server-tools/instance-manager/commands.cc: Return actual error code (ER_OUT_OF_RESOURCES or ER_THERE_IS_ACTIVE_INSTANCE) from FLUSH INSTANCES. server-tools/instance-manager/manager.cc: 1. Return actual error code from Manager::flush_instances(). 2. Be more verbose. server-tools/instance-manager/manager.h: Return actual error code from Manager::flush_instances(). server-tools/instance-manager/mysqlmanager.cc: Move IM-angel functionality into separate file (angel.cc). server-tools/instance-manager/priv.cc: Use return bool datatype instead int{ 0, 1 }. server-tools/instance-manager/priv.h: Use return bool datatype instead int{ 0, 1 }. server-tools/instance-manager/angel.cc: IM-angel functionality. server-tools/instance-manager/angel.h: IM-angel functionality.
* | | | | | | Manual mergeunknown2007-02-153-134/+320
| | | | | | |
* | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-02-151019-8002/+2021110
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge mysql-test/r/subselect.result: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/subselect.test: Auto merged sql/event_data_objects.cc: Auto merged sql/event_queue.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/set_var.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-1434-164/+718
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint sql/mysql_priv.h: Auto merged
| | * | | | | | Post-merge fixunknown2007-02-132-101/+31
| | | | | | | |
| | * | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-130-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into olga.mysql.com:/home/igor/mysql-5.1-opt BitKeeper/etc/gone: auto-union mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged mysys/my_getopt.c: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged
| | | * | | | | Post-merge fixunknown2007-02-132-2/+0
| | | | | | | |
| | | * | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-02-1334-86/+688
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt BitKeeper/etc/gone: auto-union mysys/my_getopt.c: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/select.result: Manual merge mysql-test/t/select.test: Manual merge
| | * | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-02-1330-94/+683
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into olga.mysql.com:/home/igor/mysql-5.1-opt BitKeeper/etc/gone: auto-union mysys/my_getopt.c: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/select.result: SCCS merged mysql-test/t/select.test: SCCS merged
| | | * \ \ \ \ \ Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-133-14/+52
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into olga.mysql.com:/home/igor/mysql-5.1-opt mysql-test/r/view.result: Auto merged sql/sql_select.cc: Auto merged mysql-test/t/view.test: Manual merge
| | | | * | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-123-8/+46
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26209 sql/sql_select.cc: Auto merged
| | | | | * | | | | Fixed bug #26209.unknown2007-02-113-8/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function make_unireg_sortorder ignored the fact that any view field is represented by a 'ref' object. This could lead to wrong results for the queries containing both GROUP BY and ORDER BY clauses. mysql-test/r/view.result: Added a test case for bug #26209. mysql-test/t/view.test: Added a test case for bug #26209.
| | | * | | | | | | Post-merge fix.unknown2007-02-1310-46/+31
| | | | | | | | | |
View Lorry Controller Status