Commit graph

27281 commits

Author SHA1 Message Date
unknown
562bfb2d57 Fix for BUG#14272: Don't run index scan when we should use quick select.
This could cause failures because there are table handlers (like federated)
that support quick select scanning but do not support index scanning.
 


mysql-test/t/disabled.def:
  Enabled federated testcase.
2005-10-25 16:34:03 +04:00
unknown
90573decba Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
2005-10-25 00:16:51 +02:00
unknown
ee46cce804 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
2005-10-25 00:57:23 +04:00
unknown
1d0d71b092 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
2005-10-25 00:55:31 +04:00
unknown
33d5d4ad99 Fix for BUG#13095: Cannot create VIEWs in prepared statements
- allow CREATE VIEW as well as DROP VIEW to use in prepared statements;
  - fix CREATE VIEW implementation to make it work in prepared statements.


mysql-test/r/sp.result:
  Results file for the test case for BUG#13095.
mysql-test/t/sp.test:
  Test case for BUG#13095.
sql/sql_lex.h:
  Added a variable to remember start of whole CREATE VIEW statement
  as well as start of its SELECT part.
sql/sql_prepare.cc:
  Allow CREATE VIEW and DROP VIEW to use in prepared statements.
sql/sql_view.cc:
  Use stored start of whole CREATE VIEW statement instead of thd->query,
  which differs from the original when prepared statement is executing.
sql/sql_yacc.yy:
  Remember start of whole CREATE VIEW statement as well as start of its
  SELECT part.
2005-10-25 00:54:04 +04:00
unknown
49d0a3cc31 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-24 13:52:26 -07:00
unknown
e430912167 Disabled federated test, added then removed
federated.disabled and instead using disabled.def (per
comments in this commit)

disabled.def:
  disabled federated until bug 14272 is fixed.
.del-federated.disabled~9e4cca59f547174d:
  Delete: mysql-test/t/federated.disabled
federated.disabled:
  New BitKeeper file ``t/federated.disabled'' to disable federated test until
  Bug 14272 is fixed.
  new file


BitKeeper/deleted/.del-federated.disabled~9e4cca59f547174d:
  Delete: mysql-test/t/federated.disabled
mysql-test/t/disabled.def:
  disabled federated until bug 14272 is fixed.
2005-10-24 13:51:05 -07:00
unknown
d91f4dead8 BUG#11704: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in
OPTIMIZE TABLE.


sql/ha_innodb.cc:
  Fix for BUG#11704: "Found locks from different thread" warnings:
  The source of warnings was this scenario in OPTIMIZE:
    thr1: lock table with TL_WRITE_ONLY (InnoDB converts lock to TL_WRITE_ALLOW_WRITE)
    thr2: (UPDATE command) obtains a TL_WRITE_ALLOW_WRITE lock
    thr1: call mysql_lock_abort(). This function sets type of thr'1 lock to TL_WRITE_ONLY
    thr2: try to release thr2's lock. See two locks: TL_WRITE_ONLY, TL_WRITE_ALLOW_WRITE 
          and produce a warning.
  
  The fix: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in
  OPTIMIZE TABLE.
2005-10-25 00:27:15 +04:00
unknown
84626e7017 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2005-10-24 20:03:40 +02:00
unknown
e897eb3492 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-24 17:23:45 +02:00
unknown
19758ce635 Fix for dropping a table with frm file consisting of "junk"
mysql-test/r/show_check.result:
  Move result to correct place
sql/sql_table.cc:
  Reset error if table_type is unknown. ie. the .frm file could not be opened
2005-10-24 15:05:06 +02:00
unknown
d29ecd5e91 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
2005-10-21 14:51:51 +02:00
unknown
8ba28aa38b ctype_utf8.result:
After merge fix.


mysql-test/r/ctype_utf8.result:
  After merge fix.
2005-10-21 16:58:10 +05:00
unknown
eddba2ea38 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0.b12371


mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/ctype_utf8.result:
  After merge fix.
mysql-test/r/show_check.result:
  After merge fix.
sql/item_strfunc.h:
  After merge fix.
tests/mysql_client_test.c:
  After merge fix.
2005-10-21 16:53:50 +05:00
unknown
0cd95ca6b8 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
2005-10-21 13:24:41 +02:00
unknown
08ed63ed32 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 16:24:40 +05:00
unknown
d9b0a62e93 Post-review fix.
sql/sp_head.cc:
  Post-review fix; changed string copying method (+ fixed comment typo and indention).
2005-10-21 13:08:00 +02:00
unknown
ea0778835b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089
2005-10-21 14:42:00 +05:00
unknown
c9978d8bcb Bug#13233
select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
  Adding test case
sql_yacc.yy:
  Adding new syntax.
