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
3d20c8ce5257575833b97ba2ff652c0a11a13a61
mariadb/sql
History
unknown 3d20c8ce52 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into teton.kitebird.com:/home/paul/mysql-4.1


include/m_string.h:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2004-02-17 13:15:38 -06:00
..
share
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-02-17 13:15:38 -06: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
Changed wellformedlen to well_formed_len
2004-02-17 01:35:17 +02:00
field.h
Changed wellformedlen to well_formed_len
2004-02-17 01:35:17 +02:00
filesort.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
frm_crypt.cc
…
gen_lex_hash.cc
SCRUM
2004-01-23 16:02:57 +04:00
gstream.cc
my_atof is deleted
2004-02-13 15:27:21 +01:00
gstream.h
…
ha_berkeley.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
ha_berkeley.h
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
ha_heap.cc
After merge fixes
2004-02-16 10:03:25 +02:00
ha_heap.h
…
ha_innodb.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
ha_innodb.h
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
ha_isam.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
ha_isam.h
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
ha_isammrg.cc
added 'explicit' keyword to Bitmap constructor
2003-11-21 19:16:19 +03:00
ha_isammrg.h
Some small portability fixes.
2003-12-30 13:14:21 +02:00
ha_myisam.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
ha_myisam.h
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
ha_myisammrg.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
ha_myisammrg.h
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
handler.cc
After merge fixes
2004-02-16 10:03:25 +02:00
handler.h
Merge with 4.0.18
2004-02-11 00:06:46 +01: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
my_atof is deleted
2004-02-13 15:27:21 +01:00
item_buff.cc
…
item_cmpfunc.cc
After merge fixes
2004-02-16 10:03:25 +02:00
item_cmpfunc.h
After merge fixes
2004-02-16 10:03:25 +02:00
item_create.cc
SCRUM:
2004-01-15 21:06:22 +04:00
item_create.h
SCRUM:
2004-01-15 21:06:22 +04:00
item_func.cc
Merge with public tree
2004-02-16 10:31:05 +02:00
item_func.h
Added --compact to mysqlbinlog
2004-02-09 12:31:03 +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
Bug 2701: Function CHARSET() inconsistency
2004-02-11 16:53:39 +04:00
item_strfunc.h
Bug 2701: Function CHARSET() inconsistency
2004-02-11 16:53:39 +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
Added --compact to mysqlbinlog
2004-02-09 12:31:03 +01:00
item_sum.h
fixed initialization to satisfy valgrind
2004-02-15 19:46:23 +02:00
item_timefunc.cc
Ensure that result from date_format() is binary
2004-02-09 13:59:41 +01:00
item_timefunc.h
WL#1253: LAST_DAY
2003-11-17 18:02:08 +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 with public tree
2004-02-16 10:31:05 +02:00
item.h
Merge bk-internal:/home/bk/mysql-4.1/
2004-02-13 15:30:00 +01:00
key.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
lex_symbol.h
SCRUM
2004-01-23 16:02:57 +04:00
lex.h
define name fixed
2004-01-23 20:52:35 +04:00
lock.cc
merge
2003-09-24 10:24:56 +03:00
log_event.cc
Merge with 4.0 to get fix for mysqlbinlog
2004-02-16 10:15:52 +02:00
log_event.h
Merge with 4.0 to get fix for mysqlbinlog
2004-02-16 10:15:52 +02:00
log.cc
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
Makefile.am
Code cleanup:
2004-02-03 14:35:24 +04:00
matherr.c
…
mf_iocache.cc
…
my_lock.c
…
mysql_priv.h
merge
2004-02-17 01:52:33 +02:00
mysqld.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
net_serv.cc
Fix for #2126 (mysql_server_init call shouldn't be needed)
2003-12-18 15:51:22 +04:00
nt_servc.cc
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
nt_servc.h
…
opt_range.cc
Merge with 4.0 to get fix for mysqlbinlog
2004-02-16 10:15:52 +02:00
opt_range.h
merge
2004-02-05 18:14:48 +01:00
opt_sum.cc
Proper fix for bug with BLOB in MIN/MAX
2004-01-19 23:44:39 +01:00
password.c
C cleanups
2003-09-03 16:31:01 +02:00
procedure.cc
…
procedure.h
…
protocol_cursor.cc
Added missing SSL library (Should be in source distribution)
2003-11-28 12:18:13 +02:00
protocol.cc
Another implementation of send_eof() cleanup
2004-02-10 18:33:06 +03:00
protocol.h
Added missing SSL library (Should be in source distribution)
2003-11-28 12:18:13 +02:00
records.cc
Merge with 4.0.17
2003-12-17 17:35:34 +02: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 with public tree
2004-02-16 10:31:05 +02:00
set_var.h
WorkLog #1323 (part 2)
2003-12-17 22:52:03 +00:00
slave.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
slave.h
Fixed bug in table level privilege GRANT handling. (Bug #2178)
2003-12-26 12:32:02 +02:00
spatial.cc
Removed some warnings reported by valgrind
2003-11-04 14:09:03 +02:00
spatial.h
…
sql_acl.cc
Merge with public tree
2004-02-16 10:31:05 +02:00
sql_acl.h
Fixes after merge with 4.0
2003-12-19 16:25:50 +02:00
sql_analyse.cc
my_atof is deleted
2004-02-13 15:27:21 +01:00
sql_analyse.h
…
sql_base.cc
merge
2004-02-17 01:52:33 +02:00
sql_bitmap.h
added 'explicit' keyword to Bitmap constructor
2003-11-21 19:16:19 +03:00
sql_cache.cc
SCRUM
2004-01-07 16:41:09 +04:00
sql_cache.h
SCRUM
2003-12-01 17:19:10 +04:00
sql_class.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
sql_class.h
merge
2004-02-17 01:52:33 +02:00
sql_client.cc
merge
2003-12-19 16:34:48 +02:00
sql_crypt.cc
…
sql_crypt.h
…
sql_db.cc
After merge fixes
2004-02-16 10:03:25 +02:00
sql_delete.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-02-09 12:10:12 +02: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
After merge fixes
2004-02-16 10:03:25 +02:00
sql_help.cc
ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure
2004-02-17 01:14:51 +02:00
sql_insert.cc
merge
2004-02-17 01:52:33 +02:00
sql_lex.cc
merge
2004-02-17 01:52:33 +02:00
sql_lex.h
after merge & valgrind test fixes (BUG#2120)
2004-02-10 02:18:22 +02:00
sql_list.cc
…
sql_list.h
catch accesses to deleted objects
2004-01-30 08:09:42 +01:00
sql_load.cc
merge
2004-02-17 01:52:33 +02:00
sql_manager.cc
…
sql_manager.h
…
sql_map.cc
…
sql_map.h
…
sql_olap.cc
ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure
2004-02-17 01:14:51 +02:00
sql_parse.cc
Merge with public tree
2004-02-16 10:31:05 +02:00
sql_prepare.cc
ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure
2004-02-17 01:14:51 +02:00
sql_rename.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
sql_repl.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
sql_repl.h
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
sql_select.cc
merge
2004-02-17 01:52:33 +02:00
sql_select.h
after merge & valgrind test fixes (BUG#2120)
2004-02-10 02:18:22 +02:00
sql_show.cc
Changed wellformedlen to well_formed_len
2004-02-17 01:35:17 +02:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Merge with public tree
2004-02-16 10:31:05 +02:00
sql_string.h
After merge fixes
2004-02-16 10:03:25 +02:00
sql_table.cc
Changed wellformedlen to well_formed_len
2004-02-17 01:35:17 +02:00
sql_test.cc
Merge key cache structures to one
2003-11-20 22:06:25 +02:00
sql_udf.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
sql_udf.h
hanged UDF interface to use clear() instead of reset()
2003-08-27 22:30:50 +03:00
sql_union.cc
Changed wellformedlen to well_formed_len
2004-02-17 01:35:17 +02:00
sql_update.cc
merge
2004-02-17 01:52:33 +02:00
sql_yacc.yy
Merge with public tree
2004-02-16 10:31:05 +02: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
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
table.h
ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure
2004-02-17 01:14:51 +02:00
thr_malloc.cc
…
time.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
udf_example.cc
Corrected faulty #if tests in udf_example.cc which made udf_test crash the server on some
2003-12-18 17:46:56 +01:00
uniques.cc
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
unireg.cc
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
unireg.h
unused variable max_prep_stmt_count removed
2003-12-05 01:55:57 +03:00
watchdog_mysqld
…