1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Commit Graph

13691 Commits

Author SHA1 Message Date
unknown
caddb5ea53 Fixed 'Unknown error' when doing ORDER BY on reference table which
was used with NULL value on NOT NULL column. (Bug #479)


mysql-test/r/order_by.result:
  Update of results
mysql-test/t/order_by.test:
  Test of new code
sql/sql_select.cc:
  Fixed problem with lookup on NULL
2003-06-29 21:15:51 +03:00
unknown
b871e549ee merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-06-29 15:35:48 +03:00
unknown
f90e82f959 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-06-29 14:15:38 +03:00
unknown
e224c1238d SET CHARACTER SET DEFAULT didn't work (Bug #462)
BUILD/compile-pentium-debug-max:
  Removed -DBIG_TABLES because of problems with gdb 5.3
sql/set_var.cc:
  SET CHARACTER SET DEFAULT didn't work
sql/set_var.h:
  SET CHARACTER SET DEFAULT didn't work
2003-06-29 12:58:43 +03:00
unknown
376bada7f9 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-29 00:34:47 +02:00
unknown
1bf6de2c35 fixed bug #745
(resolving fields of reduced subselect)


mysql-test/r/subselect.result:
  test of bug #745
mysql-test/t/subselect.test:
  test of bug #745
sql/sql_union.cc:
  to get chance of outer resolved_fields resolve fields of result table as usual fileds
2003-06-28 17:04:26 +03:00
unknown
6a854da78c Merge
sql/item.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-06-28 14:32:06 +03:00
unknown
4d4ddfde19 merging
test moved to other bug
2003-06-28 13:34:07 +03:00
unknown
7b39d3060f Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-27 22:31:28 +02:00
unknown
e2d2432b44 merging
sql/item.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
2003-06-27 23:14:20 +03:00
unknown
c1ea9f5d05 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1


sql/sql_select.cc:
  Auto merged
2003-06-27 22:19:14 +03:00
unknown
7e4b7fef26 fix test when no InnoDB is present 2003-06-27 19:32:59 +02:00
unknown
02cc6d6706 Allow one to use MERGE tables with tables from different databases
Added command 'replace_column' to mysqltest


client/mysqltest.c:
  Added user command replace_column
mysql-test/r/merge.result:
  Update of tests
mysql-test/t/innodb.test:
  User replace_column to make tests repeatable
mysql-test/t/merge.test:
  New tests for testing MERGE tables with multiple databases
scripts/mysql_create_system_tables.sh:
  Fixed syntax error
sql/ha_myisammrg.cc:
  Allow one to use MERGE tables with tables from different databases
sql/mysql_priv.h:
  Added function
sql/sql_parse.cc:
  Allow one to use MERGE tables with tables from different databases
sql/sql_show.cc:
  Extended append_identifier()
2003-06-27 16:29:10 +03:00
unknown
7b54f4d6e0 When unifying arguments for comparion, binary strings won character strings,
and comparison was done binary. Now, a binary string wins a character sting 
taking in account their derivation. That means a character field wins a
binary literal and comparison is done according to the character field
collation, not binary.
2003-06-27 16:08:52 +05:00
unknown
19764b16ab optimization results (SCRUM) WL#902
mysql-test/r/subselect.result:
  optimization results
mysql-test/t/subselect.test:
  optimization results
2003-06-27 13:36:03 +03:00
unknown
6fd2a8585f str0 IN (str1, str2, ...) now works according to collation rules 2003-06-27 13:52:38 +05:00
unknown
3f810d0e90 BETWEEN now works according to collation rules 2003-06-27 12:02:08 +05:00
unknown
5768f4a34e Fixed testcase after last changes 2003-06-27 06:40:24 +03:00
unknown
c2cb9b97be Added thread variable max_seeks_for_key
Change optimizer to prefer key lookups before table scan
Change table scans to be done after tables with constrains on scanned table 


mysql-test/r/distinct.result:
  Update results
mysql-test/r/group_by.result:
  Update results
mysql-test/r/heap.result:
  Update results
mysql-test/r/join.result:
  Update results
mysql-test/r/key_diff.result:
  Update results
mysql-test/r/myisam.result:
  Update results
mysql-test/r/order_by.result:
  Update results
mysql-test/r/select_safe.result:
  Update results
mysql-test/t/distinct.test:
  Change test to be repeatable
mysql-test/t/join.test:
  Change test to be repeatable
mysql-test/t/select_safe.test:
  Add tests for MAX_SEEKS_FOR_KEY
sql/handler.h:
  Optimize structure for 64 bit machines (and to avoid problems with gdb)
sql/item_cmpfunc.cc:
  Initialize not_null_tables_cache properly
sql/mysqld.cc:
  Added max_seeks_for_key
sql/set_var.cc:
  Added max_seeks_for_key
sql/sql_class.h:
  Added max_seeks_for_key
sql/sql_select.cc:
  Added max_seeks_for_key
  Change optimizer to prefer key lookups before table scan.
  Change table scans to be done after tables with constrains on scanned table
2003-06-27 03:04:54 +03:00
unknown
41b653796a Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-06-26 21:31:37 +02:00
unknown
ec2c923d7d bug with ranges and not_null_col=can_be_null_expr fixed
mysql-test/r/range.result:
  new test added
  long lines reformatted
mysql-test/t/range.test:
  new test added
  long lines reformatted
2003-06-26 21:30:53 +02:00
unknown
f6d3f0790c Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23
into eagle.mysql.r18.ru:/home/vva/work/BUG_479_/mysql-3.23


BitKeeper/etc/logging_ok:
  auto-union
2003-06-26 10:31:35 -04:00
unknown
4b2bb5f8e1 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-26 13:23:37 +02:00
unknown
1aabc50bb5 preload.test:
Change mode to -rw-rw-r--


mysql-test/t/preload.test:
  Change mode to -rw-rw-r--
2003-06-26 13:23:08 +02:00
unknown
662506e093 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-cond_count-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top2-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-06-26 11:31:13 +03:00
unknown
54cd790bf3 cond_count moved to SELECT_LEX_NODE
fixed BUG #726


mysql-test/r/subselect.result:
  test of bug #726
mysql-test/t/subselect.test:
  test of bug #726
sql/item_cmpfunc.cc:
  cond_count moved to SELECT_LEX_NODE
sql/item_subselect.cc:
  fixed current_select pointer
sql/sql_base.cc:
  cond_count moved to SELECT_LEX_NODE
sql/sql_class.cc:
  cond_count moved to SELECT_LEX_NODE
sql/sql_class.h:
  cond_count moved to SELECT_LEX_NODE
sql/sql_lex.cc:
  cond_count moved to SELECT_LEX_NODE
sql/sql_lex.h:
  cond_count moved to SELECT_LEX_NODE
sql/sql_select.cc:
  cond_count moved to SELECT_LEX_NODE
2003-06-26 11:09:11 +03:00
unknown
233be9c201 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.615
2003-06-26 09:01:25 +05:00
unknown
a3beaaa3af LEFT JOIN optimization: Change LEFT JOIN to normal join if possible
mysql-test/r/select.result:
  Added test for LEFT JOIN optimization
mysql-test/t/select.test:
  Added test for LEFT JOIN optimization
sql/item.h:
  LEFT JOIN optimization
sql/item_cmpfunc.cc:
  LEFT JOIN optimization
sql/item_cmpfunc.h:
  LEFT JOIN optimization
sql/item_func.cc:
  LEFT JOIN optimization
sql/item_func.h:
  LEFT JOIN optimization
sql/item_strfunc.cc:
  LEFT JOIN optimization
sql/sql_base.cc:
  Heart of LEFT JOIN optimization
2003-06-26 05:38:19 +03:00
unknown
50159020c8 fixed bug with type of user variables (bug #551)
mysql-test/r/user_var.result:
  added tests for user variables comparing (bug #551)
mysql-test/t/user_var.test:
  added tests for user variables comparing (bug #551)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-06-25 21:11:23 -04:00
unknown
6350e8c14c Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g
sql/field.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
2003-06-26 05:06:49 +06:00
unknown
65ec2112f1 after merging fix 2003-06-26 00:16:03 +03:00
unknown
16aaba7060 merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/subselect.result:
  merging (wiil be fixed after building)
sql/item_subselect.cc:
  merging
sql/sql_select.cc:
  merging
2003-06-25 23:52:15 +03:00
unknown
349946b370 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.674


sql/sql_select.cc:
  Auto merged
2003-06-25 17:16:53 +05:00
unknown
8abad21565 Testcase for #674 added
mysql-test/r/sel000100.result:
  Result of the testcase added
mysql-test/t/sel000100.test:
  checking for bug #674 added
2003-06-25 17:15:33 +05:00
unknown
15ee7b04da LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
now process arguments according to standard SQL collation determation
rules.
2003-06-25 15:07:20 +05:00
unknown
cd01f7cda0 Fixed error handling to be able do not interrupt update (907) (SCRUM)
fixed bug of current select pointer in subselect execution
fixed layuot


mysql-test/r/subselect.result:
  test of update with IGNORE option and error in subselect
mysql-test/t/subselect.test:
  test of update with IGNORE option and error in subselect
sql/item_subselect.cc:
  fixed bug of current select pointer
sql/mysqld.cc:
  error converting to warnings if hd->lex.current_select->no_error id true
  layout fixed
sql/sql_lex.cc:
  initialization
sql/sql_lex.h:
  flag which force converting errors to warnings
sql/sql_select.cc:
  switch on error convering to warnings in select executing if IGNORE option present
2003-06-25 01:19:09 +03:00
unknown
cfa509ac2c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.666
2003-06-24 17:09:44 +05:00
unknown
8bed69fa9e Test case for bug #666
mysql-test/r/func_str.result:
  test for bug #666 result
mysql-test/t/func_str.test:
  test for bug #666
2003-06-24 17:07:43 +05:00
unknown
3148d6f2a5 Another bugfix for #615
Looks a bit nicer than previous one


mysql-test/r/insert.result:
  Test results added
mysql-test/t/insert.test:
  testcase for the bug added
sql/field.h:
  Field::set_default fixed
sql/field_conv.cc:
  Now we can just replace field->reset() with field->set_default() here
2003-06-24 10:53:21 +05:00
unknown
68524c81fe Simple code cleanup
mysql-test/r/innodb.result:
  Fixed test case after innodb optimize->analyze fix
mysys/mf_pack.c:
  Added comments
sql/log_event.cc:
  Fixed usage of fn_format()
sql/slave.cc:
  Indentation fixes and comments cleanup
sql/sql_repl.cc:
  Comment cleanup
2003-06-23 20:05:54 +03:00
unknown
35c2b9df75 SHOW GRANTS hided real grants when grants on both column and table (Bug 654)
mysql-test/r/grant.result:
  Test of grant BUG
mysql-test/t/grant.test:
  Test of grant BUG
sql/sql_acl.cc:
  SHOW GRANTS hided real grants when grants on both column and table (Bug 654)
  Code cleanup (Bigger than intended because of editor problem)
sql/sql_acl.h:
  Fixed grant bug
2003-06-23 20:03:59 +03:00
unknown
b68315cda6 Merge gluh@gw:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
2003-06-23 13:02:28 +05:00
unknown
f8e232f95e Internal commit 2003-06-23 12:56:44 +05:00
unknown
ba49cc62b0 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek


sql/mysqld.cc:
  Auto merged
2003-06-23 12:03:50 +05:00
unknown
5c9b87ce08 Always send a fake Rotate event (this is roughly 70 bytes) when starting binlog_dump.
This way 3.23.58 slaves will always detect a 4.0.14 master (and stop)
immediately. BUG#198.


mysql-test/r/rpl_log.result:
  result update (the relay log now contains a fake Rotate_log_event).
mysql-test/r/rpl_log_pos.result:
  result update (the relay log now contains a fake Rotate_log_event).
2003-06-21 18:10:59 +02:00
unknown
de5e96e443 fixed BUG #679
outer resolved fields now do not marked as dependent if they is not really belong to outer SELECT
one-letter variables name fixed


mysql-test/r/subselect.result:
  test of bug 679
mysql-test/t/subselect.test:
  test of bug 679
sql/item.cc:
  outer resolved fields now do not marked as dependent if they is not really belong to outer SELECT
  one-letter variables name fixed
2003-06-20 10:15:58 +03:00
unknown
3f7e8b2146 merging
sql/sql_select.cc:
  Auto merged
2003-06-19 16:15:11 +03:00
unknown
9b83d3e536 after merge fix 2003-06-19 16:08:11 +03:00
unknown
23ebb07fbc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1


sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-06-19 15:25:41 +03:00
unknown
a6850f79bc Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 02:42:49 -07:00