database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-27 01:57:48 +03:00
Code
mariadb/sql
History
unknown 6355f74e4d Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.0.22-release


scripts/mysqld_multi.sh:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  merged
extra/comp_err.c:
  merged
2006-05-24 14:22:36 +02:00
..
examples
documenting HA_STATUS_xxx flags
2005-11-26 08:54:13 +01:00
share
fixed error message text
2006-04-26 17:57:41 +03:00
.cvsignore
…
add_errmsg
…
client_settings.h
…
custom_conf.h
…
derror.cc
…
des_key_file.cc
Many files:
2005-09-30 14:03:55 +02:00
discover.cc
…
field_conv.cc
Expanding a binary field should result in 0x00-filled positions, not 0x20
2006-03-02 20:49:10 -05:00
field.cc
Merge bk-internal:/home/bk/mysql-5.0
2006-04-10 14:30:00 -07:00
field.h
Merge bk-internal:/home/bk/mysql-5.0
2006-04-10 14:30:00 -07:00
filesort.cc
Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
2005-10-14 00:04:52 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
a fix (#10742: Can't compile "sql_lex.cc" on AIX 5.2).
2005-05-19 18:56:01 +05:00
gstream.cc
fixes for windows 64-bit compiler warnings
2005-06-13 12:41:15 +02:00
gstream.h
…
ha_archive.cc
Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows.
2006-02-13 04:11:22 -08:00
ha_archive.h
Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows.
2006-02-13 04:11:22 -08:00
ha_berkeley.cc
BUG#6554 Problem Building MySql on Fedora Core 3
2006-01-16 12:17:30 +01:00
ha_berkeley.h
Fixes during review of new code
2005-11-03 22:42:25 +02:00
ha_blackhole.cc
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-10-02 20:13:18 -07:00
ha_blackhole.h
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-26 15:56:52 +03:00
ha_federated.cc
Bug#17377 Federated Engine returns wrong Data, always the rows with the highest ID
2006-02-28 11:17:40 +01:00
ha_federated.h
Bug#17377 Federated Engine returns wrong Data, always the rows with the highest ID
2006-02-28 11:17:40 +01:00
ha_heap.cc
Manual merge
2006-03-30 17:14:55 +04:00
ha_heap.h
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-02-02 18:17:18 +03:00
ha_innodb.cc
foo2
2006-04-13 17:22:56 +09:30
ha_innodb.h
foo2
2006-04-13 17:22:56 +09:30
ha_myisam.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
ha_myisam.h
A fix and a test case for Bug#10760 and complementary cleanups.
2005-07-19 22:21:12 +04:00
ha_myisammrg.cc
BUG#17314: Can't use index_merge/intersection for MERGE tables
2006-02-11 21:51:43 +03:00
ha_myisammrg.h
A fix and a test case for Bug#10760 and complementary cleanups.
2005-07-19 22:21:12 +04:00
ha_ndbcluster.cc
Fixed memleak detected by valgrind
2006-04-25 12:40:31 +02:00
ha_ndbcluster.h
Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'
2006-03-23 09:48:46 +01:00
handler.cc
foo2
2006-04-13 17:22:56 +09:30
handler.h
foo2
2006-04-13 17:22:56 +09:30
hash_filo.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
hash_filo.h
forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliures
2005-05-27 14:15:08 +02:00
hostname.cc
Merge mysql.com:/usr/home/ram/work/mysql-4.1
2006-03-03 15:32:00 +04:00
init.cc
Fixes during review of new pushed code
2005-08-12 13:54:42 +03:00
item_buff.cc
sql_select.cc:
2005-07-25 12:57:23 -07:00
item_cmpfunc.cc
Merge mysql.com:/usr/local/mysql/mysql-4.1
2006-04-24 23:51:47 +02:00
item_cmpfunc.h
Fix compile failure on Win32
2006-04-26 01:21:33 +04:00
item_create.cc
Bug#16461: connection_id() does not work properly inside trigger
2006-04-12 19:31:00 +04:00
item_create.h
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
2005-08-25 17:34:34 +04:00
item_func.cc
Post merge fix
2006-04-20 00:42:12 -07:00
item_func.h
Bug#16461: connection_id() does not work properly inside trigger
2006-04-12 19:31:00 +04:00
item_geofunc.cc
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-31 11:54:36 +02:00
item_geofunc.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
item_row.cc
Merge mysql.com:/opt/local/work/mysql-4.1-16365
2006-04-12 18:30:54 +04:00
item_row.h
Merge mysql.com:/opt/local/work/mysql-4.1-16365
2006-04-12 18:30:54 +04:00
item_strfunc.cc
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
2006-04-23 12:32:39 +03:00
item_strfunc.h
Bug #17043: Casting trimmed string to decimal loses precision
2006-03-14 02:04:43 -08:00
item_subselect.cc
Merge rurik.mysql.com:/home/igor/mysql-5.0
2005-11-22 23:00:57 -08:00
item_subselect.h
Fix bug #15706 find_field_in_tables() returns field from outer select
2006-02-15 19:45:06 +03:00
item_sum.cc
Post merge fix
2006-04-20 00:42:12 -07:00
item_sum.h
Post merge fix
2006-04-20 00:42:12 -07:00
item_timefunc.cc
item_timefunc.cc:
2006-04-17 15:36:25 +05:00
item_timefunc.h
Merge mysql.com:/usr/home/bar/mysql-4.1.b18691
2006-04-17 15:01:55 +05:00
item_uniq.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
item_uniq.h
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
item.cc
BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes
2006-04-25 23:33:31 +04:00
item.h
BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes
2006-04-25 23:33:31 +04:00
key.cc
Bug #13601: Wrong int type for bit
2006-04-04 17:54:58 -07:00
lex_symbol.h
…
lex.h
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
lock.cc
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2
2006-04-19 18:08:15 -07:00
log_event.cc
BUG#18293 (Values in stored procedures written to binlog unescaped):
2006-03-21 14:35:49 +01:00
log_event.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
log.cc
BUG#18116: Changed of how mutex is handled for XA and rotating binlog
2006-03-31 11:48:08 +02:00
Makefile.am
Update test results for udf
2006-03-10 12:12:08 +01:00
matherr.c
…
mf_iocache.cc
…
my_decimal.cc
Fix for bug #13573 (wrong data inserted for too big decimals)
2005-10-15 21:57:32 +05:00
my_decimal.h
Fix for bug #13573 (wrong data inserted for too big decimals)
2005-10-15 21:57:32 +05:00
my_lock.c
…
mysql_priv.h
Merge mysql.com:/opt/local/work/mysql-5.0-root
2006-04-14 00:07:04 +04:00
mysqld_suffix.h
…
mysqld.cc
Merge april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
2006-04-15 16:08:03 +05:00
net_serv.cc
Make the define start at "start of line"
2006-03-02 10:55:55 +01:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes
2006-04-25 23:33:31 +04:00
opt_range.h
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
opt_sum.cc
Remove redundant code in opt_sum_query()
2006-04-06 21:42:03 +04:00
parse_file.cc
Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
2006-03-28 01:01:51 +04:00
parse_file.h
Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
2006-03-28 01:01:51 +04:00
password.c
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-01-11 17:49:56 +03:00
procedure.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
procedure.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
protocol.cc
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
protocol.h
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
records.cc
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-27 23:43:20 +03:00
repl_failsafe.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
repl_failsafe.h
pthread_handler_decl() changed to be ctags-friendly
2005-10-08 16:39:55 +02:00
set_var.cc
The fix for bug#17248 accidentally removed the sync_binlog variable.
2006-04-26 11:55:26 -04:00
set_var.h
Merge mysql.com:/opt/local/work/mysql-4.1-16365
2006-04-12 18:30:54 +04:00
slave.cc
WL#2645 (CHECK TABLE FOR UPGRADE)
2006-02-17 10:52:32 +04:00
slave.h
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
sp_cache.cc
Fix use of "%*s" *printf() specifiers that were really meant to be
2005-10-06 17:37:24 -07:00
sp_cache.h
BUG#12228: Post review fixes: Added test case, code cleanup.
2005-08-10 21:17:02 +00:00
sp_head.cc
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
sp_head.h
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
sp_pcontext.cc
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
sp_pcontext.h
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
sp_rcontext.cc
Renaming sp_pcontext members and methods; less cryptic and more consistent.
2006-04-07 16:53:15 +02:00
sp_rcontext.h
Renaming sp_pcontext members and methods; less cryptic and more consistent.
2006-04-07 16:53:15 +02:00
sp.cc
Post-push fix for BUG#18344: DROP DATABASE does not drop associated routines
2006-04-21 14:30:44 +02:00
sp.h
Fixed BUG#16303: erroneus stored procedures and functions should be droppable
2006-01-26 13:29:46 +01:00
spatial.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-11-21 21:15:48 +02:00
spatial.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
sql_acl.cc
Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
2006-03-20 13:42:02 +04:00
sql_acl.h
WL#2486 - natural/using joins according to SQL:2003
2005-11-30 21:27:11 +02:00
sql_analyse.cc
Porting fix that allows others to include compiled code with different parsers.
2006-03-09 10:09:52 -08:00
sql_analyse.h
Merge from 4.1
2005-05-26 21:01:55 +02:00
sql_array.h
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
2005-08-25 17:34:34 +04:00
sql_base.cc
Bug#17263 temporary tables and replication
2006-04-23 19:59:43 +03:00
sql_bitmap.h
Bug#10932 - Building server with key limit of 128, makes test cases fail
2005-07-19 14:13:56 +02:00
sql_cache.cc
Fixed BUG#15758: "Holding adaptive search latch in
2006-04-07 23:58:17 +04:00
sql_cache.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
sql_class.cc
Bug#15728: LAST_INSERT_ID function inside a stored function returns 0
2006-04-21 18:55:04 +04:00
sql_class.h
foo2
2006-04-13 17:22:56 +09:30
sql_client.cc
…
sql_crypt.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
sql_crypt.h
Add ifdefs to control when "#pragma implementation" should be used
2005-05-26 12:09:14 +02:00
sql_cursor.cc
Fixed BUG#15758: "Holding adaptive search latch in
2006-04-07 23:58:17 +04:00
sql_cursor.h
A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
2005-09-22 02:11:21 +04:00
sql_db.cc
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
2006-03-01 17:43:55 +03:00
sql_delete.cc
Fix for bug#14945 "Truncate table doesn't reset the auto_increment
2006-04-06 15:19:01 +05:00
sql_derived.cc
support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787)
2005-10-28 00:18:23 +03:00
sql_do.cc
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
sql_error.cc
Add extre DBUG_PRINT in push_warning
2006-03-16 12:06:39 +01:00
sql_error.h
…
sql_handler.cc
Changed condition similar to code in 4.1.
2006-01-16 23:15:00 +02:00
sql_help.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
sql_insert.cc
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
2006-04-11 22:46:26 +04:00
sql_lex.cc
Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
2006-05-24 14:22:36 +02:00
sql_lex.h
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-04-21 00:36:20 -07:00
sql_list.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
sql_list.h
WL#2486 - Natural/using join according to SQL:2003.
2005-11-28 21:57:50 +02:00
sql_load.cc
Reverting yesterday's patch. (cmiller:1.2099)
2006-03-29 10:56:11 -05:00
sql_manager.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-10-12 00:59:52 +03:00
sql_manager.h
…
sql_map.cc
WL#2286 - Compile MySQL w/YASSL support
2005-06-22 14:08:28 +05:00
sql_map.h
Add ifdefs to control when "#pragma implementation" should be used
2005-05-26 12:09:14 +02:00
sql_olap.cc
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
sql_parse.cc
sql_parse.cc:
2006-05-02 23:49:21 +02:00
sql_prepare.cc
Post-merge fixes. Add a new error message for max_prepared_stmt_count
2006-04-13 01:46:44 +04:00
sql_rename.cc
Fix for bug #13525 "Rename table does not keep info of triggers".
2006-02-24 23:50:36 +03:00
sql_repl.cc
foo2
2006-04-13 17:22:56 +09:30
sql_repl.h
…
sql_select.cc
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-04-21 00:36:20 -07:00
sql_select.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-02-27 20:00:03 +03:00
sql_show.cc
Fix for bug#18224 VIEW on information_schema crashes the server
2006-03-20 14:17:47 +04:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
2006-03-23 12:41:28 +04:00
sql_string.h
Netware specific changes.
2005-12-14 01:21:56 +02:00
sql_table.cc
Manual merge
2006-03-30 17:14:55 +04:00
sql_test.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
sql_trigger.cc
Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
2006-03-28 01:01:51 +04:00
sql_trigger.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
2006-02-26 16:38:48 +03:00
sql_udf.cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-20 21:35:05 +01:00
sql_udf.h
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
sql_union.cc
Post merge fixes
2006-04-21 08:19:38 -07:00
sql_update.cc
Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
2006-04-05 13:29:04 +04:00
sql_view.cc
Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs".
2006-04-22 11:54:25 +04:00
sql_view.h
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-11-03 16:43:05 +02:00
sql_yacc.yy
Merge mysql.com:/opt/local/work/mysql-5.0-root
2006-04-23 13:32:38 +04:00
stacktrace.c
…
stacktrace.h
…
strfunc.cc
…
structs.h
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
table.cc
Merge mysql.com:/usr/home/bar/mysql-4.1.b18004
2006-03-22 13:11:31 +04:00
table.h
Merge mysql.com:/home/mydev/mysql-5.0
2006-04-05 11:38:16 +02:00
thr_malloc.cc
…
time.cc
Fixes during review of new pushed code
2005-07-31 12:49:55 +03:00
tzfile.h
…
tztime.cc
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
tztime.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
udf_example.cc
use "unsigned long" type just as in function declaration and add surrounding parentheses.
2006-04-05 11:20:12 +02:00
uniques.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
unireg.cc
A fix and a test case for Bug#14210 "Simple query with > operator on
2005-11-03 14:20:13 +03:00
unireg.h
Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was
2006-04-12 23:05:38 +04:00
watchdog_mysqld
…