database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-26 01:44:06 +03:00
Code Activity
Files
46cb15ccd477007c8ba2abaa90f86960a8adc7bd
mariadb/sql
History
unknown 46cb15ccd4 SCRUM 
merged conflicts about my previous commit
it seems there are some errors left - gonna check...


BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
include/sql_common.h:
  Auto merged
include/mysql.h:
  conflicts merged
libmysql/client_settings.h:
  conflicts merged
libmysql/libmysql.c:
  conflicts merged
sql-common/client.c:
  conflicts merged
sql/client_settings.h:
  conflicts merged
sql/protocol.cc:
  conflict merged
2003-06-17 21:53:13 +05:00
..
share
The default collation for cp1251 has been changed to general_ci
2003-06-17 18:10:35 +05:00
.cvsignore
…
add_errmsg
…
client_settings.h
SCRUM
2003-06-17 21:53:13 +05:00
custom_conf.h
…
derror.cc
…
des_key_file.cc
…
field_conv.cc
Support of warnings for all DML statements (Insert, Update and Alter)
2003-04-30 00:02:28 -07:00
field.cc
merge with public tree
2003-06-05 00:12:45 +03:00
field.h
bug #251 - destroyed object reused - fixed
2003-06-13 23:00:04 +02:00
filesort.cc
After merge fixes
2003-05-21 21:39:58 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
merged
2003-03-13 13:44:03 +01:00
gstream.cc
…
gstream.h
Portability fixes
2003-02-27 03:44:44 +02:00
ha_berkeley.cc
Preparing to client<->server autoconvert
2003-03-17 13:14:04 +04:00
ha_berkeley.h
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2003-02-18 16:28:31 +02:00
ha_heap.cc
…
ha_heap.h
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
ha_innodb.cc
Merge with 4.0.13
2003-06-05 17:33:38 +03:00
ha_innodb.h
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
ha_isam.cc
Give warning if MySQL doesn't honor given storage engine
2003-05-13 11:15:11 +03:00
ha_isam.h
Give warning if MySQL doesn't honor given storage engine
2003-05-13 11:15:11 +03:00
ha_isammrg.cc
…
ha_isammrg.h
…
ha_myisam.cc
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
ha_myisam.h
a fix for a crashing bug when attempting to create InnoDB table
2003-04-08 20:39:50 +03:00
ha_myisammrg.cc
…
ha_myisammrg.h
…
handler.cc
Merge with 4.0.13
2003-06-05 17:33:38 +03:00
handler.h
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
hash_filo.cc
…
hash_filo.h
sql_acl.cc, item.h:
2003-03-07 12:21:32 +04:00
hostname.cc
sql_acl.cc, item.h:
2003-03-07 12:21:32 +04:00
init.cc
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
item_buff.cc
stringcmp() and sortcmp() have been unified
2003-03-04 18:01:59 +04:00
item_cmpfunc.cc
Fixes for make_win_src_distributions
2003-06-15 23:24:37 +03:00
item_cmpfunc.h
Some more functions work according to coercibility now:
2003-06-10 14:54:03 +05:00
item_create.cc
SPACE() is now ucs2 compatible
2003-06-03 18:24:57 +05:00
item_create.h
CAST(expr AS char) now supports character set with conversion:
2003-05-28 17:57:58 +05:00
item_func.cc
Moved spatial functions to the sql/item_geofunc.cc file.
2003-05-30 15:22:34 +05:00
item_func.h
Moved spatial functions to the sql/item_geofunc.cc file.
2003-05-30 15:22:34 +05:00
item_geofunc.cc
Fix windows build after applyiing the changes from new client.c(sql-common)
2003-06-03 20:59:32 -07:00
item_geofunc.h
Moved spatial functions to the sql/item_geofunc.cc file.
2003-05-30 15:22:34 +05:00
item_row.cc
…
item_row.h
…
item_strfunc.cc
Function INSERT() now works according to coercibility rules
2003-06-10 16:41:42 +05:00
item_strfunc.h
LOAD_FILE() is now COERCIBLE
2003-06-10 17:53:06 +05:00
item_subselect.cc
added mem_root switching for subselect if it is necessary
2003-05-28 16:52:56 +03:00
item_subselect.h
added mem_root switching for subselect if it is necessary
2003-05-28 16:52:56 +03:00
item_sum.cc
Added SQLSTATE to client/server protocol
2003-06-04 18:28:51 +03:00
item_sum.h
Added SQLSTATE to client/server protocol
2003-06-04 18:28:51 +03:00
item_timefunc.cc
CHARSET_INFO structure reorganization for easier maintainance
2003-05-23 17:45:52 +05:00
item_timefunc.h
Fixing a bug #195
2003-03-27 16:11:01 +02:00
item_uniq.cc
…
item_uniq.h
Added SQLSTATE to client/server protocol
2003-06-04 18:28:51 +03:00
item.cc
merge with public tree
2003-06-05 00:12:45 +03:00
item.h
merge with public tree
2003-06-05 00:12:45 +03:00
key.cc
Merge with 4.0.12
2003-03-19 22:25:44 +02:00
lex_symbol.h
…
lex.h
REVOKE all privileges and delete user(244)
2003-06-06 17:43:23 +05:00
lock.cc
Merge with 4.0
2003-03-16 19:17:54 +02:00
log_event.cc
See each file's changeset for details.
2003-06-12 16:20:31 +02:00
log_event.h
See each file's changeset for details.
2003-06-12 16:20:31 +02:00
log.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2003-06-14 11:38:09 +03:00
Makefile.am
Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
2003-06-14 11:37:42 +03:00
matherr.c
…
mf_iocache.cc
Merge with 4.0
2003-03-16 19:17:54 +02:00
my_lock.c
…
mysql_priv.h
Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
2003-06-14 11:37:42 +03:00
mysqld.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2003-06-14 11:38:09 +03:00
net_serv.cc
SCRUM
2003-06-17 21:32:31 +05:00
nt_servc.cc
…
nt_servc.h
…
opt_ft.cc
…
opt_ft.h
…
opt_range.cc
ORDER BY optimization
2003-05-27 18:40:37 +03:00
opt_range.h
ORDER BY optimization
2003-05-27 18:40:37 +03:00
opt_sum.cc
After merge fixes
2003-05-21 21:39:58 +03:00
password.c
After merge fixes
2003-03-20 21:35:03 +02:00
procedure.cc
…
procedure.h
Strings which appear without charset context,
2003-03-03 10:53:08 +04:00
protocol_cursor.cc
SCRUM
2003-04-23 19:37:33 +05:00
protocol.cc
SCRUM
2003-06-17 21:53:13 +05:00
protocol.h
new version of help
2003-05-29 17:47:31 -04:00
records.cc
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
repl_failsafe.cc
Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
2003-06-14 11:37:42 +03:00
repl_failsafe.h
Merge with 4.0
2003-03-16 19:17:54 +02:00
set_var.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2003-06-14 11:38:09 +03:00
set_var.h
We now require SUPER privilege for SET PSEUDO_THREAD_ID.
2003-06-11 17:07:33 +02:00
slave.cc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
2003-06-14 11:38:09 +03:00
slave.h
See each file's changeset for details.
2003-06-12 16:20:31 +02:00
spatial.cc
my_strncasecmp() is not used anymore. Use my_strncoll() instead.
2003-04-01 14:17:28 +05:00
spatial.h
SRID support.
2003-03-18 15:30:32 +04:00
sql_acl.cc
Fixes for make_win_src_distributions
2003-06-15 23:24:37 +03:00
sql_acl.h
REVOKE all privileges and delete user(244)
2003-06-06 17:43:23 +05:00
sql_analyse.cc
Fixed problem when comparing a key for a multi-byte-character set. (bug 152)
2003-04-27 22:12:08 +03:00
sql_analyse.h
sql_acl.cc, item.h:
2003-03-07 12:21:32 +04:00
sql_base.cc
merge with public tree
2003-06-05 00:12:45 +03:00
sql_cache.cc
Merge with 4.0.13
2003-06-04 19:21:51 +03:00
sql_cache.h
merging
2003-04-16 20:35:29 +03:00
sql_class.cc
character_set_server is now updatable
2003-05-30 13:03:56 +05:00
sql_class.h
character_set_server is now updatable
2003-05-30 13:03:56 +05:00
sql_client.cc
Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
2003-06-14 11:37:42 +03:00
sql_crypt.cc
- renamed "rnd" to "my_rnd" as the name was too generic (and is an exported
2003-03-18 22:14:02 +01:00
sql_crypt.h
…
sql_db.cc
character_set_server is now updatable
2003-05-30 13:03:56 +05:00
sql_delete.cc
ixed wrong unlock of tables (new bug)
2003-05-26 20:48:40 +03:00
sql_derived.cc
After merge fixes
2003-05-21 21:39:58 +03:00
sql_do.cc
…
sql_error.cc
Support of warnings for all DML statements (Insert, Update and Alter)
2003-04-30 00:02:28 -07:00
sql_handler.cc
Merge with 4.0.11
2003-02-26 01:03:47 +02:00
sql_help.cc
fixed bug (writting outside mallocced buffer in sql_help.cc)
2003-06-05 16:19:54 -04:00
sql_insert.cc
LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows.
2003-06-15 12:34:04 +03:00
sql_lex.cc
merge fix
2003-04-26 15:26:28 +03:00
sql_lex.h
REVOKE all privileges and delete user(244)
2003-06-06 17:43:23 +05:00
sql_list.cc
…
sql_list.h
Added SQLSTATE to client/server protocol
2003-06-04 18:28:51 +03:00
sql_load.cc
character_set_server is now updatable
2003-05-30 13:03:56 +05:00
sql_manager.cc
…
sql_manager.h
…
sql_map.cc
…
sql_map.h
…
sql_olap.cc
…
sql_parse.cc
Fixes for make_win_src_distributions
2003-06-15 23:24:37 +03:00
sql_prepare.cc
Added SQLSTATE to client/server protocol
2003-06-04 18:28:51 +03:00
sql_rename.cc
Merge with 4.0
2003-03-16 19:17:54 +02:00
sql_repl.cc
Merge with 4.0.13
2003-06-05 17:33:38 +03:00
sql_repl.h
Conflicts relsolving
2003-03-11 16:32:17 +04:00
sql_select.cc
Fixes for make_win_src_distributions
2003-06-15 23:24:37 +03:00
sql_select.h
Added SQLSTATE to client/server protocol
2003-06-04 18:28:51 +03:00
sql_show.cc
merge with public tree
2003-06-05 00:12:45 +03:00
sql_sort.h
Many files:
2003-04-24 14:33:33 +03:00
sql_state.c
Added SQLSTATE to client/server protocol
2003-06-04 18:28:51 +03:00
sql_string.cc
merge with public tree
2003-06-05 00:12:45 +03:00
sql_string.h
merge with public tree
2003-06-05 00:12:45 +03:00
sql_table.cc
merge with public tree
2003-06-05 00:12:45 +03:00
sql_test.cc
Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's)
2003-03-25 02:37:41 +02:00
sql_udf.cc
INSERT ... UPDATE ... VALUES()
2003-05-03 01:16:56 +02:00
sql_udf.h
…
sql_union.cc
Added SQLSTATE to client/server protocol
2003-06-04 18:28:51 +03:00
sql_update.cc
Merge with 4.0.13
2003-06-04 19:21:51 +03:00
sql_yacc.yy
Merge bk-internal:/home/bk/mysql-4.1/
2003-06-16 00:13:25 +02:00
stacktrace.c
Merge with 4.0
2003-03-16 19:17:54 +02:00
stacktrace.h
…
structs.h
Many files:
2003-04-24 14:33:33 +03:00
table.cc
new version of help
2003-05-29 17:47:31 -04:00
table.h
INSERT ... UPDATE ... VALUES()
2003-05-03 01:16:56 +02:00
thr_malloc.cc
After merge fixes
2003-05-21 21:39:58 +03:00
time.cc
Merge with 4.0.13
2003-06-04 19:21:51 +03:00
udf_example.cc
Fix for the bug #537 (UDF example broken on 4.1).
2003-05-30 13:03:00 +05:00
uniques.cc
Many files:
2003-04-24 14:33:33 +03:00
unireg.cc
More OpenGIS compatibility:
2003-03-27 13:09:09 +04:00
unireg.h
Merge with 4.0.13
2003-06-05 17:33:38 +03:00
watchdog_mysqld
…