database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
Files
f69bba4643b641e75506cd2c0556ebad17228105
mariadb/sql
History
unknown fe471aeda8 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel


client/mysqldump.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/status.result:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/log_event_old.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_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/status.test:
  Manual resolve with 5.1.
sql/log_event.cc:
  Manual resolve with 5.1.
sql/sql_yacc.yy:
  Manual resolve with 5.1.
2007-08-25 12:08:18 +03:00
..
examples
Bug#28862 Extended Latin1 characters get lost in CVS engine
2007-06-15 11:19:35 +05:00
share
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
2007-08-15 15:48:57 -06:00
.cvsignore
…
add_errmsg
…
authors.h
Correctly report load type.
2007-03-15 23:39:07 -07:00
client_settings.h
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
CMakeLists.txt
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
2007-08-06 23:16:01 +02:00
contributors.h
Many files:
2006-12-31 02:29:11 +01:00
custom_conf.h
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
derror.cc
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
2007-05-24 13:24:36 +03:00
des_key_file.cc
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
discover.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
event_data_objects.cc
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
event_data_objects.h
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
event_db_repository.cc
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
event_db_repository.h
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
event_queue.cc
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
event_queue.h
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
event_scheduler.cc
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
event_scheduler.h
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
events.cc
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
events.h
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
field_conv.cc
Fix doxygen warnings.
2007-08-16 21:14:47 +04:00
field.cc
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
field.h
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
2007-08-20 11:13:31 -06:00
filesort.cc
Bug#15130: CREATE .. SELECT was denied to use advantages of the SQL_BIG_RESULT.
2007-07-24 18:15:44 +04:00
frm_crypt.cc
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
gen_lex_hash.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
gstream.cc
…
gstream.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
ha_ndbcluster_binlog.cc
BUG#30017 log-slave-updates incorrect behavior for cluster
2007-08-23 16:13:21 +02:00
ha_ndbcluster_binlog.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
ha_ndbcluster_cond.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
ha_ndbcluster_cond.h
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-20 06:26:23 +02:00
ha_ndbcluster_tables.h
enabled test case
2007-03-20 17:07:53 +01:00
ha_ndbcluster.cc
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-24 12:38:26 +02:00
ha_ndbcluster.h
WL#3732 Information schema optimization
2007-08-03 03:14:05 +05:00
ha_partition.cc
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
2007-08-24 15:25:02 +03:00
ha_partition.h
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
2007-08-24 15:25:02 +03:00
handler.cc
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
2007-08-24 15:25:02 +03:00
handler.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2007-08-14 00:22:34 +03:00
hash_filo.cc
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
hash_filo.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
hostname.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
init.cc
Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121
2007-05-28 12:52:05 +04:00
item_buff.cc
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
item_cmpfunc.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
item_cmpfunc.h
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
2007-08-24 15:25:02 +03:00
item_create.cc
Fix doxygen warnings.
2007-08-15 17:43:08 +04:00
item_create.h
Fix doxygen warnings.
2007-08-15 17:43:08 +04:00
item_func.cc
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-22 16:08:55 +02:00
item_func.h
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-22 00:53:01 +05:00
item_geofunc.cc
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
2007-03-05 18:22:35 +04:00
item_geofunc.h
Merge mysql.com:/home/ram/work/b26038/b26038.5.0
2007-03-05 17:12:37 +04:00
item_row.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
item_row.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
item_strfunc.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2007-08-14 00:22:34 +03:00
item_strfunc.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2007-08-14 00:22:34 +03:00
item_subselect.cc
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
item_subselect.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
item_sum.cc
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-20 04:04:57 +05:00
item_sum.h
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
2007-06-30 20:49:28 -07:00
item_timefunc.cc
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-08-04 11:08:11 +02:00
item_timefunc.h
manual merge
2007-06-13 16:12:02 +02:00
item_xmlfunc.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
item_xmlfunc.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
item.cc
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
2007-08-24 15:25:02 +03:00
item.h
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-08-04 11:08:11 +02:00
key.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
lex_symbol.h
Fix -ansi -pedantic warning (can't cast a pointer to function
2007-03-08 12:04:45 +03:00
lex.h
WL#3629 - Replication of Invocation and Invoked Features
2007-03-30 11:08:19 -04:00
lock.cc
Bug#29936 (Stored Procedure DML ignores low_priority_updates setting)
2007-08-17 17:11:08 -03:00
log_event_old.cc
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-22 16:08:55 +02:00
log_event_old.h
Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
2007-08-16 07:37:50 +02:00
log_event.cc
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-22 16:08:55 +02:00
log_event.h
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
log.cc
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-22 16:08:55 +02:00
log.h
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
2007-08-17 11:00:03 +02:00
Makefile.am
Merge maint1.mysql.com:/data/localhome/tsmith/bk/51
2007-07-04 22:38:53 +02:00
matherr.c
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
message.mc
…
mf_iocache.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
my_decimal.cc
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
2007-05-24 13:24:36 +03:00
my_decimal.h
Merge trift2.:/MySQL/M51/clone-5.1
2007-06-05 17:53:02 +02:00
my_lock.c
Merge mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:32:21 +01:00
mysql_priv.h
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-22 16:08:55 +02:00
mysqld_suffix.h
…
mysqld.cc
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-22 16:08:55 +02:00
net_serv.cc
Slow query log to file now displays queries with microsecond precission
2007-07-30 11:33:50 +03:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
2007-08-24 15:25:02 +03:00
opt_range.h
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
2007-05-24 13:24:36 +03:00
opt_sum.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
parse_file.cc
Slow query log to file now displays queries with microsecond precission
2007-07-30 11:33:50 +03:00
parse_file.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
partition_element.h
wl#2936 - fixing problems
2007-04-13 19:23:02 +02:00
partition_info.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
partition_info.h
Bug#26827 - table->read_set is set incorrectly,
2007-07-04 21:55:26 +02:00
password.c
Merge mysql.com:/home/my/mysql-5.0
2007-01-27 03:46:45 +02:00
procedure.cc
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
procedure.h
Merge mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:32:21 +01:00
protocol.cc
Backport of TIME->MYSQL_TIME / Y2K fixset
2007-05-16 10:44:59 +02:00
protocol.h
Backport of TIME->MYSQL_TIME / Y2K fixset
2007-05-16 10:44:59 +02:00
records.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
repl_failsafe.cc
Renaming MASTER_INFO to Master_info in order to follow the coding
2007-08-16 08:52:50 +02:00
repl_failsafe.h
Renaming MASTER_INFO to Master_info in order to follow the coding
2007-08-16 08:52:50 +02:00
rpl_constants.h
WL#3464: Add replication event to denote gap in replication
2007-03-29 20:31:09 +02:00
rpl_filter.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
rpl_filter.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
rpl_injector.cc
Bug#17095 circular replication for ndb
2007-04-12 16:13:49 +02:00
rpl_injector.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
rpl_mi.cc
Renaming MASTER_INFO to Master_info in order to follow the coding
2007-08-16 08:52:50 +02:00
rpl_mi.h
Renaming MASTER_INFO to Master_info in order to follow the coding
2007-08-16 08:52:50 +02:00
rpl_record_old.cc
Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
2007-08-16 07:37:50 +02:00
rpl_record_old.h
Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
2007-08-16 07:37:50 +02:00
rpl_record.cc
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
2007-08-20 11:13:31 -06:00
rpl_record.h
Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
2007-08-16 07:37:50 +02:00
rpl_reporting.cc
BUG#24954 (Last_errno and Last_error not set after master_retry_count has
2007-06-11 22:15:39 +02:00
rpl_reporting.h
BUG#24954 (Last_errno and Last_error not set after master_retry_count has
2007-06-11 22:15:39 +02:00
rpl_rli.cc
Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
2007-08-16 07:37:50 +02:00
rpl_rli.h
Minor fix to let the build proceed.
2007-08-17 13:22:31 +02:00
rpl_tblmap.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
rpl_tblmap.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
rpl_utility.cc
Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
2007-08-16 07:37:50 +02:00
rpl_utility.h
Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
2007-08-16 07:37:50 +02:00
scheduler.cc
Fixed compiler warnings
2007-02-23 13:13:55 +02:00
scheduler.h
Fixed compiler warnings
2007-02-23 13:13:55 +02:00
set_var.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2007-08-14 00:22:34 +03:00
set_var.h
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
slave.cc
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
2007-08-17 11:00:03 +02:00
slave.h
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
2007-08-20 11:13:31 -06:00
sp_cache.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
sp_cache.h
…
sp_head.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2007-08-14 00:22:34 +03:00
sp_head.h
Provide initial module structure to Doxygen.
2007-08-15 19:08:44 +04:00
sp_pcontext.cc
Follow up after work on Bug 4968
2007-06-10 14:43:57 +04:00
sp_pcontext.h
Follow up after work on Bug 4968
2007-06-10 14:43:57 +04:00
sp_rcontext.cc
Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql
2007-08-02 18:42:56 +04:00
sp_rcontext.h
Bug#24989: The DEADLOCK error is improperly handled by InnoDB.
2007-07-30 17:14:34 +04:00
sp.cc
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
sp.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2007-06-01 12:12:06 +04:00
spatial.cc
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-07 20:14:06 +05:00
spatial.h
Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50
2007-03-23 17:48:03 -06:00
sql_acl.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
sql_acl.h
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-20 17:58:30 +01:00
sql_analyse.cc
Fix doxygen warnings.
2007-08-15 17:43:08 +04:00
sql_analyse.h
Fix doxygen warnings.
2007-08-15 17:43:08 +04:00
sql_array.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
sql_base.cc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
2007-08-23 21:38:24 +02:00
sql_binlog.cc
Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
2007-08-16 07:37:50 +02:00
sql_bitmap.h
…
sql_builtin.cc.in
Many files:
2006-12-31 02:29:11 +01:00
sql_cache.cc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
2007-08-23 21:38:24 +02:00
sql_cache.h
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
2007-08-17 17:26:38 +02:00
sql_class.cc
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
sql_class.h
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-22 16:08:55 +02:00
sql_client.cc
Bug#26664 test suite times out on OS X 64bit
2007-05-24 11:21:27 +02:00
sql_connect.cc
Slow query log to file now displays queries with microsecond precission
2007-07-30 11:33:50 +03:00
sql_crypt.cc
Merge mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:32:21 +01:00
sql_crypt.h
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
sql_cursor.cc
Merge mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:32:21 +01:00
sql_cursor.h
my_strtoll10-x86.s:
2006-12-31 01:02:27 +01:00
sql_db.cc
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
sql_delete.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2007-08-14 00:22:34 +03:00
sql_derived.cc
- addendum of the fix for bug 27786:
2007-04-23 14:16:49 +03:00
sql_do.cc
Merge mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:32:21 +01:00
sql_error.cc
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
2007-07-27 00:31:06 -06:00
sql_error.h
BUG#26976 - Missing table in merge not noted in related error msg +
2007-06-06 04:42:41 +05:00
sql_handler.cc
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
sql_help.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
sql_insert.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2007-08-14 00:22:34 +03:00
sql_lex.cc
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
2007-08-24 15:25:02 +03:00
sql_lex.h
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
2007-08-23 21:38:24 +02:00
sql_list.cc
5.1 version of a fix and test cases for bugs:
2007-05-28 15:30:01 +04:00
sql_list.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
2007-06-01 12:12:06 +04:00
sql_load.cc
(Pushing for Andrei)
2007-07-30 19:02:21 +03:00
sql_locale.cc
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
2007-01-12 12:31:44 +01:00
sql_manager.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
sql_map.cc
Added casts to avoid compiler warnings and fixed a wrong type.
2007-05-31 17:45:22 +03:00
sql_map.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
sql_olap.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
sql_parse.cc
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
2007-08-20 11:13:31 -06:00
sql_partition.cc
After-merge fix for bug#14151.
2007-07-19 18:05:55 +02:00
sql_partition.h
Merge bk@192.168.21.1:mysql-5.1-opt
2007-06-25 14:28:30 +05:00
sql_plugin.cc
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
sql_plugin.h
5.0-opt -> 5.1-opt merge
2007-06-12 18:41:56 +03:00
sql_prepare.cc
Fix doxygen warnings.
2007-08-15 17:43:08 +04:00
sql_rename.cc
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
2007-07-27 00:31:06 -06:00
sql_repl.cc
Renaming MASTER_INFO to Master_info in order to follow the coding
2007-08-16 08:52:50 +02:00
sql_repl.h
Renaming MASTER_INFO to Master_info in order to follow the coding
2007-08-16 08:52:50 +02:00
sql_select.cc
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
2007-08-24 15:25:02 +03:00
sql_select.h
Merge olga.mysql.com:/home/igor/mysql-5.1-opt
2007-08-03 08:46:01 -07:00
sql_servers.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03: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/bk/mysql-5.1-main
2007-08-24 15:25:02 +03:00
sql_show.h
WL#3732 Information schema optimization
2007-08-03 03:14:05 +05:00
sql_sort.h
Fixed bug #25798.
2007-07-01 15:33:28 -07:00
sql_state.c
…
sql_string.cc
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-22 16:08:55 +02:00
sql_string.h
Merge mysql.com:/home/my/mysql-5.0
2007-01-27 03:46:45 +02:00
sql_table.cc
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-22 16:08:55 +02:00
sql_tablespace.cc
Bug #26418: Slave out of sync after
2007-06-19 14:27:53 +03:00
sql_test.cc
Fixes Bug#30127: --debug-info no longer prints memory usage in mysql
2007-08-01 22:59:05 +03:00
sql_trigger.cc
Fix doxygen warnings.
2007-08-15 17:43:08 +04:00
sql_trigger.h
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-16 23:31:36 +04:00
sql_udf.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
sql_udf.h
Remove typedef st_table_list TABLE_LIST and always use name 'TABLE_LIST'.
2007-07-06 16:18:49 +04:00
sql_union.cc
Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql
2007-08-02 18:42:56 +04:00
sql_update.cc
Fix doxygen warnings.
2007-08-15 17:43:08 +04:00
sql_view.cc
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30287
2007-08-21 19:46:29 +05:00
sql_view.h
…
sql_yacc.yy
Correct an erroneous manual merge.
2007-08-22 17:25:31 +02:00
stacktrace.c
Merge ymer.(none):/usr/local/mysql/mysql-5.0-engines
2007-07-07 07:48:43 +02:00
stacktrace.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
strfunc.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
structs.h
Slow query log to file now displays queries with microsecond precission
2007-07-30 11:33:50 +03:00
table.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
2007-08-16 18:21:47 +02:00
table.h
Manual merge of parallel development in separate team trees.
2007-08-22 17:13:42 +02:00
thr_malloc.cc
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
time.cc
Merge magare.gmz:/home/kgeorge/mysql/work/B29536-5.0-opt
2007-08-06 06:34:21 -07:00
tzfile.h
WL#3817: Simplify string / memory area types and make things more consistent (first part)
2007-05-10 12:59:39 +03:00
tztime.cc
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
2007-08-13 16:11:25 +03:00
tztime.h
Bug#28641 CREATE EVENT with '2038.01.18 03:00:00' let server crash.
2007-07-25 09:43:49 +02:00
udf_example.c
Bug#29804 UDF parameters don't contain correct string length
2007-08-09 10:21:28 +02:00
udf_example.def
Bug#29804 UDF parameters don't contain correct string length
2007-08-13 09:46:09 +02:00
uniques.cc
Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt
2007-07-04 11:46:45 +03:00
unireg.cc
Merge magare.gmz:/home/kgeorge/mysql/work/B29325-5.0-opt
2007-07-11 11:57:49 +03:00
unireg.h
Merge trift2.:/MySQL/M51/target-5.1.22
2007-08-22 16:08:55 +02:00