Commit graph

15404 commits

Author SHA1 Message Date
unknown
7cd0f1a629 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  example.com:/work/bug23037/my50


sql/sql_show.cc:
  Auto merged
2006-10-23 15:21:23 +02:00
unknown
29947efc62 Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table"
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.


mysql-test/r/information_schema.result:
  Update result
  
  Because the length of I_S.COLUMNS.COLUMN_DEFAULT was increased to
  65535 the column changed it's type from varchar(64) to longtext
  The type is longtext if the length is > 65532 (the max varchar len)
mysql-test/t/information_schema.test:
  test case for bug#23037: Bug in field "Default" of
  query "SHOW COLUMNS FROM table"
  
  Both SHOW COLUMNS and I_S.COLUMNS is TESTED as well the
  value returned by both. Using --replace_regex is unfeasible
  as the repetition value cannot be > 255.
  --replace_regex /A{256}/VALUE/ doesn't work, not to talk about
    /A{65532}/VALUE/
  /(A{255}){255}/VALUE/ is awfully slow. Thus, simple function with
  cursor is used to extract the value.
sql/sql_show.cc:
  Default value can have TIMESTAMP, CHAR, VARCHAR, ENUM
  VARCHAR can have the longest value, up to 65535. However, because
  of table handler limitations the actual limit is 65532 characters,
  latin1 charset. However, here is used MAX_FIELD_VARCHARLENGTH macro,
  because there could be a storage engine without such limitation.
2006-10-23 13:12:30 +02:00
unknown
1b7b43f399 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-23 13:18:56 +05:00
unknown
95d64ee3cb Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-23 12:44:25 +05:00
unknown
5a88282ec0 Merge siva.hindu.god:/usr/home/tim/m/bk/inno/50
into  siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-20 13:28:47 -06:00
unknown
7c7ea371cd Apply InnoDB snapshot ss923
Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION


