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
bc3cbfbc7bbb5c609e38762a88c5d2cf6fca5aa0
mariadb/sql
History
unknown bc3cbfbc7b Now merge is done. 
For previous commit I had run only rpl* tests, here the other ones had a 
few surprises. Latest status:
- all tests pass
- all replication tests pass with Valgrind
This is the final-final commit & push.
Doc remains.


client/mysqlbinlog.cc:
  Making remote mysqlbinlog work with the new format of 5.0.0, and still be 
  able to talk to older servers.
  This is a quickfix, but now mysqlbinlog.test passes (mysqlbinlog seems to
  work in Valgrind, too).
mysql-test/r/drop_temp_table.result:
  result update
mysql-test/r/insert_select.result:
  result update
mysql-test/r/mix_innodb_myisam_binlog.result:
  result update
mysql-test/r/mysqlbinlog.result:
  result update
mysql-test/t/mix_innodb_myisam_binlog.test:
  position update
mysql-test/t/mysqlbinlog.test:
  position update
sql/log_event.cc:
  a comment (noticed the problem by watching the results of
  mix_innodb_myisam_binlog.test)
2003-12-20 00:38:30 +01:00
..
share
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +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
merge
2003-12-19 16:34:48 +02:00
field.h
Fixes after merge with 4.0
2003-12-19 16:25:50 +02:00
filesort.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
- Polished mysql-copyright a bit and added call to remove
2003-09-23 00:38:01 +02:00
gstream.cc
…
gstream.h
…
ha_berkeley.cc
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
ha_berkeley.h
Bitmap post-review fixes
2003-10-30 19:17:57 +01:00
ha_heap.cc
Added missing SSL library (Should be in source distribution)
2003-11-28 12:18:13 +02:00
ha_heap.h
…
ha_innodb.cc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2003-12-19 23:05:07 +01:00
ha_innodb.h
fixes to Bitmap class
2003-10-24 22:44:48 +02: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
After merge fixes
2003-08-19 00:08:08 +03:00
handler.cc
WorkLog #1323 (part 2)
2003-12-17 22:52:03 +00:00
handler.h
WorkLog #1323 (part 2)
2003-12-17 22:52:03 +00: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
Old style charset() and set_charset() were removed.
2003-08-05 12:52:37 +05:00
item_cmpfunc.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
item_cmpfunc.h
Merge rurik.mysql.com:/home/igor/mysql-5.0
2003-12-01 16:20:46 -08:00
item_create.cc
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +01:00
item_create.h
post-merge fixes
2003-12-08 15:18:29 +04:00
item_func.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
item_func.h
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
item_geofunc.cc
…
item_geofunc.h
fixed printability of gis functions
2003-11-06 21:03:11 +02:00
item_row.cc
fixed printability of Items (all items except subselects)
2003-10-12 17:56:05 +03:00
item_row.h
fixed printability of Items (all items except subselects)
2003-10-12 17:56:05 +03:00
item_strfunc.cc
Fixes after merge with 4.0
2003-12-19 16:25:50 +02:00
item_strfunc.h
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
item_subselect.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
item_subselect.h
Added missing SSL library (Should be in source distribution)
2003-11-28 12:18:13 +02:00
item_sum.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
item_sum.h
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
item_timefunc.cc
Post-merge fixes.
2003-12-19 19:47:22 +01:00
item_timefunc.h
post-merge fixes
2003-12-08 15:18:29 +04:00
item_uniq.cc
…
item_uniq.h
added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()
2003-10-30 12:57:26 +02:00
item.cc
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +01:00
item.h
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +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
…
lex.h
Merge
2003-12-18 17:51:43 +01:00
lock.cc
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
log_event.cc
Now merge is done.
2003-12-20 00:38:30 +01:00
log_event.h
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2003-12-19 23:05:07 +01:00
log.cc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2003-12-19 23:05:07 +01:00
Makefile.am
- Added missing backslash to sql/Makefile.am that prevented the sp_* header
2003-12-04 12:02:18 +01:00
matherr.c
…
mf_iocache.cc
…
my_lock.c
…
mysql_priv.h
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2003-12-19 23:05:07 +01:00
mysqld.cc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2003-12-19 23:05:07 +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_ft.cc
merging in index_merge (in progress, not yet working)
2003-11-13 22:14:37 +03:00
opt_ft.h
logging_ok:
2003-11-20 23:27:11 +03:00
opt_range.cc
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
opt_range.h
Post-merge fixes
2003-11-22 00:20:48 +03:00
opt_sum.cc
Merge key cache structures to one
2003-11-20 22:06:25 +02:00
password.c
C cleanups
2003-09-03 16:31:01 +02:00
procedure.cc
…
procedure.h
…
protocol_cursor.cc
Post-merge fixes.
2003-12-01 18:24:09 +01:00
protocol.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03: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
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
repl_failsafe.h
…
set_var.cc
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
set_var.h
WorkLog #1323 (part 2)
2003-12-17 22:52:03 +00:00
slave.cc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2003-12-19 23:05:07 +01:00
slave.h
This will be pushed only after I fix the testsuite.
2003-12-18 01:09:05 +01:00
sp_cache.cc
Fixed various memory leaks.
2003-12-15 13:24:16 +01:00
sp_cache.h
Fixed various memory leaks.
2003-12-15 13:24:16 +01:00
sp_head.cc
Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
2003-12-16 14:15:27 +01: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
Fixed BUG#1965: Opening a cursor hangs client when malformed select fails
2003-11-27 16:48:21 +01:00
sp_rcontext.h
Fixed BUG#1965: Opening a cursor hangs client when malformed select fails
2003-11-27 16:48:21 +01:00
sp.cc
Renamed the "schema" column to "db" in mysql.proc to keep it in style with
2003-12-16 19:14:10 +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
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +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
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +01:00
sql_bitmap.h
added 'explicit' keyword to Bitmap constructor
2003-11-21 19:16:19 +03:00
sql_cache.cc
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +01:00
sql_cache.h
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-08-26 16:42:49 +03:00
sql_class.cc
Post merge fix.
2003-12-19 20:41:22 +01:00
sql_class.h
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
2003-12-19 23:05:07 +01:00
sql_client.cc
merge
2003-12-19 16:34:48 +02:00
sql_crypt.cc
Style fixes, comments for 4.1.1 authorization
2003-07-18 18:25:54 +04:00
sql_crypt.h
…
sql_db.cc
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
sql_delete.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
sql_derived.cc
Merge
2003-11-28 13:31:38 +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
Merge with 4.0 to get:
2003-11-20 22:30:48 +02:00
sql_help.cc
Added missing SSL library (Should be in source distribution)
2003-11-28 12:18:13 +02:00
sql_insert.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
sql_lex.cc
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +01:00
sql_lex.h
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
sql_list.cc
…
sql_list.h
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
sql_load.cc
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
sql_manager.cc
…
sql_manager.h
…
sql_map.cc
…
sql_map.h
…
sql_olap.cc
…
sql_parse.cc
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +01:00
sql_prepare.cc
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +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
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
sql_select.cc
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +01:00
sql_select.h
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
sql_show.cc
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +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
after review fix
2003-11-03 12:28:36 +02:00
sql_string.h
after review fix
2003-11-03 12:28:36 +02:00
sql_table.cc
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +01:00
sql_test.cc
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
sql_udf.cc
merge with 4.0 for more memory allocation variables.
2003-10-13 15:50:30 +03:00
sql_udf.h
hanged UDF interface to use clear() instead of reset()
2003-08-27 22:30:50 +03:00
sql_union.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
sql_update.cc
THD::lex now points to THD::main_lex like in 5.0
2003-12-19 20:52:13 +03:00
sql_yacc.yy
Merging lex-pointer change from 4.1 to 5.0.
2003-12-19 20:13:48 +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
merge
2003-12-19 16:34:48 +02: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
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
unireg.cc
Removed some warnings reported by valgrind
2003-11-04 14:09:03 +02:00
unireg.h
unused variable max_prep_stmt_count removed
2003-12-05 01:55:57 +03:00
watchdog_mysqld
…