mariadb/sql
unknown 12a215b083 Merge with global tree
BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
libmysql/errmsg.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.h:
  Auto merged
2004-12-31 00:50:30 +02:00
..
examples Merge with 4.1 2004-12-22 13:54:39 +02:00
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 WL1424 Multiple MySQL Servers: SHOW TABLES etc. should detect new and delete old tables. 2004-09-13 14:46:38 +02:00
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 Merge with global tree 2004-12-18 06:05:16 +02:00
filesort.cc Merge bk-internal:/home/bk/mysql-5.0 2004-11-15 19:27:06 +01:00
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 Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
ha_berkeley.h merge with 4.1 2004-10-29 19:26:52 +03:00
ha_federated.cc WL# 2094 Federated Storage Handler, added fixes per suggestions by Bar and Antony 2004-12-16 19:08:32 -08:00
ha_federated.h WL# 2094 Federated Storage Handler, added fixes per suggestions by Bar and Antony 2004-12-16 19:08:32 -08:00
ha_heap.cc Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
ha_heap.h merged 2004-11-17 18:04:36 +01:00
ha_innodb.cc Review fixes. 2004-12-21 15:53:01 +02:00
ha_innodb.h Content merge. 2004-12-21 07:49:38 +02:00
ha_myisam.cc After merge fixes 2004-12-31 00:44:00 +02:00
ha_myisam.h bit type 2004-12-17 18:06:05 +04:00
ha_myisammrg.cc ha_myisammrg was missing index_type() method bug#6756 2004-11-23 22:57:04 +01:00
ha_myisammrg.h ha_myisammrg was missing index_type() method bug#6756 2004-11-23 22:57:04 +01:00
ha_ndbcluster.cc After merge fixes 2004-12-31 00:44:00 +02:00
ha_ndbcluster.h Merge with 4.1 2004-12-22 13:54:39 +02: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 Rename: Item::val -> Item::val_real(). 2004-11-11 21:39:35 +03:00
item_cmpfunc.cc After merge fixes 2004-12-31 00:44:00 +02:00
item_cmpfunc.h Merge with 4.1 2004-12-22 13:54:39 +02:00
item_create.cc Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
item_create.h Merge with 4.1 2004-12-22 13:54:39 +02:00
item_func.cc Merge with global tree 2004-12-31 00:50:30 +02:00
item_func.h Update results for new varchar handling 2004-12-07 15:47:00 +02:00
item_geofunc.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
item_geofunc.h Rename: Item::val -> Item::val_real(). 2004-11-11 21:39:35 +03:00
item_row.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
item_row.h Rename: Item::val -> Item::val_real(). 2004-11-11 21:39:35 +03:00
item_strfunc.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
item_strfunc.h Merge with 4.1 2004-12-22 13:54:39 +02:00
item_subselect.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
item_subselect.h Merge with 4.1 2004-12-22 13:54:39 +02:00
item_sum.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
item_sum.h Merge with 4.1 2004-12-22 13:54:39 +02:00
item_timefunc.cc merged 2004-11-20 18:36:41 +01:00
item_timefunc.h Rename: Item::val -> Item::val_real(). 2004-11-11 21:39:35 +03:00
item_uniq.cc
item_uniq.h merge 2004-11-12 15:36:31 +02:00
key.cc Merge with global tree 2004-12-19 20:25:19 +02:00
lex.h WL#925 - Privileges for stored routines 2004-12-23 10:46:24 +00:00
lex_symbol.h
lock.cc revert "LOCK TABLES ... WHERE ENGINE=INNODB" 2004-12-27 12:08:22 +01:00
log.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
log_event.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
log_event.h Merge with 4.1 2004-12-06 11:38:56 +02:00
Makefile.am Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 2004-12-16 18:40:25 -08:00
matherr.c
mf_iocache.cc
my_lock.c
mysql_priv.h Merge with global tree 2004-12-31 00:50:30 +02:00
mysqld.cc Merge with global tree 2004-12-31 00:50:30 +02:00
mysqld_suffix.h
net_serv.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
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 Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
parse_file.cc now my_printf_error is not better then my_error, but my_error call is shorter 2004-11-13 19:35:51 +02:00
parse_file.h fixed & added comments (according to Igor's review and a bit more) 2004-10-07 01:45:06 +03:00
password.c Merge with 4.1 2004-12-22 13:54:39 +02:00
procedure.cc now my_printf_error is not better then my_error, but my_error call is shorter 2004-11-13 19:35:51 +02:00
procedure.h Update results for new varchar handling 2004-12-07 15:47:00 +02:00
protocol.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
protocol.h merge 2004-11-12 15:36:31 +02:00
protocol_cursor.cc merge 2004-11-12 15:36:31 +02:00
records.cc WL#2126 - Multi_read_range. 2004-12-23 21:45:10 +01:00
repl_failsafe.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
repl_failsafe.h merge 2004-11-12 15:36:31 +02:00
set_var.cc Merge with global tree 2004-12-31 00:50:30 +02:00
set_var.h Merge with 4.1 2004-09-06 15:14:10 +03:00
slave.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
slave.h Merge with 4.1 2004-12-22 13:54:39 +02:00
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 Fix for bug #5888 "Triggers with nonexistent columns cause packets 2004-11-24 12:24:02 +03:00
sp_pcontext.cc Fixed BUG#5287: Stored procedure crash if leave outside loop. 2004-09-02 17:24:25 +02:00
sp_pcontext.h Fix warnings and compilation failures (Windows). 2004-11-17 13:45:05 +03:00
sp_rcontext.cc post-review fixes 2004-11-12 14:34:00 +02:00
sp_rcontext.h Fixed BUG#6029: Stored procedure specific handlers should have priority. 2004-10-23 14:23:32 +02:00
spatial.cc Fix for bug #6117 (Centroid() crashes server) 2004-10-22 20:32:02 +05:00
spatial.h Fix compiler warnings (detected by Intel's C++ compiler) 2004-10-22 18:44:51 +03:00
sql_acl.cc Merge with global tree 2004-12-31 00:50:30 +02:00
sql_acl.h WL#925 - Privileges for stored routines 2004-12-23 10:46:24 +00:00
sql_analyse.cc now my_printf_error is not better then my_error, but my_error call is shorter 2004-11-13 19:35:51 +02:00
sql_analyse.h
sql_base.cc Merge with global tree 2004-12-31 00:50:30 +02:00
sql_bitmap.h
sql_cache.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_cache.h merge with 4.1 2004-10-29 19:26:52 +03:00
sql_class.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_class.h Merge with global tree 2004-12-31 00:50:30 +02:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_delete.cc Merge with 4.1 2004-12-06 11:38:56 +02:00
sql_derived.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_do.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_error.cc merge 2004-11-12 15:36:31 +02:00
sql_handler.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_help.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_insert.cc After merge fixes 2004-12-31 00:44:00 +02:00
sql_lex.cc Merge with global tree 2004-12-31 00:50:30 +02:00
sql_lex.h Merge with global tree 2004-12-31 00:50:30 +02:00
sql_list.cc
sql_list.h protection: TRASH in delete 2004-11-28 15:53:17 +01:00
sql_load.cc post-merge fix 2004-11-25 02:23:13 +02:00
sql_manager.cc
sql_manager.h
sql_map.cc now my_printf_error is not better then my_error, but my_error call is shorter 2004-11-13 19:35:51 +02:00
sql_map.h
sql_olap.cc post-merge fix 2004-11-25 02:23:13 +02:00
sql_parse.cc Merge with global tree 2004-12-31 00:50:30 +02:00
sql_prepare.cc After merge fixes 2004-12-31 00:44:00 +02:00
sql_rename.cc Merge with 4.1 2004-12-06 11:38:56 +02:00
sql_repl.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_repl.h merge 2004-11-12 15:36:31 +02:00
sql_select.cc Merge with global tree 2004-12-31 00:50:30 +02:00
sql_select.h Merge with global tree 2004-12-19 20:25:19 +02:00
sql_show.cc Merge with global tree 2004-12-31 00:50:30 +02:00
sql_sort.h
sql_state.c
sql_string.cc Add support for up to VARCHAR (size up to 65535) 2004-12-06 02:00:37 +02:00
sql_string.h protection: TRASH in delete 2004-11-28 15:53:17 +01:00
sql_table.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_test.cc Added per thread status variables, after review, patch v1.1. 2004-09-13 16:48:01 +03:00
sql_trigger.cc After merge fixes 2004-12-31 00:44:00 +02:00
sql_trigger.h Fix for bug #5888 "Triggers with nonexistent columns cause packets 2004-11-24 12:24:02 +03:00
sql_udf.cc now my_printf_error is not better then my_error, but my_error call is shorter 2004-11-13 19:35:51 +02:00
sql_udf.h A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows). 2004-11-06 09:37:30 +04:00
sql_union.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_update.cc After merge fixes 2004-12-31 00:44:00 +02:00
sql_view.cc After merge fixes 2004-12-31 00:44:00 +02:00
sql_view.h post-merge fix 2004-11-25 02:23:13 +02:00
sql_yacc.yy Merge with global tree 2004-12-31 00:50:30 +02:00
stacktrace.c Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
stacktrace.h
strfunc.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
structs.h Merge with global tree 2004-12-19 20:25:19 +02:00
table.cc Merge with global tree 2004-12-31 00:50:30 +02:00
table.h Merge with global tree 2004-12-31 00:50:30 +02:00
thr_malloc.cc Simpler arena swapping code 2004-11-08 01:13:54 +02:00
time.cc Data truncation reporting implementation (libmysql) + post review 2004-12-16 03:15:06 +03:00
tzfile.h
tztime.cc Fix for bug #6849 "Crash while preparing query containing const expr with 2004-12-17 15:34:48 +03:00
tztime.h Merge with global tree 2004-12-31 00:50:30 +02:00
udf_example.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
uniques.cc
unireg.cc Merge with 4.1 2004-12-22 13:54:39 +02: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