mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown e628ba73e3 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel


client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_malloc.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
mysql-test/r/grant.result:
  Merged from 5.0
sql/sql_db.cc:
  Merged from 5.0
sql/sql_parse.cc:
  Merged from 5.0
2007-04-13 10:25:33 +03:00
..
examples BUG#26138 - REPAIR TABLE with option USE_FRM erases all records in 2007-03-30 13:00:21 +05:00
share Merge bk@192.168.21.1:mysql-5.1-opt 2007-04-07 14:59:53 +05:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
event_data_objects.h Post-merge and post-review fixes for the patch for 2007-04-05 20:47:22 +04:00
event_db_repository.cc Small fixes for merge. 2007-04-10 18:01:29 +03:00
event_db_repository.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-04-05 15:49:46 +04:00
event_queue.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
event_queue.h A set of changes aiming to make the Event Scheduler more user-friendly 2007-04-05 15:24:34 +04:00
event_scheduler.cc Remove a race between Event Scheduler shutdown and SHOW PROCESSLIST. 2007-04-06 19:44:14 +04:00
event_scheduler.h A set of changes aiming to make the Event Scheduler more user-friendly 2007-04-05 15:24:34 +04:00
events.cc Merge bk@192.168.21.1:mysql-5.1-opt 2007-04-07 14:59:53 +05:00
events.h Post-merge and post-review fixes for the patch for 2007-04-05 20:47:22 +04:00
field.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
field.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
field_conv.cc Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 2007-03-31 02:42:40 +04:00
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
ha_ndbcluster.h Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2007-04-05 08:39:12 +02:00
ha_ndbcluster_binlog.cc ha_ndbcluster.cc: 2007-04-05 15:59:42 +02:00
ha_ndbcluster_binlog.h Bug #26783 replication status unknown after cluster or mysqld failure 2007-04-03 07:20:55 +02:00
ha_ndbcluster_tables.h
ha_partition.cc bug #26074 Mysql crash creating partition 2007-04-05 20:26:18 +05:00
ha_partition.h
handler.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
handler.h Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 2007-03-31 17:29:40 +05:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2007-04-03 13:51:31 +02:00
item.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
item_buff.cc
item_cmpfunc.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
item_cmpfunc.h Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 2007-04-06 12:45:07 +05:00
item_create.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 2007-03-29 12:13:42 -04:00
item_create.h Bug #23491 MySQLDump prefix function call in a view by database name 2007-03-29 11:12:12 -04:00
item_func.cc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-08 20:46:40 +02:00
item_func.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 2007-04-02 11:15:09 +02:00
item_strfunc.h Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 2007-04-03 16:13:27 +05:00
item_subselect.cc
item_subselect.h
item_sum.cc Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 2007-04-02 11:15:09 +02:00
item_sum.h Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt 2007-03-26 17:03:57 +03:00
item_timefunc.cc Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
item_timefunc.h Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
item_xmlfunc.cc
item_xmlfunc.h
key.cc
lex.h WL#3629 - Replication of Invocation and Invoked Features 2007-03-30 11:08:19 -04:00
lex_symbol.h
lock.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-03-29 13:49:10 +02:00
log.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
log.h
log_event.cc Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 2007-04-02 11:15:09 +02:00
log_event.h WL#3464 (Add replication event to denote gap in replication): 2007-03-30 15:29:30 +02:00
Makefile.am Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-03-29 21:38:03 +02:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
my_decimal.h Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
my_lock.c
mysql_priv.h Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel 2007-04-13 10:25:33 +03:00
mysqld.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
mysqld_suffix.h
net_serv.cc Added more descriptive error message of why statement was automaticly dropped 2007-04-13 01:56:22 +03:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge mysql.com:/home/psergey/bk-trees/mysql-5.0-opt 2007-03-31 03:12:33 +04:00
opt_range.h
opt_sum.cc
parse_file.cc Merge vajra.(none):/opt/local/work/mysql-5.0-runtime 2007-04-06 21:18:25 +04:00
parse_file.h
partition_element.h
partition_info.cc aftermerging fix 2007-04-05 13:25:39 +05:00
partition_info.h Remove unnecessary casts to uchar. The casts are stemming from 2007-03-27 21:09:56 +04:00
password.c
procedure.cc
procedure.h
protocol.cc Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
protocol.h Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
records.cc
repl_failsafe.cc Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991 2007-03-29 15:29:26 +02:00
repl_failsafe.h
rpl_constants.h WL#3464: Add replication event to denote gap in replication 2007-03-29 20:31:09 +02:00
rpl_filter.cc
rpl_filter.h
rpl_injector.cc Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data 2007-04-03 14:31:46 +02:00
rpl_injector.h Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data 2007-04-03 14:31:46 +02:00
rpl_mi.cc Bug#19991 CHANGE MASTER need option ssl-verify-server-cert 2007-03-29 15:09:57 +02:00
rpl_mi.h Bug#19991 CHANGE MASTER need option ssl-verify-server-cert 2007-03-29 15:09:57 +02:00
rpl_rli.cc WL#3464 (Add replication event to denote gap in replication): 2007-03-30 15:29:30 +02:00
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
scheduler.cc
scheduler.h
set_var.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-13 09:07:46 +03:00
set_var.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-04-05 15:49:46 +04:00
slave.cc Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 2007-04-02 11:15:09 +02:00
slave.h
sp.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
sp_head.h Merge bk@192.168.21.1:mysql-5.1-opt 2007-04-07 14:59:53 +05:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50 2007-03-23 17:48:03 -06:00
sql_acl.cc Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel 2007-03-29 17:27:42 +03:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel 2007-03-29 17:27:42 +03:00
sql_cache.h
sql_class.cc Added more descriptive error message of why statement was automaticly dropped 2007-04-13 01:56:22 +03:00
sql_class.h Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 2007-04-03 13:55:20 +02:00
sql_client.cc
sql_connect.cc Manual merge from 5.0 2007-03-29 21:11:17 +03:00
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel 2007-04-13 10:25:33 +03:00
sql_delete.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
sql_derived.cc
sql_do.cc
sql_error.cc Added warn_root as argument for push_back() 2007-04-11 13:27:36 +03:00
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
sql_lex.cc Remove unnecessary casts to uchar. The casts are stemming from 2007-03-27 21:09:56 +04:00
sql_lex.h Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-04 11:05:22 +02:00
sql_list.cc
sql_list.h Merge mysql.com:/home/psergey/mysql-5.0-merge 2007-03-29 12:24:23 +04:00
sql_load.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel 2007-04-13 10:25:33 +03:00
sql_partition.cc Merge bk@192.168.21.1:mysql-5.1-opt 2007-04-07 14:59:53 +05:00
sql_partition.h Remove unnecessary casts to uchar. The casts are stemming from 2007-03-27 21:09:56 +04:00
sql_plugin.cc Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 2007-04-03 16:13:27 +05:00
sql_plugin.h
sql_prepare.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-04 21:25:39 +03:00
sql_rename.cc
sql_repl.cc Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991 2007-03-29 15:29:26 +02:00
sql_repl.h
sql_select.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 2007-04-02 03:56:39 +02:00
sql_select.h
sql_servers.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-03 14:34:37 +04:00
sql_servers.h BUG#26257 New Federated Server Functionality Doesn't support differently named tables 2007-03-24 01:18:19 -07:00
sql_show.cc Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel 2007-04-13 10:25:33 +03:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
sql_tablespace.cc
sql_test.cc A set of changes aiming to make the Event Scheduler more user-friendly 2007-04-05 15:24:34 +04:00
sql_trigger.cc Remove unnecessary casts to uchar. The casts are stemming from 2007-03-27 21:09:56 +04:00
sql_trigger.h Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2007-04-05 08:39:12 +02:00
sql_udf.cc Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 2007-04-03 16:13:27 +05:00
sql_udf.h
sql_union.cc
sql_update.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
sql_view.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-04 21:25:39 +03:00
sql_view.h
sql_yacc.yy Merge bk@192.168.21.1:mysql-5.1-opt 2007-04-07 14:59:53 +05:00
stacktrace.c Fix compiler warnings 2007-03-29 16:47:38 +02:00
stacktrace.h restored run-time thread lib detection 2007-03-28 16:23:44 +02:00
strfunc.cc Change find_type family to accept const TYPELIB*. 2007-03-27 20:27:58 +04:00
structs.h Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
table.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
table.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-04-05 15:49:46 +04:00
thr_malloc.cc
time.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
tzfile.h
tztime.cc Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
tztime.h Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
udf_example.c
udf_example.def
uniques.cc
unireg.cc Removed not used define YY_MAGIC_BELOW 2007-03-23 22:08:31 +02:00
unireg.h