item_strfunc.h:
  Fixing wrong max_length calculation.
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0,
  according to Monty's suggestion.


sql/item_strfunc.h:
  Bug#13233
  select distinct char(column) fails with utf8
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0.
sql/sql_yacc.yy:
  Adding new syntax.
mysql-test/t/ctype_utf8.test:
  Adding test case
mysql-test/r/ctype_utf8.result:
  Adding test case
2005-10-21 14:41:56 +05:00
unknown
4c872f749b fix for bug#14089 FROM list subquery always fails when
information_schema is current database
  skip the check of I_S tables if table is derived table


mysql-test/r/information_schema.result:
  fix for bug#14089 FROM list subquery always fails when 
                    information_schema is current database
    test case
mysql-test/t/information_schema.test:
  fix for bug#14089 FROM list subquery always fails when 
                    information_schema is current database
    test case
2005-10-21 13:14:54 +05:00
unknown
c2b83bebd2 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 11:55:46 +05:00
unknown
571d9cdd0b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-10-21 06:43:33 +02:00
unknown
740123a457 bug#14199 - ndb leak of index opertaions in TC leading to error 288
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  New dump for index operation count
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  New dump for index operation count
  Fix leak on index ops
2005-10-21 06:41:49 +02:00
unknown
6e2f09ee96 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy004.:/work/mysql-5.0-bug12595-4
2005-10-21 04:07:17 +03:00
unknown
ccc051cd40 fix for bug #12595 (ESCAPE must be exactly 1 character long)
ESCAPE has length of 1 if specified and sql_mode is NO_BACKSLASH_ESCAPES
or has length of 0 or 1 in every other situation.
(approved patch applied on a up-to-date tree re-commit) 


mysql-test/r/select.result:
  results of test for bug 12595
mysql-test/t/select.test:
  test for bug #12595 (ESCAPE must be exactly one character long)
sql/item_cmpfunc.cc:
  if ESCAPE was in the statement check whether its length is
  different than 1. In NO_BACKSLASH_ESCAPES mode only length of 1 is
  allowed, otherwise the length could be 0 or 1 character (code point
  in the sense of Unicode).
sql/item_cmpfunc.h:
  pass variable from the parsing stage - whether
  ESCAPE clause was found in the statement
sql/sql_help.cc:
  pass FALSE for escape_used_in_parsing because we
  want the default mode of no error checking - our internal code.
sql/sql_lex.cc:
  initialized variable used to transfer information during
  parsing up in the stack when reducing in the grammar
sql/sql_lex.h:
  new variable used for transfering information when
  reducing in the grammar.
sql/sql_yacc.yy:
  initialize Lex->escape_used and then use it when reducing.
  This is needed as fix for bug #12595 to distinguish between
  situation where ESCAPE was found and when not because internally
  we may pass a string an empty string and there is no other way
  to find out whether this is correct or not in case of 
  NO_BACKSLASH_ESCAPES mode, which allows only length of 1 if
  ESCAPE is part of the SQL statement.
2005-10-21 04:01:52 +03:00
unknown
885a0c14cd Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-10-21 03:27:18 +04:00
unknown
a5f2355cf6 Fix Bug#14107 (IM test failures on QNX)
(v.2 with post-review fixes)


server-tools/instance-manager/instance.cc:
  On QNX one cannot use fork() in multithreaded environment. Therefore we should use QNX's spawn()
2005-10-21 03:25:07 +04:00
unknown
9e23aa1126 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


client/mysql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2005-10-20 23:23:33 +02:00
unknown
ad731d3888 configure.in:
Set the version number to 5.0.16


configure.in:
  Set the version number to 5.0.16
2005-10-20 13:37:54 +02:00
unknown
65ef7cc2f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-10-20 10:28:52 +02:00
unknown
06164d5dd5 Bug#12371: executing prepared statement fails (illegal mix of collations)
ctype_utf8.test, ctype_utf8.result:
  Adding test case.
item.h:
item.cc:
  Adding Item_param::safe_charset_converter


sql/item.cc:
   Bug#12371: executing prepared statement fails (illegal mix of collations)
  Adding Item_param::safe_charset_converter
sql/item.h:
  Adding Item_param::safe_charset_converter
mysql-test/r/ctype_utf8.result:
  Adding test case.
mysql-test/t/ctype_utf8.test:
  Adding test case.
2005-10-20 11:56:27 +05:00
unknown
b488e98747 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0


mysys/charset.c:
  Auto merged
2005-10-20 11:12:34 +05:00
unknown
f491100272 charset.c:
Bug#13238 mysqldump and mysqladmin hangs
  Avoid recursion into init_available_charsets.
  Serg's version didn't work for me: I got 
  double mutex locking.
  Pushing this version instead
  (It was approved by Serg anyway)


