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

19274 Commits

Author SHA1 Message Date
unknown
ea646dce60 avoid using ndb tables in query cache
sql/ha_ndbcluster.h:
  fixed layout
  prohibit using query cache with ndb tables
sql/handler.h:
  new caching type
sql/sql_cache.cc:
  support of new caching type (caching prohibited)
2004-05-05 11:22:10 +03:00
unknown
aee9a54886 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-05-05 10:15:43 +03:00
unknown
444fc86258 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1


mysql-test/mysql-test-run.sh:
  Auto merged
2004-05-05 08:55:32 +02:00
unknown
316c128f9d Merge fixes
sql/ha_ndbcluster.cc:
  Updated use of extra ordered index after merge
  Removed TODO note in swedish
2004-05-05 08:54:12 +02:00
unknown
bddee0c170 Windows fixes for VC++ compiler compability
myisam/myisam_ftdump.c:
  VC++ compiler compability fix
mysys/my_getsystime.c:
  Applied Sergei's code for Windows (still subject to changes by him)
sql/handler.cc:
  VC++ compiler compability fix
sql/item_geofunc.cc:
  Removed non-used variable
sql/item_strfunc.cc:
  VC++ compiler compability fix
sql/opt_range.cc:
  VC++ compiler compability fix
sql/sql_insert.cc:
  VC++ compiler compability fix
sql/sql_lex.cc:
  VC++ compiler compability fix
sql/sql_parse.cc:
  VC++ compiler compability fix
sql/sql_prepare.cc:
  VC++ compiler compability fix
sql/sql_union.cc:
  Removed non-used variable and VC++ compiler compability fix
2004-05-05 02:59:17 -03:00
unknown
af847c22af Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_union.cc:
  Auto merged
2004-05-04 23:05:37 +03:00
unknown
5bd7b50cf1 Fix for a multi table updates when one of the tables is not updated
but used in a nested query.
2004-05-04 23:04:05 +03:00
unknown
f3d691a970 Correction of WL#1567: row_count() is -1 following non-insert/update/delete
statements.


mysql-test/r/sp.result:
  Added row_count() test for non-insert/update/delete statement.
mysql-test/t/sp.test:
  Added row_count() test for non-insert/update/delete statement.
sql/sql_class.h:
  thd->row_count_func must be signed for JDBC/ODBC (can be -1).
sql/sql_parse.cc:
  Reset thd->row_count_func to -1 for non-insert/update/delete statements.
2004-05-04 17:18:47 +02:00
unknown
5c9f01a79b Manual merge of bugfix for Bug #1664.
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Manual merge.
2004-05-04 19:13:18 +04:00
unknown
6ca757544b Fix for remaining issues described in Bug #1664
"mysql_send_long_data() API call is completely broken".

Now we are resetting some members (long_data_supplied/null_value...) of Item_param to its 
initial state after each execution of prepared statement. We also manipulating 
Item_param::maybe_null/null_value only via Item_param::set_* setters which makes code a bit 
more robust.


sql/item.cc:
  Now we are assuming that Item_param may be NULL until we know this fact exactly.
  Added non-empty implementation of Item_param::reset() method which should be used
  for restoring Item_param state after each statment execution. (We need to clear 
  long_data_supplied flag, we also clear some other Item_param members here since it
  makes code simpler.)
sql/item.h:
  Now Item_param::reset() method really does something.
sql/sql_prepare.cc:
  Now we are calling Item_param::reset() for each parameter after execution for resetting Item_param
  to initial state. So we no longer don't need Prepared_statement::long_data_flag. We also 
  set Item_param::null_value/maybe_null value in Item_param::set_* and reset() methods 
  instead of doing it explicitly in insert_params_* functions (this by the way lowers 
  probability that we will forget to update one of such functions).
tests/client_test.c:
  Added test for Bug#1664 "mysql_send_long_data() API call is broken".
2004-05-04 19:08:19 +04:00
unknown
40dba5a82f useless fixes for --report-password and --show-slave-auth-info (almost undocumented options),
just for beauty of truth.


sql/mysqld.cc:
  correcting sentence (even if option is not really usable,
  as it depends on report-user and report-password which are undocumented
  (and will stay like this)).
sql/slave.cc:
  report password when you must report password.
2004-05-04 16:35:31 +02:00
unknown
a1ec6140d2 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-04 15:49:22 +02:00
unknown
ed3f472a12 Fix for Bug#3357 "If the statement is long, the error message is trunc and important info is lost";
in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
so that it is not cut by truncation if the query is very long (which happens if the query goes first).


