database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Code Activity
Files
4d3dce7fc168fc36932fbca5ad206a12f0a93c9f
mariadb/sql
History
unknown 4d3dce7fc1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


mysys/my_error.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  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-06-01 17:29:13 +04:00
..
examples
Updating range_in_rows for the include file for ha_example (the main .cc file has already been updated).
2004-05-18 09:54:36 -07:00
share
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-06-01 17:29:13 +04:00
.cvsignore
…
add_errmsg
…
client_settings.h
Fix for #2126
2003-12-18 18:12:00 +04:00
custom_conf.h
…
derror.cc
Fixed many compiler warnings
2004-04-05 13:56:05 +03:00
des_key_file.cc
…
discover.cc
After merge fixes
2004-05-24 14:42:34 +03:00
field_conv.cc
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
field.cc
Support for character set conversion in binary protocol: another go
2004-05-25 02:03:49 +04:00
field.h
Added function comment
2004-04-12 01:42:39 +03:00
filesort.cc
Changed prototype of killed_ptr() to make it more portable
2004-05-26 19:12:49 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
Formatting changes requested by Monty
2004-04-15 09:17:55 +02:00
gstream.cc
Fix for valgrind's warning
2004-03-15 16:32:53 +04:00
gstream.h
Fix for valgrind's warning
2004-03-15 16:32:53 +04:00
ha_berkeley.cc
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
ha_berkeley.h
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
ha_heap.cc
typo fixed
2004-05-17 11:10:22 +02:00
ha_heap.h
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
ha_innodb.cc
InnoDB cleanup:
2004-05-27 15:27:43 +03:00
ha_innodb.h
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
ha_isam.cc
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
ha_isam.h
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
ha_isammrg.cc
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
ha_isammrg.h
caching of queries with isammerge tables forbiden using general way
2004-05-05 21:21:41 +03:00
ha_myisam.cc
Changed prototype of killed_ptr() to make it more portable
2004-05-26 19:12:49 +03:00
ha_myisam.h
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
ha_myisammrg.cc
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
ha_myisammrg.h
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
ha_ndbcluster.cc
ha_ndbcluster.cc:
2004-05-28 12:09:12 +02:00
ha_ndbcluster.h
Fixed prototype of get_error_message to use String to return error message
2004-05-24 12:35:39 +02:00
handler.cc
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-05-25 12:25:22 +02:00
handler.h
New patch to ensure that InnoDB gets values for CFLAGS and CXXFLAGS
2004-05-28 10:41:38 +03:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
fix for --open-files-limit and broken query_cache_merge.test
2004-02-20 23:42:06 +01:00
init.cc
Portability fixes
2004-04-07 04:33:58 +03:00
item_buff.cc
…
item_cmpfunc.cc
logging_ok:
2004-05-10 23:19:50 +02:00
item_cmpfunc.h
Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms.
2004-05-06 19:55:12 +02:00
item_create.cc
Merge bk-internal:/home/bk/mysql-4.1/
2004-03-05 00:20:24 +01:00
item_create.h
UNHEX() function
2004-03-04 23:18:54 +01:00
item_func.cc
* New, binlog-aware character sets support in SQL Syntax for Prepared statements.
2004-06-01 17:27:40 +04:00
item_func.h
WL#1266 "Separate auto-set logic from TIMESTAMP type."
2004-04-02 10:12:53 +04:00
item_geofunc.cc
Windows fixes for VC++ compiler compability
2004-05-05 02:59:17 -03:00
item_geofunc.h
Optimized GIS functions
2004-03-04 08:50:37 +02:00
item_row.cc
DBUG_ASSERT(fixed == 0) added to fix_fields()
2004-03-17 14:26:26 +02:00
item_row.h
Pack of changes about 'cleanup()'-s
2004-01-20 20:55:47 +04:00
item_strfunc.cc
Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should
2004-05-27 17:54:40 +04:00
item_strfunc.h
DBUG_ASSERT(fixed == 1); added to val*
2004-03-18 15:14:36 +02:00
item_subselect.cc
keep old engine & JOIN if we changed subquery Item (Bug #3646)
2004-05-07 23:06:11 +03:00
item_subselect.h
keep old engine & JOIN if we changed subquery Item (Bug #3646)
2004-05-07 23:06:11 +03:00
item_sum.cc
keep old engine & JOIN if we changed subquery Item (Bug #3646)
2004-05-07 23:06:11 +03:00
item_sum.h
keep old engine & JOIN if we changed subquery Item (Bug #3646)
2004-05-07 23:06:11 +03:00
item_timefunc.cc
Support for character set conversion in binary protocol: another go
2004-05-25 02:03:49 +04:00
item_timefunc.h
WL#1266 "Separate auto-set logic from TIMESTAMP type."
2004-04-02 10:12:53 +04:00
item_uniq.cc
…
item_uniq.h
DBUG_ASSERT(fixed == 1); added to val*
2004-03-18 15:14:36 +02:00
item.cc
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-06-01 17:29:13 +04:00
item.h
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-06-01 17:29:13 +04:00
key.cc
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
lex_symbol.h
Portability fixes
2004-03-05 19:49:50 +02:00
lex.h
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-04-28 19:27:56 +04:00
lock.cc
Support for character set conversion in binary protocol: another go
2004-05-25 02:03:49 +04:00
log_event.cc
merge with 4.0 to get windows fixes
2004-05-27 00:30:28 +03:00
log_event.h
Merge with 4.0 to get fix for mysqlbinlog
2004-02-16 10:15:52 +02:00
log.cc
Fixed problems noticed with last build
2004-04-09 07:12:41 +03:00
Makefile.am
Merge with 4.0, mainly to get changes to windows project files
2004-05-20 00:54:52 +03:00
matherr.c
…
mf_iocache.cc
merge with 4.0
2004-03-16 22:41:30 +02:00
my_lock.c
…
mysql_priv.h
* New, binlog-aware character sets support in SQL Syntax for Prepared statements.
2004-06-01 17:27:40 +04:00
mysqld_suffix.h
New MYSQL_SERVER_SUFFIX usage (for easier compilation)
2004-05-25 02:28:44 +03:00
mysqld.cc
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-06-01 17:29:13 +04:00
net_serv.cc
c++ comment fixed
2004-02-21 14:25:43 +01:00
nt_servc.cc
Merge with 4.0
2004-03-25 23:29:45 +02:00
nt_servc.h
…
opt_range.cc
Support for character set conversion in binary protocol: another go
2004-05-25 02:03:49 +04:00
opt_range.h
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
opt_sum.cc
key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
password.c
Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should
2004-05-27 17:54:40 +04:00
procedure.cc
…
procedure.h
…
protocol_cursor.cc
…
protocol.cc
Support for character set conversion in binary protocol: another go
2004-05-25 02:03:49 +04:00
protocol.h
Support for character set conversion in binary protocol: another go
2004-05-25 02:03:49 +04:00
records.cc
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
2004-04-06 21:35:26 +02:00
repl_failsafe.cc
Portability fixes
2004-05-12 02:38:57 +03:00
repl_failsafe.h
…
set_var.cc
Merge with 4.0 to get fixes for Windows project files
2004-05-25 02:47:25 +03:00
set_var.h
new error for unsupported command in PS
2004-04-08 00:16:17 +03:00
slave.cc
Merge with 4.0 to get fixes for Windows project files
2004-05-25 02:47:25 +03:00
slave.h
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
spatial.cc
Merging
2004-05-27 16:32:49 +05:00
spatial.h
Merging
2004-05-27 16:32:49 +05:00
sql_acl.cc
Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table
2004-05-22 23:41:58 +04:00
sql_acl.h
after review PS fixes
2004-04-10 01:14:32 +03:00
sql_analyse.cc
Portability fixes
2004-05-12 02:38:57 +03:00
sql_analyse.h
…
sql_base.cc
bug#3681 - order by, distinct, refer to aliased field by name
2004-05-17 11:04:12 +02:00
sql_bitmap.h
Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should
2004-05-27 17:54:40 +04:00
sql_cache.cc
Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table
2004-05-22 23:41:58 +04:00
sql_cache.h
merge with 4.0
2004-03-16 22:41:30 +02:00
sql_class.cc
Manually merged, requirees more merging
2004-05-25 08:15:50 +04:00
sql_class.h
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-06-01 17:29:13 +04:00
sql_client.cc
merge
2003-12-19 16:34:48 +02:00
sql_crypt.cc
…
sql_crypt.h
…
sql_db.cc
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-05-24 14:49:47 +05:00
sql_delete.cc
Added missing return statement
2004-04-12 03:26:32 +03:00
sql_derived.cc
fixed subquery in the FROM clause with parameter (BUG#3020)
2004-04-08 23:28:47 +03:00
sql_do.cc
…
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, mainly to get changes to windows project files
2004-05-20 00:54:52 +03:00
sql_help.cc
after review changes
2004-04-07 13:25:24 +03:00
sql_insert.cc
Changed prototype of killed_ptr() to make it more portable
2004-05-26 19:12:49 +03:00
sql_lex.cc
Fix for bug which caused temp_table.test fail on Darwin 7.3
2004-05-24 15:48:19 +04:00
sql_lex.h
Merge
2004-05-24 21:13:38 +04:00
sql_list.cc
…
sql_list.h
merge with 4.0
2004-03-16 22:41:30 +02:00
sql_load.cc
Fixed crashing bug with alter table when table was in use (Bug #3643)
2004-05-05 12:31:17 +03:00
sql_manager.cc
…
sql_manager.h
…
sql_map.cc
…
sql_map.h
…
sql_olap.cc
false/true -> FALSE/TRUE
2004-03-30 02:32:41 +03:00
sql_parse.cc
Manually merged, requirees more merging
2004-05-25 08:15:50 +04:00
sql_prepare.cc
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-06-01 17:29:13 +04:00
sql_rename.cc
reverting table list to be able to use it in next PS call (BUG#2811)
2004-04-06 00:10:43 +03:00
sql_repl.cc
Optimizations
2004-03-15 12:53:27 +02:00
sql_repl.h
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
sql_select.cc
1. Some optimization when conversion is not needed.
2004-05-25 15:54:03 +05:00
sql_select.h
keep old engine & JOIN if we changed subquery Item (Bug #3646)
2004-05-07 23:06:11 +03:00
sql_show.cc
1. Some optimization when conversion is not needed.
2004-05-25 15:54:03 +05:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
sql_string.h:
2004-05-25 16:05:33 +05:00
sql_string.h
sql_string.h:
2004-05-25 16:05:33 +05:00
sql_table.cc
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-05-25 12:25:22 +02:00
sql_test.cc
WL#1700 - Properly count key_blocks_used and key_blocks_current.
2004-05-03 15:55:21 +02:00
sql_udf.cc
Fix for bug#1439 UDF Corruption
2004-03-19 14:35:00 +04:00
sql_udf.h
…
sql_union.cc
asserting table->file->enable_indexes() in union re-execution
2004-05-21 09:31:28 +02:00
sql_update.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-05-05 21:24:13 +03:00
sql_yacc.yy
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
2004-06-01 17:29:13 +04:00
stacktrace.c
…
stacktrace.h
…
strfunc.cc
…
structs.h
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
table.cc
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
table.h
after review PS fixes
2004-04-10 01:14:32 +03:00
thr_malloc.cc
…
time.cc
Support for character set conversion in binary protocol: another go
2004-05-25 02:03:49 +04: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
Allow one to send empty strings with mysql_stmt_send_long_data()
2004-04-28 20:19:50 +03:00
unireg.h
MAX_KEY limit doubled (32->64)
2004-04-26 21:07:14 +02:00
watchdog_mysqld
…