mysys/charset.c:
  Bug#13238 mysqldump and mysqladmin hangs
  Avoid recursion into init_available_charsets.
  Serg's version didn't work for me: I got 
  double mutex locking.
  Pushing this version instead
  (It was approved by Serg anyway)
2005-10-20 10:30:51 +05:00
unknown
3d53c870d3 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/my_manage.c:
  Auto merged
mysql-test/mysql_test_run_new.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflicts
mysql-test/t/variables.test:
  Resolve conflicts
sql/sql_acl.cc:
  Resolve conflicts
strings/ctype-simple.c:
  Resolve conflicts
strings/ctype-ucs2.c:
  Resolve conflicts
2005-10-19 13:47:05 -07:00
unknown
e27cb111cd mysql.spec.sh:
Made yaSSL support an option (off by default)


support-files/mysql.spec.sh:
  Made yaSSL support an option (off by default)
2005-10-19 22:00:12 +02:00
unknown
f8bfae6b87 Merge mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-10-19 14:40:05 -04:00
unknown
e5eab7dd97 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump


client/mysqlbinlog.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
2005-10-19 19:42:14 +02:00
unknown
e040920f95 mysqlbinlog --hexdump patch 4:
Rename last_event_info to print_event_info to better reflect the new semantics


client/mysqlbinlog.cc:
  Rename last_event_info to print_event_info
sql/log_event.cc:
  Rename last_event_info to print_event_info
sql/log_event.h:
  Rename last_event_info to print_event_info
2005-10-19 19:31:24 +02:00
unknown
6979c0dd14 Merge bk-innodb.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0


innobase/include/rem0rec.h:
  Auto merged
innobase/include/rem0rec.ic:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
2005-10-19 13:20:21 -04:00
unknown
28421fe8ed Merge mysql.com:/home/alexi/mysql-4.1
into  mysql.com:/home/alexi/dev/mysql-4.1-4375
2005-10-19 21:07:08 +04:00
unknown
33b4154cec BUG#14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..'
Applying InnoDB patch from Jan Lindstrom
2005-10-19 12:06:29 -04:00
unknown
b59d565605 Fix for BUG#4375: Windows specific directories are copied
during replication.
 Modified my_dir(). Now this function skips hidden and system
 files which sometimes are created by Windows.
 NOTE. The fix is similar to the previuos one (05 July 2004)
 except for correct setting of the 'attrib' variable value
 (within the previous fix this variable was left uninitialized
 when my_dir() was called with My_flags & MY_WANT_STAT == 0).


mysys/my_lib.c:
  Modified my_dir().
   Now this function skips hidden and system files
   which sometimes are created by Windows.
2005-10-19 18:01:23 +04:00
unknown
a7f4882a43 Fixed BUG#13941: replace() string fuction behaves badly inside stored
procedure
  For some functions returning strings (like "replace" and "ifnull" - where
  val_str() is returning a pointer into one of the parameters) - we ended
  up with a dangling pointer after the new operator destroyed the reuse item
  in the eval function.
  A working, if not very elegant, solution is to simply copy the string in
  such cases.


mysql-test/r/sp.result:
  New test case for BUG#13941.
mysql-test/t/sp.test:
  New test case for BUG#13941.
sql/sp_head.cc:
  Copy the string when evaluating some string functions (e.g. "replace" and "ifnull")
  to avoid using a dangling pointer.
2005-10-19 14:54:54 +02:00
unknown
33c972e49d A fix and a test case for Bug#13587 "Server crash when SP is created
without database"


mysql-test/r/sp-error.result:
  Test results fixed (a test case for Bug#13587)
mysql-test/t/sp-error.test:
  A test case for Bug#13587 "Server crash when SP is created without 
  database"
sql/sql_parse.cc:
  - move initialization of lex->sphead->m_db before it's used.
  - cleanup; comment why right now can't be cleaned any more
2005-10-19 14:46:32 +04:00
unknown
1e7531ea5c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug12915-merge
2005-10-19 12:42:50 +04:00
unknown
c5f9e201eb Post-merge fixes 2005-10-19 12:41:30 +04:00
unknown
0c1085eeac Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-18 18:53:54 -07:00
unknown
75184ffa66 Changeset:
Changed option text in mysqldump.c
mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)


client/mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)
2005-10-18 18:51:07 -07:00
unknown
a43ec392af mysql.spec.sh:
Enabled yaSSL
mysql-test-run.pl:
  Increased test case timeout from 15 min


mysql-test/mysql-test-run.pl:
  Increased test case timeout from 15 min
support-files/mysql.spec.sh:
  Enabled yaSSL
2005-10-19 02:53:03 +02:00
unknown
6c009e7ccb Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
2005-10-18 16:31:12 -07:00