Commit graph

6637 commits

Author SHA1 Message Date
unknown
65d7980556 merge changes
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-07-02 00:26:23 +03:00
unknown
12d879c912 Lot's of clean-ups and fixes for 4.0.14.
include/my_global.h:
  CONFIG_SMP
mysql-test/r/grant.result:
  Test cases for bug fixes
mysql-test/r/insert_select.result:
  Test cases for bug fixes
mysql-test/r/union.result:
  Test cases for bug fixes
mysql-test/t/grant.test:
  Test cases for bug fixes
mysql-test/t/insert_select.test:
  Test cases for bug fixes
mysql-test/t/union.test:
  Test cases for bug fixes
sql/sql_acl.cc:
  Fix for granting global privileges on db level
sql/sql_parse.cc:
  Fix for INSERT... SELECT
sql/sql_select.cc:
  removing a fix
sql/sql_union.cc:
  P
2003-07-02 00:10:47 +03:00
unknown
00bd7de97a ha_innobase.cc:
Backport from 4.0 of the btr0sea.c latch hang fix


sql/ha_innobase.cc:
  Backport from 4.0 of the btr0sea.c latch hang fix
2003-07-02 00:08:29 +03:00
unknown
6806765a05 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2003-07-01 23:53:38 +03:00
unknown
2523049064 ha_innodb.cc:
Fix a possible hang over the btr0sea.c latch


sql/ha_innodb.cc:
  Fix a possible hang over the btr0sea.c latch
2003-07-01 23:52:59 +03:00
unknown
49938821c2 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-01 20:06:57 +02:00
unknown
cc6fc0ea50 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-07-01 21:00:58 +03:00
unknown
f3381e7383 made error output more detailed 2003-07-01 14:00:57 -04:00
unknown
f604b050a1 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_671/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged
2003-07-01 13:21:35 -04:00
unknown
f1ef7dd0d7 removed --table option (fixed Bug #671)
client/mysqlbinlog.cc:
  removed --table option
2003-07-01 13:17:03 -04:00
unknown
46bcc4753a Updated results after merge 2003-07-01 15:38:11 +03:00
unknown
5a3c12effb Merge with 3.23 tree to get latest bug fixes
BitKeeper/etc/logging_ok:
  auto-union
sql/item_func.cc:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/nt_servc.cc:
  Auto merged
configure.in:
  Use local version
innobase/os/os0file.c:
  Use local version
innobase/page/page0page.c:
  Use local version
innobase/row/row0sel.c:
  Use local version
innobase/row/row0vers.c:
  Use local version
mysql-test/r/order_by.result:
  Use local version
mysql-test/r/user_var.result:
  merge with 3.23
mysql-test/t/order_by.test:
  Use local version (test is already in range.test)
sql/log.cc:
  Use local version
sql/share/spanish/errmsg.txt:
  merge
sql/slave.cc:
  Use local version
sql/sql_class.h:
  Use local version
sql/sql_select.cc:
  Use patch in 4.0 for range with NULL problem
2003-07-01 15:02:16 +03:00
unknown
23a9a5805c Optimized old patches
Don't set field to DEFAULT value when set to NULL


mysql-test/r/insert.result:
  Updated results after patch
sql/field_conv.cc:
  Revert patch: Don't set field to DEFAULT value when set to NULL
sql/item_strfunc.cc:
  Optimized patch for null handling with elt
sql/opt_range.cc:
  Safety fix for range with null patch
2003-07-01 14:38:38 +03:00
unknown
0fe578f52a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


sql/item_strfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-07-01 13:30:55 +03:00
unknown
bbf8ebe87d Code/testcase cleanups
mysql-test/r/insert_select.result:
  Fixed results
mysql-test/r/join_outer.result:
  New test case for inner join table dependency
mysql-test/t/insert_select.test:
  Remove not used drop tables.
  Fixed table names
mysql-test/t/join_outer.test:
  New test case for inner join table dependency
sql/slave.cc:
  Simple optimizations
2003-07-01 13:29:55 +03:00
unknown
1726ae86be Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-07-01 13:09:24 +03:00
unknown
e359c56808 new syntax:
CREATE TABLE ...(SELECT ...) UNION ...
  INSERT ...      (SELECT ...) UNION ...
2003-06-30 22:24:03 +02:00
unknown
9e6471caf8 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-06-30 17:00:47 +02:00
unknown
537e120648 REPAIR/OPTIMIZE/CHECK/RESTORE/etc commands close relevant open HANDLERs 2003-06-30 17:00:11 +02:00
unknown
4f14446753 - make sure to compile with the correct --localstatedir and --libexedir
paths for the binary distributions (this will hopefully resolve the
   "file /usr/local/mysql/libexec/mysqld doesn't exist" error that many
   people are facing)
2003-06-30 15:00:28 +02:00
unknown
0a23db4491 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_acl.cc:
  Auto merged
2003-06-30 12:33:35 +03:00
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
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
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
6773b0dcf2 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.for_fix


sql/sql_acl.cc:
  Auto merged
2003-06-26 12:49:03 +05:00
unknown
a61b679d3e Fix bug #673: MySQL 4.0.13 no SSL connection with mysql client possible
sql/sql_acl.cc:
  Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
vio/viossl.c:
  Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
vio/viosslfactories.c:
  Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
2003-06-26 12:47:36 +05:00
unknown
7539980eb1 Fixed memory allocation in Unique to not allocate too much memory
myisam/mi_info.c:
  Updated comments
mysys/tree.c:
  Added comment
sql/net_serv.cc:
  Added comment
2003-06-26 07:56:55 +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
6a623e7f4e Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-06-25 18:40:31 +03:00
unknown
2cc81ba3d3 Fix for a bug which results in "Unknown Error".
Query should actually return empty result set, but currently can't, as
it attempts to store NULL in NOT NULL field, because that is a match
made by self join conditions.
2003-06-25 18:36:52 +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
9354da219c - reverted change from AC_CONFIG_HEADERS to AM_CONFIG_HEADER in configure.in
again - even though the automake docs consider AM_CONFIG_HEADER obsolete, 
   it currently still breaks for too many people to justify this change
   at the moment.


configure.in:
   - reverted change from AC_CONFIG_HEADERS to AM_CONFIG_HEADER again - even
     though the automake docs consider AM_CONFIG_HEADER obsolete, it currently
     still breaks for too many people to justify this change at the moment.
2003-06-25 11:16:06 +02: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
3d5f6a8867 Changed connect with timeout to use poll() instead if socket() to avoid problems with many open files 2003-06-23 23:32:07 +03: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
bcfdc99d58 Removing one fix. 2003-06-23 16:05:22 +03:00
unknown
16d6c8eb1f Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-06-23 16:00:39 +03:00
unknown
209d8a4e57 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2003-06-23 12:49:38 +02:00
unknown
09c7b48d43 fixed bug in references column grants
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-06-23 12:48:55 +02:00
unknown
199ac9f1cf Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
2003-06-23 13:04:21 +03:00