1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-05 01:43:31 +03:00
Commit Graph

15958 Commits

Author SHA1 Message Date
unknown
760bd9d166 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  bodhi.local:/opt/local/work/mysql-4.1-runtime


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
2006-11-29 02:39:17 +03:00
unknown
3aca00e105 rpl_init_slave.result:
Update test result due to fix for bug 23883.


mysql-test/r/rpl_init_slave.result:
  Update test result due to fix for bug 23883.
2006-11-28 16:39:04 -07:00
unknown
b4aab15272 Bug#20836 Selecting into variables results in wrong results being returned
This error is displayed anytime the SELECT statement needs a temp table to
return correct results because the object (select_dumpvar) that represents
variables named in the INTO clause stored the results before the temp
table was considered.  The problem was fixed by creating the necessary
Item_func_set_user_var objects once the correct data is ready.


mysql-test/r/distinct.result:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Added results
mysql-test/t/distinct.test:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Added various Selects that use the INTO statement and a temp table.
  - Added Select Into Outfile variant tests also.
sql/sql_class.cc:
  Bug#20836 Selecting into variables results in wrong results being returned
  - The select_dumpvar variable created a Item_func_set_user_var too early
  and once set, it was not possible to change.  The Item_func_set_user_var
  is now created once the final results are available.
sql/sql_class.h:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Removed unnecessary object members.
2006-11-28 17:21:39 -05:00
unknown
a5aa9f64fe Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 23:12:22 +01:00
unknown
89135f3424 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 23:12:12 +01:00
unknown
3cd30397a1 Remove the moved check a second time.
mysql-test/mysql-test-run.pl:
  Remove the moved check
2006-11-28 23:09:17 +01:00
unknown
1e875747ad Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 23:07:02 +01:00
unknown
b3273629e2 Move the check that $opt_vardir could be created and was writable to the function
where we know how to creat the vardir 
Remove unused variable
2006-11-28 23:06:06 +01:00
unknown
38da90cc2d Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/t/mysql.test:
  Auto merged
2006-11-28 22:35:00 +01:00
unknown
19daf5d970 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
plugin/fulltext/plugin_example.c:
  e
  C
sql/field.h:
  e
2006-11-28 22:22:52 +01:00
unknown
f3aec87e84 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 22:19:07 +01:00
unknown
6e36d3c501 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 22:17:26 +01:00
unknown
a7bad254ba Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 22:16:52 +01:00
unknown
e789cdaa9d Bug#24335 mysql-test-run.pl fails with ActiveState Perl on Windows
- Avoid use of mtr_run when executing "mysqld --verbose --help" to find
   version and supported features


mysql-test/mysql-test-run.pl:
  Don't use mtr_run when executing "mysqld --verbose --help" to find
  version and supported features.
2006-11-28 22:16:31 +01:00
unknown
27f9c2c1a9 Fix missing parameter declaration 2006-11-28 21:57:42 +01:00
unknown
7e14b6cb54 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


Docs/Makefile.am:
  Auto merged
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge
2006-11-28 21:20:56 +01:00
unknown
befbebcfdb Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
2006-11-28 21:11:05 +01:00
unknown
bd4c0c1175 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-28 15:08:16 -05:00
unknown
c789301fcd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_deadlock.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
include/my_sys.h:
  Manual merge, my_getpagesize broken out of "#ifdef HAVE_SYS_MMAN_H"
2006-11-28 20:59:57 +01:00
unknown
48bbae0ce1 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 20:52:06 +01:00
unknown
8143ab2357 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Manual merge
2006-11-28 20:51:09 +01:00
unknown
e3a9d94935 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 20:00:54 +01:00
unknown
e8d8ddadac Look for client binaries also in bin/ directory 2006-11-28 20:00:27 +01:00
unknown
0986645202 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 19:55:29 +01:00
unknown
90c57042b6 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 19:54:52 +01:00
unknown
c5f7e0789f Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 19:54:37 +01:00
unknown
92ac0e73dd Create new function "run_testcase_mark_logs' and use it to mark start of testcase
in all cuurently known log files
2006-11-28 19:54:16 +01:00
unknown
d7403d0ac3 Merge kahlann.erinye.com:/home/df/mysql/build/51
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
2006-11-28 19:53:43 +01:00
unknown
4d72503770 Tell mysqld where to put the log file 2006-11-28 19:12:59 +01:00
unknown
216f9faf2b Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/work/my51-work


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/rpl_000015.result:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-11-28 19:12:05 +01:00
unknown
bb4b8d381d Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 19:11:02 +01:00
unknown
a60fe75f54 Only force mysqld to use log file up until 5.1.6
After that it will by default use log tables. That setting can be overruled
by adding a -master.opt file like mysql_client_test has.
2006-11-28 19:10:39 +01:00
unknown
be820c11d0 Revert charset breakage. 2006-11-28 13:08:41 -05:00
unknown
a18d3effc0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
2006-11-28 18:31:53 +01:00
unknown
a9173ec999 Fix for bug#24395:
ALTER TABLE DISABLE KEYS doesn't work when modifying the table
  
