database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
Files
7658394a581b79837e406723ef2a26b871750ec4
mariadb/sql
History
unknown 7658394a58 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0


mysql-test/r/show_check.result:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-02-12 13:52:10 +01:00
..
share
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
.cvsignore
…
add_errmsg
…
client_settings.h
Fix for #2126
2003-12-18 18:12:00 +04:00
custom_conf.h
…
derror.cc
Merge key cache structures to one
2003-11-20 22:06:25 +02:00
des_key_file.cc
Merge with 4.0.16
2003-10-07 15:42:26 +03:00
field_conv.cc
insert table select * from table2 now converts charsets correctly
2003-12-13 18:49:10 +01:00
field.cc
http://bugs.mysql.com/bug.php?id=2368
2004-02-10 15:42:46 +04:00
field.h
http://bugs.mysql.com/bug.php?id=2368
2004-02-10 15:42:46 +04:00
filesort.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
frm_crypt.cc
…
gen_lex_hash.cc
SCRUM
2004-01-23 16:02:57 +04:00
gstream.cc
…
gstream.h
…
ha_berkeley.cc
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
ha_berkeley.h
Precise read time estimates for index_merge/Unique
2003-12-18 06:08:00 +03:00
ha_heap.cc
Added --compact to mysqlbinlog
2004-02-09 12:31:03 +01:00
ha_heap.h
…
ha_innodb.cc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2003-12-20 00:40:07 +01:00
ha_innodb.h
Precise read time estimates for index_merge/Unique
2003-12-18 06:08:00 +03:00
ha_isam.cc
key_map with more that 64 bits width
2003-10-11 13:06:55 +02:00
ha_isam.h
…
ha_isammrg.cc
added 'explicit' keyword to Bitmap constructor
2003-11-21 19:16:19 +03:00
ha_isammrg.h
…
ha_myisam.cc
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +01:00
ha_myisam.h
Merge bk-internal:/home/bk/mysql-4.1/
2003-10-31 10:34:34 +01:00
ha_myisammrg.cc
Merge key cache structures to one
2003-11-20 22:06:25 +02:00
ha_myisammrg.h
…
handler.cc
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
2004-01-20 17:01:34 +02:00
handler.h
Merge mysql.com:/home/psergey/mysql-5.0-latest-pull
2003-12-20 00:54:38 +03:00
hash_filo.cc
…
hash_filo.h
SCRUM
2003-09-19 14:44:31 +05:00
hostname.cc
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
2003-11-22 03:21:40 +02:00
init.cc
Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
2003-11-03 14:01:59 +02:00
item_buff.cc
…
item_cmpfunc.cc
merge
2004-02-05 18:14:48 +01:00
item_cmpfunc.h
merge
2004-02-05 18:14:48 +01:00
item_create.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
item_create.h
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
item_func.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
item_func.h
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
item_geofunc.cc
SCRUM
2004-01-23 19:54:22 +04:00
item_geofunc.h
SCRUM:
2004-01-15 21:06:22 +04:00
item_row.cc
Fix for prepared statements
2003-12-30 14:08:19 +04:00
item_row.h
Pack of changes about 'cleanup()'-s
2004-01-20 20:55:47 +04:00
item_strfunc.cc
Added --compact to mysqlbinlog
2004-02-09 12:31:03 +01:00
item_strfunc.h
Problem fix:
2004-02-06 16:59:25 +04:00
item_subselect.cc
fix for the bug #2419: order by ignores rows.
2004-01-31 10:04:16 +04:00
item_subselect.h
Fix for prepared statements
2003-12-30 14:08:19 +04:00
item_sum.cc
Post-merge fixes.
2004-02-11 18:21:55 +01:00
item_sum.h
Post-merge fixes.
2004-02-11 18:21:55 +01:00
item_timefunc.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
item_timefunc.h
post-merge fixes
2003-12-08 15:18:29 +04:00
item_uniq.cc
…
item_uniq.h
Code cleanup (working on PS & cleanup() code)
2004-01-19 19:53:25 +04:00
item.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
item.h
Post-merge fixes.
2004-02-11 18:21:55 +01:00
key.cc
added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()
2003-10-30 12:57:26 +02:00
lex_symbol.h
SCRUM
2004-01-23 16:02:57 +04:00
lex.h
Post-merge fixes.
2004-02-11 18:21:55 +01:00
lock.cc
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
log_event.cc
Merge mysql.com:/my/mysql-4.1 into mysql.com:/my/mysql-5.0
2003-12-21 19:43:23 +02:00
log_event.h
Update for VC++
2003-12-21 02:07:45 +02:00
log.cc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2003-12-19 23:05:07 +01:00
Makefile.am
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
matherr.c
…
mf_iocache.cc
…
my_lock.c
…
mysql_priv.h
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
mysqld.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
net_serv.cc
Merge
2003-12-18 17:51:43 +01:00
nt_servc.cc
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
nt_servc.h
…
opt_range.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
opt_range.h
Post-merge fixes.
2004-02-11 18:21:55 +01:00
opt_sum.cc
Merge key cache structures to one
2003-11-20 22:06:25 +02:00
password.c
…
procedure.cc
…
procedure.h
…
protocol_cursor.cc
Post-merge fixes.
2003-12-01 18:24:09 +01:00
protocol.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
protocol.h
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
records.cc
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
repl_failsafe.cc
now all tables of query are locked in one place (including derived tables)
2004-02-01 15:30:32 +02:00
repl_failsafe.h
…
set_var.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
set_var.h
WorkLog #1323 (part 2)
2003-12-17 22:52:03 +00:00
slave.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
slave.h
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sp_cache.cc
Update for VC++
2003-12-21 02:07:45 +02:00
sp_cache.h
Fixed various memory leaks.
2003-12-15 13:24:16 +01:00
sp_head.cc
sp.test:
2004-02-03 16:22:43 +02:00
sp_head.h
Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
2003-12-16 14:15:27 +01:00
sp_pcontext.cc
Various bug fixes:
2003-11-13 19:34:56 +01:00
sp_pcontext.h
Various bug fixes:
2003-11-13 19:34:56 +01:00
sp_rcontext.cc
Fix BUG#2269: Lost connect if stored procedure called before USE
2004-01-09 09:36:37 +01:00
sp_rcontext.h
Fix BUG#2269: Lost connect if stored procedure called before USE
2004-01-09 09:36:37 +01:00
sp.cc
Post-merge fixes.
2004-02-11 18:21:55 +01:00
sp.h
In order to make ALTER PROCEDURE|FUNCTION work correctly, and in general to
2003-12-12 14:05:29 +01:00
spatial.cc
Removed some warnings reported by valgrind
2003-11-04 14:09:03 +02:00
spatial.h
…
sql_acl.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_acl.h
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
sql_analyse.cc
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
sql_analyse.h
…
sql_base.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_bitmap.h
added 'explicit' keyword to Bitmap constructor
2003-11-21 19:16:19 +03:00
sql_cache.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_cache.h
SCRUM
2003-12-01 17:19:10 +04:00
sql_class.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_class.h
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_client.cc
merge
2003-12-19 16:34:48 +02:00
sql_crypt.cc
…
sql_crypt.h
…
sql_db.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_delete.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_derived.cc
after merge & valgrind test fixes (BUG#2120)
2004-02-10 02:18:22 +02:00
sql_do.cc
fixed error handling in SET and DO operators (BUG#1484)
2003-10-08 11:19:09 +03:00
sql_error.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
sql_handler.cc
ufter revview fix (BUG#2120)
2004-02-09 14:44:03 +02:00
sql_help.cc
merge
2004-01-17 13:13:48 +02:00
sql_insert.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_lex.cc
Merge mysql.com:/usr/local/bk/mysql-5.0
2004-02-12 13:52:10 +01:00
sql_lex.h
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_list.cc
…
sql_list.h
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_load.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_manager.cc
…
sql_manager.h
…
sql_map.cc
…
sql_map.h
…
sql_olap.cc
now all tables of query are locked in one place (including derived tables)
2004-02-01 15:30:32 +02:00
sql_parse.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_prepare.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_rename.cc
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
sql_repl.cc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2003-12-19 23:05:07 +01:00
sql_repl.h
…
sql_select.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_select.h
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_show.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_sort.h
Implementation of SUM(DISTINCT), tests cases
2003-12-19 19:04:03 +03:00
sql_state.c
…
sql_string.cc
An include was missing.
2004-02-10 13:11:55 +00:00
sql_string.h
Added --compact to mysqlbinlog
2004-02-09 12:31:03 +01:00
sql_table.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_test.cc
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
sql_udf.cc
now all tables of query are locked in one place (including derived tables)
2004-02-01 15:30:32 +02:00
sql_udf.h
…
sql_union.cc
after merge & valgrind test fixes (BUG#2120)
2004-02-10 02:18:22 +02:00
sql_update.cc
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
sql_yacc.yy
Merge mysql.com:/usr/local/bk/mysql-5.0
2004-02-12 13:52:10 +01:00
stacktrace.c
…
stacktrace.h
…
strfunc.cc
Merge key cache structures to one
2003-11-20 22:06:25 +02:00
structs.h
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
2003-11-18 13:47:27 +02:00
table.cc
Conflicts resolved
2004-01-23 20:00:10 +04:00
table.h
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
thr_malloc.cc
…
time.cc
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
udf_example.cc
Merge
2003-12-18 17:51:43 +01:00
uniques.cc
Fixed bug in replacation for not x86 platforms
2003-12-21 19:41:34 +02:00
unireg.cc
SCRUM:
2004-01-15 21:06:22 +04:00
unireg.h
unused variable max_prep_stmt_count removed
2003-12-05 01:55:57 +03:00
watchdog_mysqld
…