mariadb/sql
unknown bd365f7622 After merge fixes
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results


libmysql/libmysql.c:
  Add support for warnings for prepare of prepared statements
mysql-test/r/func_concat.result:
  After merge fixes
mysql-test/r/select.result:
  Delete conflicting tables form previous tests
mysql-test/r/view.result:
  New code from 4.1 fixed old error
mysql-test/t/create.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/func_group.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/func_time.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/having.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/insert_select.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/select.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/sp.test:
  Fixed comment
mysql-test/t/system_mysql_db_fix.test:
  Fix that results is same as from system_mysql_db.test
mysql-test/t/trigger.test:
  Added comment
mysql-test/t/type_blob.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/union.test:
  Run most of the test with --ps-protocol
mysql-test/t/user_limits.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/view.test:
  Removed --error as bug is now fixed
mysql-test/t/warnings.test:
  Ensure that --ps-protocol return same results as normal test
ndb/include/Makefile.am:
  Don't automaticly use SCCS files
sql/ha_ndbcluster.cc:
  Removed compiler warning
sql/log_event.cc:
  After merge fix
sql/sql_class.h:
  After merge fix
sql/sql_insert.cc:
  After merge fix
sql/sql_load.cc:
  After merge fix
sql/sql_prepare.cc:
  Add support for warnings for prepare of prepared statements
sql/sql_update.cc:
  After merge fixes
2005-01-04 13:46:53 +02:00
..
examples
share WL#925 - Privileges for stored routines 2004-12-23 10:46:24 +00:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc WL#1895 - Print message to error log in case of detected MyISAM corruption 2004-12-23 20:11:38 +01:00
des_key_file.cc
discover.cc
field.cc After merge fixes 2004-12-31 00:44:00 +02:00
field.h Fix for bug #7467: sql_lex.c on HPUX fails to compile 2004-12-24 12:42:01 +03:00
field_conv.cc
filesort.cc
frm_crypt.cc
gen_lex_hash.cc After merge fixes 2004-12-31 00:44:00 +02:00
gstream.cc
gstream.h
ha_berkeley.cc
ha_berkeley.h
ha_federated.cc
ha_federated.h
ha_heap.cc
ha_heap.h
ha_innodb.cc manually merged 2004-12-31 15:26:24 +01:00
ha_innodb.h logging_ok: 2004-12-24 12:13:32 +01:00
ha_myisam.cc After merge fixes 2004-12-31 00:44:00 +02:00
ha_myisam.h
ha_myisammrg.cc Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0. 2004-12-27 14:05:35 +02:00
ha_myisammrg.h Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0. 2004-12-27 14:05:35 +02:00
ha_ndbcluster.cc After merge fixes 2005-01-04 13:46:53 +02:00
ha_ndbcluster.h Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2005-01-03 09:46:59 +01:00
handler.cc Merge with global tree 2004-12-31 00:50:30 +02:00
handler.h revert "LOCK TABLES ... WHERE ENGINE=INNODB" 2004-12-27 12:08:22 +01:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc After merge fixes 2004-12-31 00:44:00 +02:00
item.h After merge fixes 2004-12-31 00:44:00 +02:00
item_buff.cc
item_cmpfunc.cc manually merged 2004-12-31 15:26:24 +01:00
item_cmpfunc.h
item_create.cc
item_create.h
item_func.cc manually merged 2004-12-31 15:26:24 +01:00
item_func.h
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Streamlined code for trim, ltrim and rtrim 2005-01-02 23:31:37 +02:00
item_strfunc.h
item_subselect.cc manually merged 2004-12-31 15:26:24 +01:00
item_subselect.h
item_sum.cc Better handling of ensuring that setup_tables() are not called twice 2005-01-03 21:04:33 +02:00
item_sum.h Better handling of ensuring that setup_tables() are not called twice 2005-01-03 21:04:33 +02:00
item_timefunc.cc Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
item_timefunc.h Fix for bug #7515 "from_unixtime(0) now returns NULL instead of 2004-12-30 21:18:10 +03:00
item_uniq.cc
item_uniq.h
key.cc
lex.h Manual merge. 2004-12-31 12:48:27 +03:00
lex_symbol.h
lock.cc revert "LOCK TABLES ... WHERE ENGINE=INNODB" 2004-12-27 12:08:22 +01:00
log.cc manually merged 2004-12-31 15:26:24 +01:00
log_event.cc After merge fixes 2005-01-04 13:46:53 +02:00
log_event.h Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
Makefile.am
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
mysqld.cc manually merged 2004-12-31 15:26:24 +01:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc WL#2126 - Multi_read_range. 2004-12-23 21:45:10 +01:00
opt_range.h WL#2126 - Multi_read_range. 2004-12-23 21:45:10 +01:00
opt_sum.cc
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
protocol_cursor.cc
records.cc WL#2126 - Multi_read_range. 2004-12-23 21:45:10 +01:00
repl_failsafe.cc
repl_failsafe.h
set_var.cc Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
set_var.h WL#1339 "Add per account max_user_connections limit (maximum number 2004-12-29 20:30:37 +03:00
slave.cc
slave.h
sp.cc Merge with global tree 2004-12-31 00:50:30 +02:00
sp.h WL#925 - Privileges for stored routines 2004-12-23 10:46:24 +00:00
sp_cache.cc
sp_cache.h
sp_head.cc After merge fixes 2004-12-31 00:44:00 +02:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc post-merge 2004-12-31 17:59:43 +01:00
sql_acl.h WL#925 - Privileges for stored routines 2004-12-23 10:46:24 +00:00
sql_analyse.cc
sql_analyse.h
sql_base.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-01-04 01:59:24 +02:00
sql_bitmap.h
sql_cache.cc
sql_cache.h
sql_class.cc
sql_class.h After merge fixes 2005-01-04 13:46:53 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc
sql_delete.cc Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_handler.cc
sql_help.cc
sql_insert.cc After merge fixes 2005-01-04 13:46:53 +02:00
sql_lex.cc Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
sql_lex.h Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
sql_list.cc
sql_list.h
sql_load.cc After merge fixes 2005-01-04 13:46:53 +02:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
sql_prepare.cc After merge fixes 2005-01-04 13:46:53 +02:00
sql_rename.cc
sql_repl.cc Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
sql_repl.h Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
sql_select.cc Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
sql_select.h
sql_show.cc Merge with global tree 2004-12-31 00:50:30 +02:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Merge 2005-01-04 13:23:04 +02:00
sql_test.cc
sql_trigger.cc After merge fixes 2004-12-31 00:44:00 +02:00
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
sql_update.cc After merge fixes 2005-01-04 13:46:53 +02:00
sql_view.cc After merge fixes 2004-12-31 00:44:00 +02:00
sql_view.h
sql_yacc.yy Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
stacktrace.c
stacktrace.h
strfunc.cc manually merged 2004-12-31 15:26:24 +01:00
structs.h Manual merge of patch implementing WL#1339 with main tree. 2004-12-29 22:35:16 +03:00
table.cc Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases 2005-01-03 13:56:23 +02:00
table.h Better handling of ensuring that setup_tables() are not called twice 2005-01-03 21:04:33 +02:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc After merge fixes 2004-12-31 03:47:56 +02:00
tztime.h Merge with global tree 2004-12-31 00:50:30 +02:00
udf_example.cc
uniques.cc
unireg.cc manually merged 2004-12-31 15:26:24 +01:00
unireg.h WL#1895 - Print message to error log in case of detected MyISAM corruption 2004-12-23 20:11:38 +01:00
watchdog_mysqld