ENABLE|DISABLE KEYS combined with another ALTER TABLE option, different
than RENAME TO did nothing. Also, if the table had disabled keys
and was ALTER-ed then the end table was with enabled keys.
  
Fixed by checking whether the table had disabled keys and enabling them
in the copied table.


myisam/mi_open.c:
  Extend mi_indexes_are_disabled to implement return value
  2 - Non-unique indexes are disabled
mysql-test/r/alter_table.result:
  update result
mysql-test/t/alter_table.test:
  update test
sql/sql_table.cc:
  When ENABLE|DISABLE index is combined with another option
  different than RENAME TO, we should ENABLE|DISABLE the keys of
  the modified table. Also when modifying we should preserve the
  previous state of the indices.
  (This problem exists in 5.0 and 5.1 but since the codebase has
  diverged, this fix won't automerge, but the fix will be quite
  similar).
2006-11-28 18:27:32 +01:00
unknown
b25659d9d9 Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
into  kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043


sql/sp.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  - Merged; moved comments to end of file
mysql-test/t/rpl_sp.test:
  - Merged; added comments to end of file
2006-11-28 17:34:03 +01:00
unknown
95b7215869 Merge bk-internal:/home/bk/mysql-5.1
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged
2006-11-28 17:14:16 +01:00
unknown
852d378057 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B24156-5.0-opt
2006-11-28 18:09:15 +02:00
unknown
762f4ac167 Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
statements
Currently the optimizer evaluates loose index scan only for top-level SELECT
statements
Extend loose index scan applicability by :
 - Test the applicability of loose scan for each sub-select, instead of the
   whole query. This change enables loose index scan for sub-queries.
 - allow non-select statements with SELECT parts (like, e.g. 
   CREATE TABLE .. SELECT ...) to use loose index scan.


mysql-test/r/group_min_max.result:
  Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
             statements
   - test case
mysql-test/t/group_min_max.test:
  Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
             statements
   - test case
sql/opt_range.cc:
  Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
             statements
   - loose index scan will be tried over the current subselect 
     (lex->current_select) instead of the whole query (lex->select_lex).
   - allow non-select statements with SELECT parts (like, e.g. 
     CREATE TABLE .. SELECT ...) to use loose index scan.
2006-11-28 18:06:47 +02:00
unknown
530b583038 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 16:25:41 +01:00
unknown
c4558b8829 Remove the check for writable var dir, it has to be done later on 2006-11-28 16:24:31 +01:00
unknown
f3d2382ed8 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 16:23:13 +01:00
unknown
039f806afe Add warnings and more error checks in the creation of vardirs 2006-11-28 16:22:59 +01:00
unknown
9a87702b03 Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE EXISTS"
- CREATE PROCEDURE stores database name based on query context instead
  of 'current database' as set by 'USE' according to manual.
  The bug reporter interpret the filtering statements as bug for
   DROP PROCEDURE based on this behavior.
- Removed the code which changes db context.
- Added code to check that a valid db was supplied.  


mysql-test/r/rpl_sp.result:
  - Added test case (result)
mysql-test/t/rpl_sp.test:
  - Added test case
sql/sp.cc:
  - Removed code for changing current db context.
sql/sql_parse.cc:
  - Added code to check if a valid db was supplied.
2006-11-28 16:03:53 +01:00
unknown
d55f97d43d Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 15:54:23 +01:00
unknown
df75d387ef Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-28 15:52:18 +01:00
unknown
dc48e348d4 Some more checks to avoid removing unwanted directories. 2006-11-28 15:51:52 +01:00
unknown
6ee057c676 No need to have a "created_by_mem" file, just read the link and
if that is same as opt_mem it can be removed
2006-11-28 15:39:23 +01:00
unknown
3bf4108ea9 Rename function datadir_setup to datadir_list_setup to avoid mixup
with the function where vardir's are created
2006-11-28 15:15:01 +01:00
unknown
bce65bf41b Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B11927-5.0-opt


mysql-test/r/func_gconcat.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_string.h:
  Auto merged
2006-11-28 15:47:53 +02:00