1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
03b652cfbf Fix BUG#2260: Handler NOT FOUND declaration does't work in stored procedure
mysql-test/r/sp.result:
  Test case for BUG#2260.
mysql-test/t/sp.test:
  Test case for BUG#2260.
sql/sp_rcontext.cc:
  Detect warning and not found, and exception condition correctly.
2004-01-08 10:55:10 +01:00
unknown
027535733d Fix BUG#2259: Crash after fetch from not-open cursor in stored procedure
Initialize and test properly when cleaning up, to avoid crash in some error cases.


mysql-test/r/sp-error.result:
  Test case for BUG#2259
mysql-test/t/sp-error.test:
  Test case for BUG#2259
sql/sp_rcontext.cc:
  Cleanup in a more controlled way to avoid crashes in some error cases.
  Remove unused variable.
sql/sp_rcontext.h:
  Initialize member var, for cleanup tests.
2004-01-08 10:37:31 +01:00
unknown
952e2cd42a Fix BUG#2272: Crash if update with variable name in stored procedure.
Parse column names (and not variables) only in UPDATE ... SET ...


mysql-test/r/sp-error.result:
  New test case for BUG#2272
mysql-test/t/sp-error.test:
  New test case for BUG#2272
sql/sql_yacc.yy:
  "UPDATE table SET id = val" should only recognize column names, and not
  local SP variables for 'id'.
  (Also removed "as locator" syntax which is not supported.)
2004-01-08 09:27:29 +01:00
unknown
aafca9f08d An improvement of the fix for the bug #2231: string column,
INDEX+LIKE, don't take the ESCAPE character. (ver. 2)
2004-01-08 12:24:36 +04: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
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
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
a5edde8823 Completion of fix for BUG#2121 "Inadequate message "check permissions on master.info"":
I had not corrected these languages.
As it has been discussed with the docs team, the new messages will be merged
to 4.1, and then will be translated in 4.1 (they will remain in English
in 4.0).


sql/share/danish/errmsg.txt:
  better error message
sql/share/dutch/errmsg.txt:
  better error message
sql/share/german/errmsg.txt:
  better error message
sql/share/italian/errmsg.txt:
  better error message
sql/share/portuguese/errmsg.txt:
  better error message
sql/share/russian/errmsg.txt:
  better error message
sql/share/spanish/errmsg.txt:
  better error message
sql/share/swedish/errmsg.txt:
  better error message
sql/share/ukrainian/errmsg.txt:
  better error message
2004-01-06 14:01:49 +01: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
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
12ba773bb9 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-01-02 11:21:15 -06:00
unknown
92fdbe5e03 #2244 User variables collation conflict is not detected 2003-12-31 19:01:03 +04: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
824111e6c4 Fix for the bug #2231: string column, INDEX+LIKE, don't take the ESCAPE character.
(acctually i don't like the fix, any suggestions?)
2003-12-30 19:23:38 +04:00
unknown
b703338d76 Merge
sql/set_var.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged
2003-12-30 13:16:49 +02:00
unknown
376fb08072 Some small portability fixes.
Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)


client/mysqltest.c:
  Indentation cleanup
include/myisam.h:
  Made some pointers 'const'
mysql-test/mysql-test-run.sh:
  Portability fix for OSX
sql/filesort.cc:
  Safety fix (not needed for current code but needed for 5.0)
sql/ha_berkeley.cc:
  More debugging
  Changed 'create' to return error number
sql/ha_berkeley.h:
  Added HA_FILE_BASED
sql/ha_innodb.cc:
  Added missing DBUG_RETURN
sql/ha_isam.cc:
  Changed create to return error number
sql/ha_isam.h:
  Added HA_FILE_BASED
sql/ha_isammrg.h:
  Added HA_FILE_BASED
sql/ha_myisam.cc:
  Changed create to return error number
sql/ha_myisam.h:
  Added HA_FILE_BASED
sql/ha_myisammrg.cc:
  Changed create to return error number
sql/ha_myisammrg.h:
  Added HA_FILE_BASED
sql/handler.cc:
  Ensure that table engines gets table names in lower case even if we are using lower_case_table_names
  Removed test for DB_TYPE_INNODB by ensuring that create method returns error number.
sql/handler.h:
  Added HA_FILE_BASED
  Made some struct entries 'const'
  Added 'alias' for create to be able to create tables in mixed case on case insensitive file systems
sql/mysql_priv.h:
  Support for lower_case_table_names=2
sql/mysqld.cc:
  Support for lower_case_table_names=2
  Moved test of case insenstive file system after all mutex are created
sql/set_var.cc:
  Support for lower_case_table_names=2
sql/sql_class.h:
  Indentation change
sql/sql_db.cc:
  Support for lower_case_table_names=2
sql/sql_insert.cc:
  Indentation change
sql/sql_parse.cc:
  Support for lower_case_table_names=2
sql/sql_rename.cc:
  Support for lower_case_table_names=2
  Added missing 'unpack_filename' to RENAME which may fix a bug in RENAME TABLE on windows
sql/sql_show.cc:
  If lower_case_table_name=2 is given, show original case in SHOW CREATE TABLE
sql/sql_table.cc:
  Support for lower_case_table_names=2 for DROP TABLE, RENAME TABLE, ALTER TABLE and CREATE TABLE
