database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Code Activity
Files
5af42c1b25c72ca16bf1d8181007235640b46c73
mariadb/sql
History
unknown 17c238a15b Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1-mrg


include/mysql.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_class.h:
  Auto merged
Makefile.am:
  merging
client/mysqltest.c:
  merging
mysql-test/t/mysql_client.test:
  merging
2006-11-16 20:44:37 +04:00
..
examples
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
share
Addition to fix for bug#10974. Fixed spelling.
2006-10-06 10:54:47 +05: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
a fix (bug #7589: Decimal types are ignored when updating data from another column).
2005-09-21 14:32:19 +05:00
field.cc
Merge polly.local:/tmp/maint/bug11655/my41-bug11655
2006-10-11 14:55:23 +04:00
field.h
Fixed bug #20108.
2006-09-20 09:46:12 -07:00
filesort.cc
Review fixes since last pull
2005-09-12 18:48:17 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
…
gstream.cc
…
gstream.h
…
ha_berkeley.cc
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
ha_berkeley.h
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
ha_blackhole.cc
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-09-28 23:41:37 +10:00
ha_blackhole.h
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-09-28 23:41:37 +10:00
ha_heap.cc
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
ha_heap.h
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
ha_innodb.cc
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
ha_innodb.h
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
ha_isam.cc
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-09-28 23:41:37 +10:00
ha_isam.h
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-09-28 23:41:37 +10:00
ha_isammrg.cc
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-09-28 23:41:37 +10:00
ha_isammrg.h
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-09-28 23:41:37 +10:00
ha_myisam.cc
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
ha_myisam.h
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
ha_myisammrg.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
2006-10-25 17:24:20 +10:00
ha_myisammrg.h
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
ha_ndbcluster.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
2006-10-25 17:24:20 +10:00
ha_ndbcluster.h
Bug #19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-10-23 23:46:35 +10:00
handler.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 17:27:42 -05:00
handler.h
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-08-10 22:55:20 +08:00
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
Fix for bug #15756: incorrect ip address matching in ACL due to use of latin1 collation.
2006-01-24 13:58:28 +04:00
init.cc
…
item_buff.cc
group_by.result, group_by.test:
2005-06-21 04:24:21 -07:00
item_cmpfunc.cc
Merge polly.local:/tmp/20924/bug20294/my41-bug20294
2006-09-13 16:01:46 +04:00
item_cmpfunc.h
Merge polly.local:/tmp/20924/bug20294/my41-bug20294
2006-09-13 16:01:46 +04:00
item_create.cc
Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
2005-04-11 10:44:48 +04:00
item_create.h
…
item_func.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 01:08:39 +03:00
item_func.h
BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.
2006-10-06 13:34:07 +04:00
item_geofunc.cc
Fix for bug #12839 (Endian support is absurd)
2005-09-21 14:35:01 +05:00
item_geofunc.h
bug #10166 (Signed byte values cause data to be padded)
2006-06-22 22:11:27 +05:00
item_row.cc
A fix and a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?))
2006-04-07 22:26:25 +04:00
item_row.h
A fix and a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?))
2006-04-07 22:26:25 +04:00
item_strfunc.cc
Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
2006-10-13 19:05:54 +05:00
item_strfunc.h
Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-41
2006-08-23 16:30:05 -06:00
item_subselect.cc
Bug #11032: getObject() returns a String for a sub-query of type datetime
2006-11-07 18:16:17 +02:00
item_subselect.h
Bug #11032: getObject() returns a String for a sub-query of type datetime
2006-11-07 18:16:17 +02:00
item_sum.cc
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1-rpl
2006-11-08 22:03:08 +04:00
item_sum.h
BUG#21354: (COUNT(*) = 1) not working in SELECT inside prepared
2006-10-10 17:08:47 +04:00
item_timefunc.cc
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-10 15:05:38 +03:00
item_timefunc.h
Manually merged
2006-06-17 02:11:12 +04:00
item_uniq.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
item_uniq.h
Add ifdefs to control when "#pragma implementation" should be used
2005-05-26 12:09:14 +02:00
item.cc
Bug #22457: Column alias in ORDER BY works, but not if in an expression
2006-11-03 18:48:16 +02:00
item.h
Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
2006-09-08 10:24:14 +03:00
key.cc
Merge
2005-03-17 10:59:25 +04:00
lex_symbol.h
…
lex.h
…
lock.cc
Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption
2006-04-19 22:54:25 +05:00
log_event.cc
BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.
2006-10-06 13:34:07 +04:00
log_event.h
bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
2006-11-12 20:01:58 +02:00
log.cc
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
2006-09-04 14:45:13 +02:00
Makefile.am
Bug#18888 Trying to overwrite sql/lex_hash.h during build
2006-09-25 20:01:39 +02:00
matherr.c
…
mf_iocache.cc
…
my_lock.c
…
mysql_priv.h
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1-runtime
2006-11-06 00:05:02 +03:00
mysqld_suffix.h
…
mysqld.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 01:08:39 +03:00
net_serv.cc
BUG#9678: Client library hangs after network communication failure
2006-08-14 20:01:19 +04:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
2006-10-19 12:52:37 +05:00
opt_range.h
Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
2006-10-19 12:52:37 +05:00
opt_sum.cc
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/main
2006-09-25 14:48:39 +10:00
password.c
A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
2006-01-11 17:31:52 +03:00
procedure.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
procedure.h
BUG#10241 cygwin port: invalid pragma interface directives
2005-05-04 15:05:56 +02:00
protocol_cursor.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
protocol.cc
Bug #19216: Client crashes on long SELECT
2006-11-13 12:28:55 +02:00
protocol.h
Bug #19216: Client crashes on long SELECT
2006-11-13 12:28:55 +02:00
records.cc
Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization
2005-10-25 02:27:40 +03:00
repl_failsafe.cc
fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
2005-10-14 15:34:52 +02:00
repl_failsafe.h
…
set_var.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 01:08:39 +03:00
set_var.h
WL#2928 Date Translation NRE
2006-07-04 17:40:40 +05:00
slave.cc
bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
2006-11-12 20:01:58 +02:00
slave.h
Bug #2717: include/my_global.h mis-defines __attribute__
2006-08-17 12:25:40 -07:00
spatial.cc
Review of new pushed code
2005-11-01 13:00:02 +02:00
spatial.h
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
sql_acl.cc
Merge bk-internal:/home/bk/mysql-4.1-maint
2006-09-28 18:11:29 -07:00
sql_acl.h
Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in
2005-09-01 16:52:59 +04:00
sql_analyse.cc
Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D)
2006-09-28 14:30:20 -04:00
sql_analyse.h
Add ifdefs to control when "#pragma implementation" should be used
2005-05-26 12:09:14 +02:00
sql_base.cc
Merge bk-internal:/home/bk/mysql-4.1
2006-10-20 10:57:38 +02:00
sql_bitmap.h
terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:
2005-05-05 09:15:14 +02:00
sql_cache.cc
WL#2928 Date Translation NRE
2006-07-04 17:40:40 +05:00
sql_cache.h
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2005-09-06 12:18:23 +03:00
sql_class.cc
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
2006-10-18 20:07:28 +02:00
sql_class.h
Merge bk@192.168.21.1:mysql-4.1
2006-11-16 20:44:37 +04:00
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_db.cc
Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)
2006-01-31 12:47:22 +01:00
sql_delete.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 17:27:42 -05:00
sql_derived.cc
fixed union types merging and table related metadata (BUG#8824)
2005-03-23 08:36:48 +02:00
sql_do.cc
…
sql_error.cc
abort storing query to query cache if warnings appeared (BUG#9414)
2005-06-28 00:52:21 +03:00
sql_handler.cc
Re-run fix-fields on condition if table was reopened in HANDLERREAD
2006-01-10 19:13:12 +02:00
sql_help.cc
…
sql_insert.cc
BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.
2006-10-06 13:34:07 +04:00
sql_lex.cc
Fix for bug #20695: Charset introducer overrides charset definition for column.
2006-08-15 15:24:07 +05:00
sql_lex.h
Fix for bug #20695: Charset introducer overrides charset definition for column.
2006-08-15 15:24:07 +05:00
sql_list.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
sql_list.h
merged
2005-05-18 22:14:08 +02:00
sql_load.cc
BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.
2006-10-06 13:34:07 +04:00
sql_locale.cc
Backporting Kostja's changes made for 5.0 into 4.1.
2006-07-18 15:53:12 +05:00
sql_manager.cc
…
sql_manager.h
…
sql_map.cc
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02: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
a compiler must see '#pragma implementation' *before*
2005-06-05 19:38:52 +02:00
sql_parse.cc
BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.
2006-10-06 13:34:07 +04:00
sql_prepare.cc
A fix and a test case for Bug#19399 "res 'Lost Connection' when
2006-07-06 23:59:04 +04:00
sql_rename.cc
…
sql_repl.cc
bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
2006-11-12 20:01:58 +02:00
sql_repl.h
Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
2004-12-31 12:04:35 +02:00
sql_select.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 17:27:42 -05:00
sql_select.h
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
sql_show.cc
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
2006-05-04 13:17:16 +03:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
2006-09-04 09:13:40 +02:00
sql_string.h
Bug#19006: 4.0 valgrind problems (in test func_str)
2006-07-01 14:31:52 -04:00
sql_table.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime
2006-08-29 17:00:46 +04:00
sql_test.cc
Bug#12920 - key_read_requests counter appears to re-set
2005-09-14 13:18:16 +02:00
sql_udf.cc
- backport of a compile fix from 4.1 (ChangeSet@1.2260.23.2 2005/05/19 from reggie)
2005-06-30 17:33:23 +02:00
sql_udf.h
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2005-05-09 12:16:59 +02:00
sql_union.cc
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
2006-09-28 23:41:37 +10:00
sql_update.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 01:08:39 +03:00
sql_yacc.yy
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
2006-09-20 16:17:30 +02:00
stacktrace.c
Fix for bug #23256 "doesn't build on alpha"
2006-10-20 14:31:47 +04:00
stacktrace.h
Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1)
2006-09-07 00:01:00 +02:00
strfunc.cc
- Housekeeping: removed a few unreferenced variables, noticed while doing
2005-01-11 15:38:03 +01:00
structs.h
Better comments in KEY_PART_INFO struct
2006-06-14 21:06:02 +04:00
table.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-02 17:27:42 -05:00
table.h
A fix and a test case for Bug#19399 "res 'Lost Connection' when
2006-07-06 23:59:04 +04:00
thr_malloc.cc
…
time.cc
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
2006-11-10 15:05:38 +03:00
tzfile.h
…
tztime.cc
Add missing DBUG_RETURN()
2006-11-05 23:25:34 +03:00
tztime.h
BUG#10241 cygwin port: invalid pragma interface directives
2005-05-04 15:05:56 +02:00
udf_example.cc
…
uniques.cc
…
unireg.cc
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
2006-10-05 16:38:21 +05: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
…