sql/ha_innodb.cc:
  Apply InnoDB snapshot ss923
  
  Revision r922:
  ha_innobase::store_lock(): When downgrading table locks, do not
  check thd->in_lock_tables but test if
  thd->lex->sql_command == SQLCOM_LOCK_TABLES
  instead.  Otherwise, stored functions will use table locks.  (Bug #18077)
2006-10-20 12:34:31 -06:00
unknown
5e3a54c7f3 Merge polly.local:/tmp/maint/bug23256/mysql-5.0-maint
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-10-20 14:45:34 +04:00
unknown
2987771441 Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint
into  polly.local:/tmp/maint/bug23256/mysql-5.0-maint


sql/stacktrace.c:
  Auto merged
2006-10-20 14:32:31 +04:00
unknown
dd18eb1bfc Fix for bug #23256 "doesn't build on alpha"
- compilation on the Alpha platform was broken because the Alpha-specific code was not updated after replacing the SIGRETURN_FRAME_COUNT constant with a variable
2006-10-20 14:31:47 +04:00
unknown
68c2a008a1 Merge mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732


sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/range.result:
  SCCS merged
mysql-test/t/range.test:
  SCCS merged
2006-10-19 16:15:30 +05:00
unknown
04c8b8d15c Merge example.com:/work/bug23379/my41-bug23379
into  example.com:/work/bug23379/my50-bug23379


sql/sql_class.cc:
  Auto merged
2006-10-19 11:39:19 +02:00
unknown
ca817b49cf Fix for bug#23379 "wrong time value in SHOW PROCESSLIST"
The value taken to be shown in SHOW PROCESSLIST is not
initialized when THD is created and will be random for
unauthenticated connections.
  
To the documentor: Random value, instead of NULL, was shown,
in SHOW PROCESSLIST for still non-authenticated connections.


sql/sql_class.cc:
  Initialize time_after_lock.
  It is used from SHOW PROCESSLIST's code. If not initialized
  random value is shown for connected but still unauthenticated
  clients in the column Time.
2006-10-19 11:37:07 +02:00
unknown
123275321f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
mysql-test/include/have_lowercase0.inc:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mysql_protocols.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_drop_db.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysys/my_read.c:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/rpl000015.result:
  C
mysql-test/r/rpl_log.result:
  ul
mysql-test/r/rpl_max_relay_size.result:
  ul
mysql-test/r/rpl_replicate_do.result:
  ul
mysql-test/t/rpl000015.test:
  ul
2006-10-19 11:35:10 +02:00
unknown
da7af481cd Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
We miss some records sometimes using RANGE method if we have
partial key segments.
Example:
  Create table t1(a char(2), key(a(1)));
  insert into t1 values ('a'), ('xx');
  select a from t1 where a > 'x';
We call index_read() passing 'x' key and HA_READ_AFTER_KEY flag
in the handler::read_range_first() wich is wrong because we have
a partial key segment for the field and might miss records like 'xx'.

Fix: don't use open segments in such a case.


mysql-test/r/range.result:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - test result.
mysql-test/t/range.test:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - test case.
sql/opt_range.cc:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - check if we have a partial key segment for a Item_func::GT_FUNC;
      if so, don't set NEAR_MIN flag in order to use HA_READ_KEY_OR_NEXT
      instead of HA_READ_AFTER_KEY.
sql/opt_range.h:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - key segment 'flag' slot added.
sql/sql_select.cc:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - test (HA_PART_KEY_SEG | HA_NULL_PART) as we split it in the sql/table.cc
sql/table.cc:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - set HA_NULL_PART flag instead of HA_PART_KEY_SEG in order not to mix them.
2006-10-19 12:52:37 +05:00
unknown
a4f445e10e Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


tests/mysql_client_test.c:
  Auto merged
2006-10-19 00:10:36 +02:00
unknown
f336b3fa0b Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  example.com:/work/bug23379/my41-bug23379


sql/sql_class.cc:
  Auto merged
2006-10-18 20:07:28 +02:00
unknown
1fb887361d Fix for bug#23379 "wrong time value in SHOW PROCESSLIST"
The value taken to be shown in SHOW PROCESSLIST is not
initialized when THD is created and will be random for
unauthenticated connections.

To the documentor: Random value, instead of NULL, was shown,
in SHOW PROCESSLIST for still non-authenticated connections.


sql/sql_class.cc:
  Initialize time_after_lock.
  It is used from SHOW PROCESSLIST's code. If not initialized
  random value is shown for connected but still unauthenticated
  clients in the column Time.
2006-10-18 18:17:41 +02:00
unknown
665d169243 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016


sql/sql_parse.cc:
  Auto merged
2006-10-17 12:31:52 -04:00
unknown
48dfeb4de0 Fix previous bad patch for Bug#14262.
Remove table engine qualification where it's unnecessary.


mysql-test/r/view.result:
  Remove requirement for innodb where not needed.  (Running this test alone
  raised warnings that it was using myisam.)
mysql-test/t/view.test:
  Remove requirement for innodb where not needed.  (Running this test alone
  raised warnings that it was using myisam.)
sql/sql_parse.cc:
  Fix previous bad re-patch.
sql/sql_view.cc:
  Fix previous bad re-patch.
2006-10-17 11:06:11 -04:00
unknown
1e8c450dea Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50


sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
mysql-test/r/ps.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge
2006-10-16 20:15:14 -06:00
unknown
591d09a960 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


Makefile.am:
  Auto merged
sql/sql_select.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
2006-10-14 17:31:04 +02:00
unknown
e767ab6df8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
2006-10-13 21:12:07 +05:00
unknown
f202c9d2b2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
2006-10-13 21:09:20 +05:00
unknown
665e557533 Merge fix-up.
vio/viossl.c:
  We prefer "0x%lx" to "%p".
2006-10-13 10:57:50 -04:00
unknown
0ace2b44ba Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
into  mysql.com:/usr/home/ram/work/bug23254/my50-bug23254


sql/item_strfunc.cc:
  Auto merged
mysql-test/r/func_compress.result:
  SCCS merged
mysql-test/t/func_compress.test:
  SCCS merged
2006-10-13 19:09:22 +05:00
unknown
60a21d1697 Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
We don't set null_value to 0 in the Item_func_compress::val_str() for 
not-NULL results.


mysql-test/r/func_compress.result:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - test result.
mysql-test/t/func_compress.test:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - test case.
sql/item_strfunc.cc:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - set null_value.
2006-10-13 19:05:54 +05:00
unknown
aff965c3b1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262


BitKeeper/deleted/.del-collapsed:
  'Auto converge rename'
BitKeeper/etc/collapsed:
  'Auto converge'
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.h:
  Auto merged
vio/viosocket.c:
  Auto merged
sql/sql_parse.cc:
  Manual merge
sql/sql_view.cc:
  Manual merge
2006-10-13 08:57:15 -04:00
unknown
99d42667d6 Bug #19764: SHOW commands end up in the slow log as table scans
Do not consider SHOW commands slow queries, just because they don't use proper indexes.

This bug fix is not needed in 5.1, and the code changes will be null merged.  However, the test cases will be propogated up to 5.1.


mysql-test/t/show_check-master.opt:
  Rename: BitKeeper/deleted/.del-show_check-master.opt -> mysql-test/t/show_check-master.opt
mysql-test/r/ps.result:
  Add test case for bug 19764
mysql-test/r/show_check.result:
  Add test case for bug 19764
mysql-test/r/union.result:
  Adjust test case results based on bug #19764 changes
mysql-test/t/ps.test:
  Add test case for bug 19764
mysql-test/t/show_check.test:
  Add test case for bug 19764
sql/sql_parse.cc:
  Do not log SHOW commands as slow queries just because they don't use indexes.
sql/sql_prepare.cc:
  Save stmt_backup.lex->orig_sql_command for use in log_slow_statement()
mysql-test/t/ps-master.opt:
  Add log-slow-queries and --log-queries-not-using indexes, to test bug #19764
2006-10-12 17:10:34 -06:00
unknown
0e33031804 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint-new


mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-10-12 17:37:59 +02:00
unknown
72a997c0ea Merge polly.local:/tmp/maint/bug22728/my41-bug22728
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


sql/handler.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manually merged
mysql-test/t/innodb_mysql.test:
  Manually merged
2006-10-12 13:39:52 +04:00
unknown
e6fb36302f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-10-12 12:12:09 +04:00
unknown
be0f6405c4 Merge polly.local:/tmp/maint/bug11655/my50-bug11655
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


sql-common/my_time.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/r/func_time.result:
  Manually merged
mysql-test/t/func_time.test:
  Manually merged
2006-10-12 11:28:44 +04:00
unknown
62e102b42e 5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1
mysql-test/r/func_time.result:
  Fixed func_time test when merging the fix for bug #11655 and bug #20927 to 5.0
sql/item_timefunc.cc:
  Fixed compilation when merging the fix for bug #11655 and bug #20927 to 5.0
2006-10-12 11:21:12 +04:00
unknown
a71a44296e Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/50


sql/sql_parse.cc:
  Auto merged
2006-10-11 23:38:15 -06:00
unknown
e9b7cc09e5 Revert patch for bug #19764, which did not work with prepared statements.
BitKeeper/deleted/.del-show_check-master.opt:
  Delete: mysql-test/t/show_check-master.opt
2006-10-11 23:35:52 -06:00
unknown
89924c5874 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


sql/item_timefunc.cc:
  Auto merged
2006-10-11 17:19:19 +04:00
unknown
18b91b023d Cset exclude: Kristofer.Pettersson@naruto.|ChangeSet|20060922092201|15946
sql/item_timefunc.cc:
  Exclude
2006-10-11 13:42:48 +02:00
unknown
5623f2e9a6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


sql/item_timefunc.cc:
  Auto merged
2006-10-11 14:57:09 +04:00
unknown
3baf203483 Merge polly.local:/tmp/maint/bug11655/my41-bug11655
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


sql/field.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  Manually merged
mysql-test/t/func_time.test:
  Manually merged
2006-10-11 14:55:23 +04:00
unknown
78f47fbf3a Merge polly.local:/tmp/maint/bug11655/my41-bug11655
into  polly.local:/tmp/maint/bug11655/my50-bug11655


sql/time.cc:
  Auto merged
include/my_time.h:
  Manually merged
mysql-test/r/func_sapdb.result:
  Manually merged
mysql-test/r/func_time.result:
  Manually merged
mysql-test/t/func_time.test:
  Manually merged
sql-common/my_time.c:
  Manually merged
sql/field.cc:
  Manually merged
sql/item_timefunc.cc:
  Manually merged
2006-10-11 14:16:30 +04:00
unknown
ca126a2bbd Fix for bug #22728 "Handler_rollback value is growing".
The bug is present only in 4.1, will be null-merged to 5.0

For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.


mysql-test/r/innodb_mysql.result:
  Added testcase for bug #22728 "Handler_rollback value is growing"
mysql-test/t/innodb_mysql.test:
  Added testcase for bug #22728 "Handler_rollback value is growing"
sql/handler.cc:
  For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.
2006-10-11 12:44:03 +04:00
unknown
1e0ebb9105 Merge naruto.:C:/cpp/bug21811/my50-bug21811
into  naruto.:C:/cpp/mysql-5.0-maint


mysql-test/r/func_time.result:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
2006-10-11 10:41:22 +02:00
unknown
fedfd803ef Merge naruto.:C:/cpp/bug21811/my41-bug21811
into  naruto.:C:/cpp/mysql-4.1-maint


sql/item_timefunc.cc:
  Auto merged
2006-10-11 10:27:28 +02:00
unknown
28b3dba139 Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/50


sql/sql_parse.cc:
  Auto merged
2006-10-09 16:16:47 -06:00
unknown
4ae5ba2ded Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
2006-10-08 22:40:25 +05:00
unknown
9397becc6d After merge fix. 2006-10-08 22:34:32 +05:00
unknown
f43ee99c30 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.0-engines


sql/sql_update.cc:
  Auto merged
2006-10-08 15:14:53 +05:00
unknown
b26fb43b78 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-06 13:14:23 +02:00
unknown
eb1a9d11f0 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/set_var.cc:
  Auto merged
2006-10-06 12:36:25 +02:00
unknown
12fb87ac28 Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines


sql/ha_myisammrg.cc:
  Manual merge.
2006-10-06 15:29:30 +05:00