sql/log_event.cc:
  in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
  so that it is not cut by truncation if the query is very long (which happens if the query goes first).
2004-05-04 15:48:40 +02:00
unknown
a0c07c28ec Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prep-4.1
2004-05-04 16:42:39 +03:00
unknown
aaff8391f5 repetable test replaced with inline function 2004-05-04 16:37:04 +03:00
unknown
7e41bc959c don't rely on readdir() returning . and .. first 2004-05-04 14:36:23 +02:00
unknown
23029a0f56 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-05-04 15:35:11 +03:00
unknown
030587a7a6 Fix to handle unsigned data in prepared statements (Bug #3447)
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.


Docs/mysqld_error.txt:
  Updated error values
client/mysqlcheck.c:
  Don't cause auto-repair on 'note' (Tables that doesn't support 'check')
libmysql/libmysql.c:
  Fix to handle unsigned data in prepared statements (Bug #3447)
mysql-test/r/analyse.result:
  Test of analyze + impossible where (Bug #2238)
mysql-test/r/bdb.result:
  Update results
mysql-test/r/ctype_ujis.result:
  Update results
mysql-test/r/isam.result:
  Update results
mysql-test/r/repair.result:
  Update results
mysql-test/t/analyse.test:
  Test of analyze + impossible where (Bug #2238)
mysql-test/t/ctype_ujis.test:
  Added test for LIKE (Bug #3438)
sql/sql_acl.cc:
  Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
sql/sql_select.cc:
  Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
sql/sql_table.cc:
  Changed 'error' to 'note' when table doesn't support admin command.
sql/sql_update.cc:
  Indentaion cleanup
tests/client_test.c:
  Added test for handling unsigned/signed strings with prepared statements
2004-05-04 15:02:38 +03:00
unknown
7c4ceb739f WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted
mysql-test/r/sp.result:
  New test cases for function ROW_COUNT().
mysql-test/t/sp.test:
  New test cases for function ROW_COUNT().
sql/item_func.cc:
  New Item_func_row_count.
sql/item_func.h:
  New Item_func_row_count.
sql/lex.h:
  New symbol for function ROW_COUNT().
sql/sql_class.h:
  New slot in THD for storing the row_count after insert, delete and update.
sql/sql_delete.cc:
  Set thd->row_count_func when deleting.
sql/sql_insert.cc:
  Set thd->row_count_func when inserting.
sql/sql_parse.cc:
  Stored procedure CALLs send the row count from the last insert, delete or update.
sql/sql_update.cc:
  Set thd->row_count_func when updating.
sql/sql_yacc.yy:
  New function ROW_COUNT().
2004-05-04 13:45:20 +02:00
unknown
3a4d315fa1 fixed db name and layout (can cause very rare race condition bug) 2004-05-04 13:07:36 +03:00
unknown
38b5ea0487 trying to remove Windows compiler warnings (Miguel, could you please check if it's better now?)
innobase/eval/eval0eval.c:
  explicit cast
sql/ha_innodb.cc:
  removed unused variable
2004-05-03 23:35:11 +02:00
unknown
f543ca9149 compatibility fix. warning removed 2004-05-03 18:26:50 +02:00
unknown
19c91b7920 Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT
mysql-test/r/union.result:
  Results for a test case for bug involving UNION's and 
  SET SQL_SELECT_LIMIT
mysql-test/t/union.test:
  Test case for bug involving UNION's and 
  SET SQL_SELECT_LIMIT
sql/sql_union.cc:
  Patch  for a bug involving UNION's and SET SQL_SELECT_LIMIT
2004-05-03 19:15:26 +03:00
unknown
eaeefceab3 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1700-diff


sql/mysqld.cc:
  Auto merged
2004-05-03 16:15:45 +02:00
unknown
b482283cf7 WL#1700 - Properly count key_blocks_used and key_blocks_current.
Introduced a new free blocks list. Free blocks are now re-used before
new blocks are allocated from the pool. There is a new status variable 
which can be queried by "show status like key_blocks_unused".


include/keycache.h:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  free_block_list is the new free blocks list. It is implemented like a stack (LIFO).
  blocks_unused holds the number of never used blocks plus the number of blocks in the free list.
  Removed the variable global_blocks_used, as it was always the same as blocks_used.
mysql-test/r/key_cache.result:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Inserted some commands which show how key_blocks_used and key_blocks_unused work.
mysql-test/t/key_cache.test:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Inserted some commands which show how key_blocks_used and key_blocks_unused work.
mysys/mf_keycache.c:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Introduced a new free blocks list. The introductory comment says it all (I hope).
  Removed the variable global_blocks_used, as it was always the same as blocks_used.
sql/mysqld.cc:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  The blocks_unused count can be queried by "show status like key_blocks_unused".
  Removed the variable global_blocks_used, as it was always the same as blocks_used.
  Introduced SHOW_KEY_CACHE_CONST_LONG for status variables that
  must not be modified (i.e. flushed to zero).
sql/sql_show.cc:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Introduced SHOW_KEY_CACHE_CONST_LONG for status variables that
  must not be modified (i.e. flushed to zero).
sql/sql_test.cc:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Removed the variable global_blocks_used, as it was always the same as blocks_used.
sql/structs.h:
  WL#1700 - Properly count key_blocks_used and key_blocks_current.
  Introduced SHOW_KEY_CACHE_CONST_LONG for status variables that
  must not be modified (i.e. flushed to zero).
2004-05-03 15:55:21 +02:00
unknown
bcbaefcf97 return table list of fake_select in empty state to prevent using TABLE_LIST allocated on stack in next execution of PS (Bug #3577)
sql/sql_union.cc:
  return table list of fake_select in empty state to prevent using TABLE_LIST allocated on stack in next execution of PS
tests/client_test.c:
  test of UNIONS with PS
2004-05-03 13:58:01 +03:00
unknown
d7461c1365 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-03 09:45:17 +03:00
unknown
748db21631 fixed zero result case for group functions in subquery (Bug #3505)
fixed LIMIT 0 for zero rows optimisation


mysql-test/r/subselect.result:
  test case for bugreport
mysql-test/t/subselect.test:
  test case for bugreport
sql/sql_select.cc:
  cleanup sum function on reinit
  take in account LIMIT if zero result optimisation case
  do not forgot sum function in zero result case for subqueries
2004-05-02 13:03:49 +03:00
unknown
66f2d8bffa myisam_data_pointer_size
include/mysql.h:
  compatibility fix
2004-05-01 15:41:59 +02:00
unknown
2be0cbb888 removed duplicated check for thd->killed 2004-04-30 21:11:36 +02:00
unknown
8746b6a102 More small WL#1622 fixes: Allocate name of Prepared Statement on PS's mem_root.
sql/sql_prepare.cc:
  Allocate name of Prepared Statement on PS's mem_root.
2004-04-30 20:44:46 +04:00
unknown
47322bf9b8 WL#1622 "SQL Syntax for Prepared Statements" - cosmetic code review fixes
mysql-test/r/ps.result:
  Added check if multiple SQL statements inside a PS are disabled
mysql-test/t/ps.test:
  Added check if multiple SQL statements inside a PS are disabled
2004-04-30 20:08:38 +04:00
unknown
85f85a8548 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2004-04-30 19:24:57 +04:00
unknown
dc861599cd Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-30 14:16:34 +02:00
unknown
d540f0c011 Merge neptunus.(none):/home/magnus/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1-insert


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-04-30 13:42:47 +02:00
unknown
ddbef950cb Merge neptunus.(none):/home/magnus/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1-sql-bench


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-04-30 13:41:19 +02:00
unknown
4960b897b7 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-04-30 13:39:31 +02:00
unknown
08676716ff WL#1727 Implement read_range_first and read_range_next
sql/ha_ndbcluster.cc:
  Added new function set_bounds, used to set bounds in NDB from a key_range
  Updated ordered_index_scan to take start_key and end_key as parameters
  Override of functions read_range_first and read_range_next, to call appropriate access function in NDB
sql/ha_ndbcluster.h:
  Added functions set_bounds, read_range_first and read_range_next
  Changed declaration of ordered_index_scan
2004-04-30 13:38:41 +02:00
unknown
72c7b3529e Merge
libmysql/libmysql.c:
  Auto merged
tests/client_test.c:
  Auto merged
include/mysql.h:
  SCCS merged
2004-04-30 14:04:51 +03:00
unknown
15c2bb61f5 Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
Added checking of cut read lines in bootstrap thread (Bug #2874)


include/mysql.h:
  Added length to MYSQL_ROWS to enable sanity checking of packets
  Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result()
libmysql/libmysql.c:
  Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
scripts/fill_help_tables.sh:
  Added checking of maximum length of line in output (Bug #2874)
scripts/mysql_install_db.sh:
  Added error message if help tables couldn't be done (Bug #2874)
sql/sql_parse.cc:
  Added checking of cut read lines in bootstrap thread (Bug #2874)
tests/client_test.c:
  Added --debug
  Changed some strange define names
  Less output
  Added testing of max_length for prepared statements
2004-04-30 14:02:17 +03:00
unknown
74a46d1359 Merge neptunus.(none):/home/magnus/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1-sql-bench
2004-04-30 12:45:20 +02:00
unknown
0f0635ec0f Add extra ordered index in when UNIQUE and PRIMARY KEY are specified.
Extra ordered indexes are created primarily 
to support partial key scan/read and range scans of hash indexes.
I.e. the ordered index are used instead of the hash indexes for 
these queries.


sql/ha_ndbcluster.cc:
  Add creation and use of extra ordered indexes on pk and unique indexes.
sql/ha_ndbcluster.h:
  Added new functions for creating extra ordered indexes
2004-04-30 12:25:31 +02:00
unknown
41dfe1514d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-30 10:43:59 +02:00
unknown
b36398fe0d compatibility fix (bug#3606) 2004-04-30 10:42:12 +02:00
unknown
be5d750a24 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-u2


include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Auto merged
2004-04-30 03:00:55 +04:00
unknown
d5237fd09f Fix for Bug#3035 "Prepared statement integer inserts": now unsigned
flag is sent to server with placeholder types.
There were no need to extend the protocol as one additional byte
was reserved for placeholder code, when placeholder code is in range 0-255.
So this byte is now used for flags. Post-review fixes added.


include/config-win.h:
  added floaststore implementation
include/my_global.h:
  added floatstore implementation
include/mysql.h:
  Bug#3035:
  added 'is_unsigned' member
  binary_data wasn't used, removed
  null_field wasn't necessary, removed
include/mysql_com.h:
  Unused defines were removed.
libmysql/libmysql.c:
  Function store_param_type was removed - too much for a function, especially
  with bug in it.
  New implementation is inline and takes into account signedness of 
  placeholder.
  Fixed store functions to not perform double network-host order conversion
  on high-byte-first systems (should also fix Bug#3578 "Prepared statement 
  integer conversions work wrong in 64-bit Power Mac G5 CPUs").
  null_field removed.
sql/sql_prepare.cc:
  Placeholder sign is taken into account when reading data from network.
tests/client_test.c:
  Test for BUG#3035 added: insert and retrieve minimum and maximum of all
  integer types.
2004-04-30 03:00:19 +04:00
unknown
242fe78d2b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-my-ps-bugs


tests/client_test.c:
  Auto merged
2004-04-30 00:00:54 +04:00
unknown
3594adb165 InnoDB: implement LOCK TABLE (Bug #3299)
innobase/include/lock0lock.h:
  Add lock_table_unlock() and lock_release_tables_off_kernel()
  Add LOCK_TABLE_EXP
innobase/include/row0mysql.h:
  Add row_unlock_table_for_mysql() and row_lock_table_for_mysql()
innobase/include/trx0trx.h:
  Add n_tables_locked
innobase/lock/lock0lock.c:
  Add LOCK_TABLE_EXP for explicit LOCK TABLE commands
  Add lock_table_unlock()
  Add lock_release_tables_off_kernel()
innobase/row/row0mysql.c:
  Add row_unlock_table_for_mysql() and row_lock_table_for_mysql()
innobase/trx/trx0trx.c:
  Add n_tables_locked
mysql-test/r/innodb.result:
  Updated handling of auto_inc columns
sql/ha_innodb.cc:
  Call row_lock_table_for_mysql() and row_unlock_table_for_mysql()
2004-04-29 16:42:33 +03:00
unknown
155f8b3d31 WL#1737 Removed superfluous "NoCommit" from insert
sql/ha_ndbcluster.cc:
  Added 3 new variables for keeping track of insert batching
sql/ha_ndbcluster.h:
  Send more inserts per roundtrip to NDB
  Regulate how many inserts are sent by calculating number of bytes in each row.
2004-04-29 14:38:35 +02:00
unknown
ae629fff86 Allow one to send empty strings with mysql_stmt_send_long_data()
mysql_stmt_reset() now resets param->long_data_used
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
Fixed problem with symlink test (bug in 4.1.2)


libmysql/libmysql.c:
  Allow one to send empty strings with mysql_stmt_send_long_data()
  mysql_stmt_reset() now resets param->long_data_used
mysys/default.c:
  Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
sql/unireg.cc:
  Fixed problem with symlink test:  .frm table was not properly deleted if handler create failed
2004-04-28 20:19:50 +03:00