1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Commit Graph

28021 Commits

Author SHA1 Message Date
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
d67c83482d Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-20 06:40:39 -05: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
c69cea4bf4 mysqldump.c:
Slight change to help message.


client/mysqldump.c:
  Slight change to help message.
2005-10-19 14:40:10 -05: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
unknown
03f289dbb5 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:02:24 -07:00
unknown
1f732c1101 Re-application of earlier patch for create_where_from_key and and delete_all_rows
sql/ha_federated.cc:
  Re-application of patch from earlier, adding debug to create_where_from_key as well 
  as small bug fix for setting of records and deleted in delete_all_rows to after db call.
2005-10-18 15:54:50 -07:00
unknown
72a2de0231 readd the my_cgets call that SergeyV originally put in 2005-10-18 17:53:09 -05:00
unknown
b2c9d65b1e Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-10-18 15:01:50 -07:00
unknown
8701728f17 Per a user request there is now support for "CHECK TABLE" where the table is an archive file.
mysql-test/r/archive.result:
  Result file for adding check table support
mysql-test/t/archive.test:
  Simple test for check table. The additional select is added just to make sure the file is not destroyed.
sql/ha_archive.cc:
  Updates for adding CHECK table support. is_crashed() now returns the state of the file.
sql/ha_archive.h:
  Updates for adding CHECK table support
2005-10-18 14:52:38 -07:00
unknown
8698ffc968 BUG#121915: Merge 4.1->5.0
mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/structs.h:
  Auto merged
2005-10-19 01:52:06 +04:00
unknown
6e0222cb79 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2005-10-19 00:26:19 +03:00
unknown
8363ca4d07 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-build
2005-10-19 01:26:18 +04:00
unknown
9946ce0931 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-19 00:26:18 +03:00
unknown
4ba16b1f8a Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  regul.home.lan:/mnt/md/bk/mysql-5.0
2005-10-19 00:26:17 +03:00
unknown
90d26c972e After review fixes 2005-10-18 23:49:31 +03:00
unknown
8b9e392edf fix compilation failure on serg's box: we shouldn't
use USE_PRAGMA_INTERFACE before include of my_global.h,
where it is defined


server-tools/instance-manager/command.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/listener.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/mysql_connection.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/options.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/thread_registry.cc:
  fix register
server-tools/instance-manager/thread_registry.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/user_map.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
2005-10-19 00:31:00 +04:00
unknown
0e94cd1461 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-18 21:50:00 +03:00
unknown
89a5b23dc4 check of ACL initialization in is_acl_user() (BUG#13504)
mysql-test/r/skip_grants.result:
  creation view with DEFINER clause if --skip-grant-tables
mysql-test/t/skip_grants.test:
  creation view with DEFINER clause if --skip-grant-tables
sql/sql_acl.cc:
  check of ACL initialization in is_acl_user()
2005-10-18 21:42:26 +03:00
unknown
c3ac502ab1 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 10:49:28 -07:00
unknown
6c8c4fdace Merge mysql.com:/home/jimw/my/mysql-4.1-13334
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
2005-10-18 09:45:12 -07:00
unknown
1b05f7daa9 Merge mysql.com:/home/jimw/my/mysql-4.1-13064
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:44:29 -07:00
unknown
e4fed8519f Added initial support of stress testing. Now it is possible to start stress test from mysql-test-run script.
For details see README.stress
2005-10-18 19:26:31 +03:00
unknown
019b973212 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-18 18:04:00 +03:00
unknown
c0eae8f0a1 Some fixes to avoid compiler warnings.
mysql-test/my_manage.c:
  Avoid warning: i not used in case of Windows.
mysql-test/mysql_test_run_new.c:
  Removed unused variable.
sql/item_func.cc:
  Removed unused variables.
strings/ctype-simple.c:
  Added cast.
strings/ctype-ucs2.c:
  Added cast.
2005-10-18 18:03:26 +03:00
unknown
34a2fa26f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-10-18 10:21:48 -04:00
unknown
fed8930184 WL#2835: Base64
Fixes after Jonas review


mysys/base64.c:
  Changed charset by recommendation of bar
ndb/config/type_util.mk.am:
  Removed redundant library
2005-10-18 16:18:08 +02:00