Commit graph

10837 commits

Author SHA1 Message Date
unknown
21bef0ed8c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-01-09 12:40:09 +01:00
unknown
b321b7c00d row0mysql.c:
Fix typo


innobase/row/row0mysql.c:
  Fix typo
2004-01-08 18:56:21 +02:00
unknown
582886a3e9 Fix for 1224 (USER() CURRENT_USER() functions in embedded library)
Now we return user@host for USER() in embedded library
CURRENT_USER returns empty string if library compiled with
NO_EMBEDDED_ACCESS_CHECKS


libmysqld/embedded_priv.h:
  function's declarations trimmed
libmysqld/lib_sql.cc:
  user/host names handling added
libmysqld/libmysqld.c:
  user/host names handling added
sql/sql_class.cc:
  we shouldn't free user/host names in embedded library
2004-01-07 21:30:15 +04:00
unknown
902c361910 SCRUM
WL#1246 (Query cache in embedded library)
Some fixes after testing


libmysqld/emb_qcache.cc:
  code added to check if the recordset has no rows
sql/sql_cache.cc:
  this code should not work if the query isn't cacheable
2004-01-07 16:41:09 +04:00
unknown
fae79aeca5 SCRUM
WL#1246 (Query cache in embedded library)
Small fix - code removed that prevents using query cache in embedded library


include/mysql_embed.h:
  Now we have the query_cache in embedded library
2004-01-07 14:45:04 +04:00
unknown
690404bdc8 Merge
libmysqld/lib_sql.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  SCCS merged
2004-01-07 12:54:28 +04:00
unknown
079b4819a4 srv0start.c:
More instructions about a downgrade 4.1.1 -> 4.0.18


innobase/srv/srv0start.c:
  More instructions about a downgrade 4.1.1 -> 4.0.18
2004-01-06 20:03:06 +02:00
unknown
0052fb4d35 Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-4.1.1676


sql/item_func.cc:
  Auto merged