2003-12-30 13:14:21 +02: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
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
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
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
390bd92630 Avoid displaying account name in error messages
using syntax that is not actually legal in GRANT.
2003-12-23 13:37:10 -06: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
b02b6c708e Auto Merge
BitKeeper/etc/ignore:
  auto-union
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/r/index_merge.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/opt_range.cc:
  Merge
2003-12-23 02:24:12 -08: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
d4898d174c - portability fix for IBM AIX and QNX 2003-12-22 14:42:20 +01:00
unknown
76a36815df typos fixed 2003-12-22 13:03:23 +01: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
unknown
2fe005174f THD::init_for_queries() pushed back:
see comments to the method why


sql/sql_class.h:
  THD::init_for_queries() pushed back:
  see comments to the method why
  Cleanup
2003-12-21 22:26:45 +03:00
unknown
9385323db8 Merge mysql.com:/my/mysql-4.1 into mysql.com:/my/mysql-5.0
client/mysqltest.c:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2003-12-21 19:43:23 +02:00
unknown
46a9b87a0e Fixed bug in replacation for not x86 platforms
Portability fixes


mysql-test/r/rpl_relayrotate.result:
  Portability fix
mysql-test/t/rpl_relayrotate.test:
  Portability fix.
sql/log_event.cc:
  Removed ++ from uint4korr() becasue this caused side effects
sql/uniques.cc:
  Removed not used argument to get_merge_buffers_cost()
  Removed wrong cast which caused compiler failures
  Cast arguments to ceil() to double (portability problem)
2003-12-21 19:41:34 +02:00
unknown
d31c6628e1 Portability fixes found during 5.0 test compilation
Fixed bug in ORDER BY on a small column (Bug #2147)
Fixed error from pthread_mutex_destroy() when one had wrong errmsg file



client/mysqltest.c:
  Added handling of error on query send
  (Needed for init_connection.test)
mysql-test/mysql-test-run.sh:
  Added tracing of mysqldump and mysqlbinlog
mysql-test/r/init_connect.result:
  Updated tests
mysql-test/r/order_by.result:
  Added test for bug filesort bug
mysql-test/t/init_connect-master.opt:
  Added proper quoting (for Solaris and OSF)
mysql-test/t/init_connect.test:
  Portability fix
mysql-test/t/order_by.test:
  Added test for bug #2147 (bug in filesort)
sql/filesort.cc:
  Fixed bug in filesort (Bug #2147)
sql/item.h:
  Clear 'fixed' on cleanup (For prepared statements)
sql/item_func.cc:
  Protect mutex destroy.
  (Fixed error from pthread_mutex_destroy() when one had wrong errmsg file)
sql/log_event.cc:
  Portability fix
sql/sql_class.h:
  Fixed compiler warning
sql/sql_prepare.cc:
  Portability fix. (Some compilers doesn't support jump over variables declared in for())
2003-12-21 19:39:32 +02:00
unknown
1f9763c169 Removed some test that was not relevant for MySQL (and which caused problems in MySQL 4.1) 2003-12-21 16:32:32 +02:00
unknown
92339e1012 Portability fix 2003-12-21 15:56:41 +02:00
unknown
c466a191d9 Fixed memory leaks in SP
Some code cleanup


mysql-test/r/sp.result:
  Update results after adding quotes around function/procedure names
sql/sp.cc:
  Moved DBUG_ENTER after all variable declarations
  Eliminated some variables.
  Added more DBUG_ENTER commands.
  Added memory allocation checking in create_string()
  Fixed memory leak in sp_show_create_function()
  Removed usage of sprintf
sql/sql_parse.cc:
  Simple cleanup
  Fixed memory leaks for mailformed SP definitions
2003-12-21 12:48:03 +02:00
unknown
292bb8cbbe Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0


sql/sql_class.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
2003-12-21 02:08:44 +02:00
unknown
4f72061f40 Update for VC++
(Fixed project files, compiler warnings etc..)


BitKeeper/etc/ignore:
  added mysql_priv.h
VC++Files/libmysqld/libmysqld.dsp:
  Update for VC++to
VC++Files/sql/mysqld.dsp:
  Update for VC++
client/mysqlbinlog.cc:
  Remove not used variable
sql-common/client.c:
  Fix for compilation with VC++
sql/filesort.cc:
  Remove not used variable
sql/item_timefunc.cc:
  Fixed compiler warnings
sql/log_event.cc:
  Fixed compiler warnings
  - One can't portable allocate an stack-array dynamicly
  - Changed sql_mode to ulong to match THD.variables.sql_mode (If they are not the same we get a lot of compiler warnings)
sql/log_event.h:
  Changed sql_mode to ulong to match THD.variables.sql_mode (If they are not the same we get a lot of compiler warnings)
sql/sp.cc:
  sql_mode to ulong
  Don't use strcpy
  Replaced sprintf() with strmov
sql/sp_cache.cc:
  Fixed compiler warning
sql/sp_head.cc:
  Removed not used variable
sql/sp_rcontext.cc:
  Removed not used variable
sql/sp_rcontext.h:
  Fixed compiler warning
sql/sql_class.cc:
  Portability fix
sql/sql_delete.cc:
  Fixed compiler warning
sql/sql_insert.cc:
  Fixed compiler warning
sql/sql_update.cc:
  Fixed compiler warning
2003-12-21 02:07:45 +02:00