database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
Files
6161e1970867f278b8f3b4feb569eb14ef0f0fa5
mariadb/sql
History
unknown 2b53b711d8 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486-merge


mysql-test/r/errors.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/fulltext_order_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join_nested.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/errors.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/fulltext_order_by.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join_nested.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/sql_insert.cc:
  merge WL#2486
sql/sql_show.cc:
  merge WL#2486
2005-08-12 19:27:54 +03:00
..
examples
Implement MySQL framework to support consistent read views in
2005-07-20 20:02:36 +04:00
share
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-10 10:32:43 +04:00
.cvsignore
…
add_errmsg
…
client_settings.h
…
custom_conf.h
…
derror.cc
…
des_key_file.cc
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-19 11:05:49 -07:00
discover.cc
…
field_conv.cc
Cleanups after merge from 4.1.
2005-07-19 16:32:38 -07:00
field.cc
Fixes during review of new pushed code
2005-07-31 12:49:55 +03:00
field.h
Fix for bug #12281 (Geometry: crash in trigger)
2005-08-05 20:19:51 +05:00
filesort.cc
Fix bug #7422 "order by" doesn't work
2005-06-21 20:14:50 +04: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_berkeley.cc
Implement MySQL framework to support consistent read views in
2005-07-20 20:02:36 +04:00
ha_berkeley.h
A fix and a test case for Bug#10760 and complementary cleanups.
2005-07-19 22:21:12 +04:00
ha_blackhole.cc
Implement MySQL framework to support consistent read views in
2005-07-20 20:02:36 +04:00
ha_blackhole.h
A fix and a test case for Bug#10760 and complementary cleanups.
2005-07-19 22:21:12 +04:00
ha_federated.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-build
2005-07-22 12:36:17 -07:00
ha_federated.h
A fix and a test case for Bug#10760 and complementary cleanups.
2005-07-19 22:21:12 +04:00
ha_heap.cc
Implement MySQL framework to support consistent read views in
2005-07-20 20:02:36 +04:00
ha_heap.h
Always report row type of 'Fixed' for MEMORY tables. (Bug #3094)
2005-08-05 13:19:48 -07:00
ha_innodb.cc
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-12 11:40:02 +03:00
ha_innodb.h
set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:
2005-08-11 18:03:01 +02:00
ha_myisam.cc
Implement MySQL framework to support consistent read views in
2005-07-20 20:02:36 +04: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
Implement MySQL framework to support consistent read views in
2005-07-20 20:02:36 +04: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
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
2005-08-10 09:52:58 +02:00
ha_ndbcluster.h
Fixed handling of NOT LIKE after Item_func::NOTLIKE_FUNC has been removed
2005-08-01 11:50:43 +02:00
handler.cc
Added Non-prelocked SP execution: Now a PROCEDURE doesn't enter/leave prelocked mode for
2005-07-30 08:19:57 +00:00
handler.h
Implement MySQL framework to support consistent read views in
2005-07-20 20:02:36 +04: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 shortcircuit of 127.0.0.1 -> localhost lookup on little-endian machines. (Bug #11822)
2005-07-27 13:01:48 +02:00
init.cc
…
item_buff.cc
sql_select.cc:
2005-07-25 12:57:23 -07:00
item_cmpfunc.cc
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
2005-08-11 12:18:53 +01:00
item_cmpfunc.h
After merge fixes
2005-07-04 16:01:04 +03:00
item_create.cc
Add SLEEP(seconds) function, which always returns 0 after the given
2005-08-11 18:58:22 -07:00
item_create.h
Add SLEEP(seconds) function, which always returns 0 after the given
2005-08-11 18:58:22 -07:00
item_func.cc
Add SLEEP(seconds) function, which always returns 0 after the given
2005-08-11 18:58:22 -07:00
item_func.h
Add SLEEP(seconds) function, which always returns 0 after the given
2005-08-11 18:58:22 -07:00
item_geofunc.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
item_geofunc.h
Merge neptunus.(none):/home/msvensson/mysql/bug10241
2005-05-09 11:26:48 +02:00
item_row.cc
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
item_row.h
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
item_strfunc.cc
item_strfunc.cc:
2005-08-12 18:13:42 +05:00
item_strfunc.h
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2005-07-16 00:17:05 +03:00
item_subselect.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-11 10:39:33 +04:00
item_subselect.h
Clumsy but working fix for bug #11973 "SELECT .. INTO var_name; in trigger
2005-08-10 00:23:56 +04:00
item_sum.cc
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-07 21:32:26 +00:00
item_sum.h
merge
2005-07-05 11:21:47 +03:00
item_timefunc.cc
Fixes during review of new pushed code
2005-07-31 12:49:55 +03:00
item_timefunc.h
Manual merge
2005-08-07 21:30:46 +00:00
item_uniq.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
item_uniq.h
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
item.cc
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
item.h
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
key.cc
Fixes while reviewing new code
2005-05-06 11:39:30 +03:00
lex_symbol.h
…
lex.h
Add SLEEP(seconds) function, which always returns 0 after the given
2005-08-11 18:58:22 -07:00
lock.cc
Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client
2005-08-03 02:01:27 +04:00
log_event.cc
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-19 11:05:49 -07:00
log_event.h
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
log.cc
Fixes during review of new pushed code
2005-07-31 12:49:55 +03:00
Makefile.am
init_db.sql:
2005-07-06 10:16:36 +02:00
matherr.c
…
mf_iocache.cc
…
my_decimal.cc
Trimmed fix for bug #9546 (Crashing with huge decimals)
2005-05-06 19:04:58 +05:00
my_decimal.h
Fix for bug #10896 (0.00 > -0.00)
2005-06-08 21:56:22 +05:00
my_lock.c
…
mysql_priv.h
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
mysqld_suffix.h
…
mysqld.cc
set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:
2005-08-11 18:03:01 +02:00
net_serv.cc
Merge mysql.com:/home/bkroot/mysql-4.1
2005-07-13 02:13:04 +02:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-07-18 19:03:01 +03:00
opt_range.h
Merge with 4.1
2005-06-07 00:31:53 +03:00
opt_sum.cc
Fixed wrong key length when using MIN() optimization (non fatal, but caused InnoDB to write warnings to the log file)
2005-06-06 14:03:33 +03:00
parse_file.cc
store/restore sql_mode which was in force during ctrigger creation (BUG#5891)
2005-07-28 22:39:11 +03:00
parse_file.h
store/restore sql_mode which was in force during ctrigger creation (BUG#5891)
2005-07-28 22:39:11 +03:00
password.c
fixes for windows 64-bit compiler warnings
2005-06-13 12:41:15 +02: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_cursor.cc
fix for bug#8692
2005-07-22 08:11:23 +02:00
protocol.cc
A fix and a test case for Bug#10794 "mysql_stmt_attr_set no
2005-06-30 16:17:10 +04:00
protocol.h
A fix and a test case for Bug#10794 "mysql_stmt_attr_set no
2005-06-30 16:17:10 +04:00
records.cc
Moved some old test and added a new test to only be run with mysql-test-run --big
2005-04-07 19:24:14 +03:00
repl_failsafe.cc
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
2005-06-01 21:56:30 -07:00
repl_failsafe.h
…
set_var.cc
set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:
2005-08-11 18:03:01 +02:00
set_var.h
store/restore sql_mode which was in force during ctrigger creation (BUG#5891)
2005-07-28 22:39:11 +03:00
slave.cc
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
2005-08-11 12:18:53 +01:00
slave.h
updates for BUG#10780 - fixed slave I/O thread running status to No while attempting
2005-07-29 21:00:28 -06:00
sp_cache.cc
BUG#12228: Post review fixes: Added test case, code cleanup.
2005-08-10 21:17:02 +00: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
Fix after merging patch solving bug #10055 "Using stored function with
2005-08-09 12:56:55 +04:00
sp_head.h
Manual merge
2005-08-03 03:47:07 +00:00
sp_pcontext.cc
sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc:
2005-06-05 16:20:22 +02:00
sp_pcontext.h
Add USE_PRAGMA_INTERFACE and USE_PRAGMA_IMPLEMENTATION to files not existsing in 4.1
2005-05-27 12:03:37 +02:00
sp_rcontext.cc
Fixed BUG#11529: crash server after use stored procedure
2005-06-30 18:07:06 +02:00
sp_rcontext.h
Fixed BUG#11529: crash server after use stored procedure
2005-06-30 18:07:06 +02:00
sp.cc
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
sp.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-09 11:43:55 +04:00
spatial.cc
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
2005-05-19 15:50:44 -05:00
spatial.h
Fix warnings from icc
2005-05-18 19:00:21 +03:00
sql_acl.cc
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
sql_acl.h
added processing of view grants to table grants (BUG#9795)
2005-07-05 13:36:36 +03:00
sql_analyse.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
sql_analyse.h
Merge from 4.1
2005-05-26 21:01:55 +02:00
sql_base.cc
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +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
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
2005-08-11 12:18:53 +01:00
sql_cache.h
…
sql_class.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-09 11:43:55 +04:00
sql_class.h
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03: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
fixed conflicts
2005-05-20 16:34:59 -05:00
sql_delete.cc
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
sql_derived.cc
BUG#11869:part 2: post-review fixes: merging into 5.0
2005-08-07 21:21:30 +00:00
sql_do.cc
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
sql_error.cc
merge
2005-07-05 11:38:05 +03:00
sql_error.h
Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902)
2005-04-01 15:04:50 +03:00
sql_handler.cc
Fix for bug #10055 "Using stored function with information_schema causes empty
2005-08-08 17:46:06 +04:00
sql_help.cc
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
sql_insert.cc
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
sql_lex.cc
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
sql_lex.h
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03: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-19 15:20:10 +02:00
sql_load.cc
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
sql_manager.cc
…
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
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
sql_prepare.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-08-11 10:39:33 +04:00
sql_rename.cc
Bug#6877 MySQL should give an error if the requested table type is not available
2005-06-17 22:14:44 +01:00
sql_repl.cc
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
2005-07-19 00:55:37 +04:00
sql_repl.h
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03:00
sql_select.cc
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
sql_select.h
A fix for Bug#11901 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY join in
2005-08-10 12:25:26 +04:00
sql_show.cc
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Merge with 4.1
2005-06-07 00:31:53 +03:00
sql_string.h
Bug#8610: The ucs2_turkish_ci collation fails with upper('i')
2005-06-06 16:54:15 +05:00
sql_table.cc
Changed/fixed error message from last commit
2005-08-04 02:06:21 +02:00
sql_test.cc
Fixes while reviewing new code
2005-05-06 11:39:30 +03:00
sql_trigger.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-07-31 12:56:02 +03:00
sql_trigger.h
Manual merge
2005-08-03 03:47:07 +00: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
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
sql_union.cc
fix after merge
2005-08-11 18:42:22 +01:00
sql_update.cc
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
sql_view.cc
sql_view.cc:
2005-08-12 02:17:27 -07:00
sql_view.h
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
sql_yacc.yy
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
stacktrace.c
Step 2 of the switch to support configuration with NPTL:
2005-04-20 20:38:57 +02:00
stacktrace.h
Step 2 of the switch to support configuration with NPTL:
2005-04-20 20:38:57 +02:00
strfunc.cc
…
structs.h
Fix for bug#11055: information_schema: routines.sql_data_access has wrong value
2005-06-16 12:12:47 +05:00
table.cc
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
table.h
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03: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
Fixes during review of new pushed code
2005-07-31 12:49:55 +03:00
tztime.h
Fixes during review of new pushed code
2005-07-31 12:49:55 +03:00
udf_example.cc
…
uniques.cc
Code cleanups during code reviews
2005-06-01 16:35:09 +03:00
unireg.cc
Merge mysql.com:/home/my/mysql-4.1
2005-07-28 17:09:54 +03:00
unireg.h
…
watchdog_mysqld
…