2004-01-06 20:53:23 +04:00
unknown
5e55cd5d0f As far as we cut off derived table branch, we have to close JOINs (BUG#2141)
(test case is absend because it is multi-thread and very big)


sql/sql_derived.cc:
  As far as we cut off this branch, we have to close JOINs
2004-01-06 13:13:04 +02:00
unknown
0d770c43db srv0start.c:
Add comment that the insert buffer format changed between 4.0 and 4.1.1, but the undo log format did not


innobase/srv/srv0start.c:
  Add comment that the insert buffer format changed between 4.0 and 4.1.1, but the undo log format did not
2004-01-06 13:10:57 +02:00
unknown
d4a7fa95ee Fixed Bug#2205. 2004-01-05 21:45:14 +02:00
unknown
fbf563e86a allow UPDATE and DELETE stetements with tables derived from subquery if they are not updated (BUG#2117)
allow delete table by alias in multi-delete statement



include/mysqld_error.h:
  new error message about non-updateable table
mysql-test/r/derived.result:
  test of multi-update and multi-delete
mysql-test/t/derived.test:
  test of multi-update and multi-delete
sql/share/czech/errmsg.txt:
  new error message about non-updateable table
sql/share/danish/errmsg.txt:
  new error message about non-updateable table
sql/share/dutch/errmsg.txt:
  new error message about non-updateable table
sql/share/english/errmsg.txt:
  new error message about non-updateable table
sql/share/estonian/errmsg.txt:
  new error message about non-updateable table
sql/share/french/errmsg.txt:
  new error message about non-updateable table
sql/share/german/errmsg.txt:
  new error message about non-updateable table
sql/share/greek/errmsg.txt:
  new error message about non-updateable table
sql/share/hungarian/errmsg.txt:
  new error message about non-updateable table
sql/share/italian/errmsg.txt:
  new error message about non-updateable table
sql/share/japanese/errmsg.txt:
  new error message about non-updateable table
sql/share/korean/errmsg.txt:
  new error message about non-updateable table
sql/share/norwegian-ny/errmsg.txt:
  new error message about non-updateable table
sql/share/norwegian/errmsg.txt:
  new error message about non-updateable table
sql/share/polish/errmsg.txt:
  new error message about non-updateable table
sql/share/portuguese/errmsg.txt:
  new error message about non-updateable table
sql/share/romanian/errmsg.txt:
  new error message about non-updateable table
sql/share/russian/errmsg.txt:
  new error message about non-updateable table
sql/share/serbian/errmsg.txt:
  new error message about non-updateable table
sql/share/slovak/errmsg.txt:
  new error message about non-updateable table
sql/share/spanish/errmsg.txt:
  new error message about non-updateable table
sql/share/swedish/errmsg.txt:
  new error message about non-updateable table
sql/share/ukrainian/errmsg.txt:
  new error message about non-updateable table
sql/sql_parse.cc:
  allow delete table by alias
  separate error message for try to delete derived table
sql/sql_update.cc:
  test "is updated table derived?"
sql/sql_yacc.yy:
  error message in case of try to update derived table
2004-01-04 23:44:33 +02:00
unknown
b21d8b0eff removed droping field->query_id for reinitialization tables for subquery.
(BUG#2089)


mysql-test/r/subselect_innodb.result:
  correct results
sql/mysql_priv.h:
  new parameter for setup_tables()
sql/sql_base.cc:
  new parameter for setup_tables() added to avoid dropping query_id of fields during reinitialization subquery
sql/sql_class.cc:
  layout fixed
sql/sql_help.cc:
  new parameter for setup_tables()
sql/sql_insert.cc:
  new parameter for setup_tables()
sql/sql_lex.cc:
  removed incorrect code
sql/sql_load.cc:
  new parameter for setup_tables()
sql/sql_olap.cc:
  new parameter for setup_tables()
sql/sql_prepare.cc:
  new parameter for setup_tables()
sql/sql_select.cc:
  new parameter for setup_tables()
sql/sql_update.cc:
  new parameter for setup_tables()
2004-01-03 00:12:07 +02:00
unknown
63f15064a4 log0recv.h, log0recv.c:
Merge a log replay change required by ibbackup


innobase/log/log0recv.c:
  Merge a log replay change required by ibbackup
innobase/include/log0recv.h:
  Merge a log replay change required by ibbackup
2004-01-02 16:21:58 +02:00
unknown
3940368293 row0purge.c:
Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure


innobase/row/row0purge.c:
  Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure
2004-01-01 01:51:36 +02:00
unknown
92fdbe5e03 #2244 User variables collation conflict is not detected 2003-12-31 19:01:03 +04:00
unknown
8b4e00ffb7 Fixed Bug#1472, mysql \h output out of order. 2003-12-30 17:58:39 +02:00
unknown
8c1d66310e Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-4.1.1676


sql/item_strfunc.cc:
  Auto merged
2003-12-30 19:43:53 +04:00
unknown
367ded9f71 Fix for prepared statements
Here i added Item_*::cleanup() functions,
removed a lot of ~Item_*'s,
added code to restore order_list and group_list


sql/item.cc:
  cleanups methods implemented
  Item_ref constructors changed
sql/item.h:
  cleanups declared
  Item_ref constructors changed
  some ~Item_* deleted
sql/item_cmpfunc.cc:
  new Item_ref format
sql/item_cmpfunc.h:
  saving/restoring of the original arguments added to
  eq and equal functions
sql/item_func.cc:
  New Item_ref format
sql/item_func.h:
  destructors removed/changed to 'cleanup()'
sql/item_row.cc:
  New Item_ref format
sql/item_row.h:
  ~Item_row -> cleanup()
sql/item_strfunc.cc:
  new Item_ref format
sql/item_strfunc.h:
  destructors removed
sql/item_subselect.cc:
  Item_subselect implementation,
  new Item_ref() format
sql/item_subselect.h:
  cleanups for subselects declared
sql/item_sum.cc:
  cleanups implementations
sql/item_sum.h:
  cleanups declarations
  destructors removed
sql/mysql_priv.h:
  free_items, cleanup_items exported
sql/sql_prepare.cc:
  cleanup_items, free_items calls added
  stmt->query_id= thd->query_id restored
  cleanup procedures for group_list and order_list added
sql/sql_yacc.yy:
  New Item_ref() format
2003-12-30 14:08:19 +04:00
unknown
a4be3840a3 Fix for the bug #2235: mysqldump --compatible doesn't work correctly. 2003-12-30 13:30:21 +04:00
unknown
c7b62fcde7 latin1.xml, Index.xml:
Modern Spanish collation


sql/share/charsets/Index.xml:
  Modern Spanish collation
sql/share/charsets/latin1.xml:
  Modern Spanish collation
2003-12-29 19:58:18 +04:00
unknown
c331a89119 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-29 16:45:14 +02:00
unknown
64d039833e logging_ok:
Logging to logging@openlogging.org accepted
item_strfunc.cc:
  Bug wich appeared in ctype_tis620 is fixed


sql/item_strfunc.cc:
  Bug wich appeared in ctype_tis620 is fixed
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-12-29 18:45:13 +04:00
unknown
35fd38150a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1


sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2003-12-26 12:32:24 +02:00
unknown
3f4d396dc3 Fixed bug in table level privilege GRANT handling. (Bug #2178)
Portability fixes


mysql-test/r/rpl_until.result:
  Portability fix
mysql-test/t/rpl_until.test:
  Portability fix
sql/slave.cc:
  Write UNTIL position to logs (for debugging)
sql/slave.h:
  Write UNTIL position to logs (for debugging)
sql/sql_acl.cc:
  Fixed bug in table level privilege GRANT handling. (Bug #2178)
2003-12-26 12:32:02 +02:00
unknown
d55382369e Bug 1552:
TIS620 to Unicode and Unicode to TIS620 conversion check.
2003-12-25 20:11:01 +04:00
unknown
e52ae56f33 dump_map.c:
new file
2003-12-25 19:07:44 +04:00
unknown
17e54cf407 Fix for the bug #2198: SELECT INTO OUTFILE (with Sub-Select) Problem.
Proper Item_cache::setup() method.
Code cleanup.
(discussed with sanja)


sql/item.cc:
  code cleanup
sql/item.h:
  fix for the bug #2198: SELECT INTO OUTFILE (with Sub-Select) Problem.
  proper Item_cache::setup() method
  code cleanup
sql/item_subselect.cc:
  fix for the bug #2198: SELECT INTO OUTFILE (with Sub-Select) Problem.
  proper Item_cache::setup() method
  code cleanup
2003-12-25 18:50:22 +04:00
unknown
398f7b7700 languages.html:
new file
2003-12-25 17:46:30 +04:00
unknown
8fac0f4d27 Bug 2202: CAST from binary to char still returns a binary string 2003-12-25 17:42:17 +04:00
unknown
b671a9e2f3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1


sql/mysqld.cc:
  Auto merged
2003-12-24 13:26:12 -08:00
unknown
229cc61277 sql_parse.cc:
Fix for the bug 1175: Usernames will not converted to utf8 during connect


sql/sql_parse.cc:
  Fix for the bug 1175: Usernames will not converted to utf8 during connect
2003-12-24 17:58:06 +04:00
unknown
4bff43a724 "like" did not work in some cases with character set big5 2003-12-24 16:59:48 +04:00
unknown
56f4840563 charset.c:
he mysqld server crashes if issued a command select convert(...)
  with a
  non-compiled character set:


mysys/charset.c:
  he mysqld server crashes if issued a command select convert(...)
  with a
  non-compiled character set:
2003-12-24 16:04:26 +04:00
unknown
b72efef6f8 install_test_db.sh:
install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
mysqld.cc:
  better error messaging


sql/mysqld.cc:
  better error messaging
mysql-test/install_test_db.sh:
  install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
2003-12-24 16:04:25 +04:00
unknown
20a1da7864 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2046


libmysqld/libmysqld.c:
  Auto merged
2003-12-24 16:04:24 +04:00
unknown
2b1aa3fc2a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1


libmysql/libmysql.c:
  Auto merged
2003-12-23 09:47:02 -06:00
unknown
c00c385135 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2181
2003-12-23 18:25:45 +04:00
unknown
02531752eb Fix for #2181 (mysql_execute crashed instead of returning error on embedded
server)
We didn't perform the check for the error for embedded server


libmysql/libmysql.c:
  error checking moved to the mysql_execute level
2003-12-23 18:24:33 +04:00
unknown
11d47779a2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-prep
2003-12-23 16:17:46 +03:00
unknown
7136e3866c Fix for #2184 (Prepared statements if embedded library broken)
There was an error with same function/class member names


sql/sql_prepare.cc:
  Name scope specified
2003-12-23 17:17:45 +04:00
unknown
923af04fc1 short patch for bug #2184 'Prepared statements in embedded library was
broken with recent changes' (attempt 2).
Adding Statement_core is better because:
- set_statement() code is shorter and you don't need to modify it when adding
new members to Statement_core
- a bit faster (you don't have virtual call and don't free_root() twice)
Do that short patch instead in hope that set_statement() will be sooner or
later removed entirely


sql/sql_class.cc:
  short patch for bug #2184 'Prepared statements in embedded library was 
  broken with recent changes'
sql/sql_class.h:
  short patch for bug #2184 'Prepared statements in embedded library 
  was broken with recent changes'
2003-12-23 15:38:19 +03:00
unknown
85938910d5 Minor comment edits. 2003-12-22 13:08:16 -06:00
unknown
19e15109d0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-22 09:41:21 -06:00
unknown
509d5cf391 Fix & test for the bug #2182: lpad returns incorrect result.
mysql-test/r/func_str.result:
  Test for the bug #2182: lpad returns incorrect result
mysql-test/t/func_str.test:
  Test for the bug #2182: lpad returns incorrect result
sql/item_strfunc.cc:
  Fix for the bug #2182: lpad returns incorrect result
2003-12-22 19:00:51 +04:00
unknown
37d11ff858 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-22 15:57:59 +03:00
unknown
f2ddb590e3 Names of all client methods (static functions inside client.c) now
uniform: cli_ + member name.
2003-12-22 15:57:34 +03:00
unknown
5d3864313d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-21 21:19:42 +01:00
unknown
5c9aacb157 typo fixed 2003-12-21 21:18:59 +01:00
unknown
f13383a561 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root


sql/sql_class.h:
  Auto merged
2003-12-21 22:37:28 +03:00