mariadb/sql
unknown 5438ab9cd5 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dsl-hkigw8-febefb00-148.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug22027_create_select_exists


sql/sql_show.cc:
  Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  SCCS merged
2006-10-23 14:42:00 +03:00
..
examples
share Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 2006-10-10 21:59:23 +02:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc
event_data_objects.h
event_db_repository.cc
event_db_repository.h
event_queue.cc
event_queue.h
event_scheduler.cc
event_scheduler.h
events.cc
events.h
field.cc Merge bk-internal:/home/bk/mysql-5.1-new-rpl 2006-10-03 15:56:56 +02:00
field.h Merge siva.hindu.god:/usr/home/tim/m/bk/50 2006-09-29 18:04:34 -06:00
field_conv.cc After merge fix 2006-10-03 16:00:09 +05:00
filesort.cc Merge siva.hindu.god:/usr/home/tim/m/bk/50 2006-09-29 18:04:34 -06:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 2006-10-10 11:25:24 +02:00
ha_ndbcluster.h This removes the passing of global hton to engine instance. 2006-09-29 17:19:02 -07:00
ha_ndbcluster_binlog.cc This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). 2006-09-30 12:49:46 -07:00
ha_ndbcluster_binlog.h This patch makes ndbcluster_hton not static. I have a second patch for ndbcluster_hton to be static, but I want to talk to Jonas first. 2006-10-01 11:17:59 -07:00
ha_ndbcluster_tables.h
ha_partition.cc Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 2006-10-05 00:41:29 -07:00
ha_partition.h This removes the passing of global hton to engine instance. 2006-09-29 17:19:02 -07:00
handler.cc This patch updates to remove most global hton needs. Cleans up wrong message in partition. 2006-09-30 18:31:13 -07:00
handler.h Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 2006-10-05 00:41:29 -07:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-10-02 21:41:35 +04:00
item.h
item_buff.cc
item_cmpfunc.cc
item_cmpfunc.h
item_create.cc
item_create.h
item_func.cc BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID 2006-10-02 14:28:23 +04:00
item_func.h BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID 2006-10-02 14:28:23 +04:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc
item_strfunc.h
item_subselect.cc
item_subselect.h
item_sum.cc Merge siva.hindu.god:/usr/home/tim/m/bk/50 2006-09-29 18:04:34 -06:00
item_sum.h
item_timefunc.cc
item_timefunc.h
item_uniq.cc
item_uniq.h
item_xmlfunc.cc
item_xmlfunc.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 2006-10-10 21:59:23 +02:00
log.h
log_event.cc Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2006-10-10 15:26:02 +02:00
log_event.h Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2006-10-06 15:31:05 +02:00
Makefile.am
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-10-03 13:27:48 +02:00
mysqld.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-10-03 09:28:44 +02:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-10-03 13:27:48 +02:00
opt_range.h
opt_sum.cc
parse_file.cc Bug#21370: View renaming lacks tablename_to_filename encoding 2006-10-16 22:42:03 +05:00
parse_file.h
partition_element.h
partition_info.cc This patch updates to remove most global hton needs. Cleans up wrong message in partition. 2006-09-30 18:31:13 -07:00
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
records.cc
repl_failsafe.cc
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc
rpl_injector.h
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
set_var.cc BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID 2006-10-02 14:28:23 +04:00
set_var.h
slave.cc Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 2006-10-10 21:59:23 +02:00
slave.h Merge siva.hindu.god:/usr/home/tim/m/bk/g51 2006-09-29 17:01:16 -06:00
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Merge siva.hindu.god:/usr/home/tim/m/bk/50 2006-09-29 18:04:34 -06:00
sql_binlog.cc BUG#19459 (BINLOG RBR command does not lock tables correctly causing 2006-10-06 10:17:02 +02:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc This patch updates to remove most global hton needs. Cleans up wrong message in partition. 2006-09-30 18:31:13 -07:00
sql_cache.h
sql_class.cc After merge fix. 2006-10-03 17:07:30 +04:00
sql_class.h Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2006-10-05 15:22:41 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc Merge fix. 2006-09-30 19:08:13 -07:00
sql_cursor.h
sql_db.cc
sql_delete.cc
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 2006-10-10 21:59:23 +02:00
sql_lex.cc Merge siva.hindu.god:/usr/home/tim/m/bk/50 2006-09-29 18:04:34 -06:00
sql_lex.h
sql_list.cc
sql_list.h
sql_load.cc BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID 2006-10-02 14:28:23 +04:00
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID 2006-10-02 14:28:23 +04:00
sql_partition.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2006-09-30 00:31:33 +04:00
sql_partition.h
sql_plugin.cc
sql_plugin.h
sql_prepare.cc
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-10-02 21:41:35 +04:00
sql_select.h
sql_show.cc Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 2006-10-23 14:42:00 +03:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc
sql_tablespace.cc This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). 2006-09-30 12:49:46 -07:00
sql_test.cc
sql_trigger.cc After merge fix. Removed method which is no longer used. 2006-09-30 11:58:45 +04:00
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-10-08 15:32:00 +05:00
sql_view.cc Bug#21370: View renaming lacks tablename_to_filename encoding 2006-10-16 22:42:03 +05:00
sql_view.h
sql_yacc.yy sql_yacc.yy: 2006-10-03 17:05:33 +05:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 2006-10-02 14:42:12 +05:00
table.h
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
udf_example.c
udf_example.def
uniques.cc
unireg.cc Merge siva.hindu.god:/usr/home/tim/m/bk/50 2006-09-29 18:04:34 -06:00
unireg.h