mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/include
History
unknown bd47a7df59 Merge with 4.1 
BitKeeper/etc/logging_ok:
  auto-union
client/sql_string.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
mysys/raid.cc:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_uniq.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/procedure.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol_cursor.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_map.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/tztime.cc:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
mysql-test/r/func_gconcat.result:
  merge & ensure that 4.1 and 5.0 source have tests in same order
mysql-test/r/innodb.result:
  merge & ensure that 4.1 and 5.0 source have tests in same order
mysql-test/t/func_gconcat.test:
  merge & ensure that 4.1 and 5.0 source have tests in same order
mysql-test/t/innodb.test:
  merge & ensure that 4.1 and 5.0 source have tests in same order
sql/item_func.cc:
  merge
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
sql/sql_parse.cc:
  merge
  Give better name to goto labels
sql/sql_select.cc:
  merge
2005-06-07 00:31:53 +03:00
..
.cvsignore
config-netware.h Merge hundin.mysql.fi:/home/heikki/mysql-4.1 2005-03-21 22:29:02 +02:00
config-os2.h Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345) 2003-08-11 23:43:01 +04:00
config-win.h - include/config-win.h: removed double HAVE_CHARSET_cp932 #define 2005-06-03 18:20:25 +02:00
decimal.h A lot of fixes to Precision math 2005-05-05 20:06:49 +05:00
errmsg.h A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work" 2005-05-16 18:27:21 +04:00
ft_global.h indexless boolean fulltext search was depending on default_charset_info - Bug#8159 2005-02-04 15:24:06 +01:00
hash.h Followup: rename the declaration (hash_reset -> my_hash_reset) 2005-01-11 13:57:07 +03:00
heap.h Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way 2005-03-16 01:15:45 +02:00
help_end.h Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
help_start.h Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
keycache.h Final patch for BUG#4285. 2005-01-19 12:55:54 +02:00
m_ctype.h Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 2005-06-06 16:54:15 +05:00
m_string.h Backport my_strntod() from 5.0 2005-02-22 12:51:23 +02:00
Makefile.am remove the rest of isam/merge references 2005-04-05 13:17:49 +02:00
md5.h
my_aes.h
my_alarm.h
my_alloc.h
my_base.h BUG#6762 ALTER TABLE gives weird results and error message 2005-04-07 20:17:37 +02:00
my_bitmap.h Fixes in opt_range.cc: ROR plan choice code 2005-01-17 00:18:19 +03:00
my_dbug.h Fixed bug from last push 2005-05-18 21:12:59 +03:00
my_dir.h Fix for Bug #1952 2003-12-12 03:39:29 +03:00
my_getopt.h Merge with 4.0 2004-09-01 04:12:09 +03:00
my_global.h Merge with 4.1 2005-06-07 00:31:53 +03:00
my_handler.h A fix (bug #10179: error in default value setting). 2005-05-05 17:17:55 +05:00
my_list.h one more name clash in public includes fixed 2004-11-02 22:46:55 +01:00
my_net.h BUG#7384 IM fails to compile on Solaris. 2004-12-18 03:21:20 +03:00
my_no_pthread.h CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 2003-11-18 13:47:27 +02:00
my_nosys.h
my_pthread.h Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 2005-04-27 13:30:00 +02:00
my_semaphore.h
my_sys.h Some fixes for Netware. 2005-06-06 18:30:59 +03:00
my_time.h Data truncation reporting implementation (libmysql) + post review 2004-12-16 03:15:06 +03:00
my_tree.h after merge fixes 2004-03-18 00:09:13 +02:00
my_xml.h
myisam.h concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 2005-05-13 12:08:08 +03:00
myisammrg.h key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
myisampack.h Casted all macro arguments, 2004-07-28 21:46:22 +02:00
mysql.h FIELD_TYPE_NEWDECIMAL is numeric too 2005-06-01 09:32:05 +02:00
mysql_com.h Change the return type back to int (modify_defaults_file). 2005-05-19 14:02:12 +04:00
mysql_embed.h remove the rest of isam/merge references 2005-04-05 13:17:49 +02:00
mysql_time.h Fix for bug #6266 "Invalid DATETIME value is not handled properly". 2004-11-15 15:44:29 +03:00
mysql_version.h.in Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
mysys_err.h Show all generated warnings in SHOW ERROR 2005-02-24 23:33:42 +02:00
queues.h Fix for BUG#4177: 2004-11-21 11:51:19 +03:00
raid.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
rijndael.h
sha1.h
sql_common.h Remove stale declaration, fix a typo in comment. 2004-10-15 22:03:11 +04:00
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
thr_alarm.h Added patches from Novell 2004-05-25 22:00:14 +03:00
thr_lock.h concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 2005-05-13 12:08:08 +03:00
typelib.h Bug#6202: ENUMs are not case sensitive even if declared BINARY 2004-10-25 17:51:26 +05:00
violite.h Merge bk-internal.mysql.com:/users/rburnett/bug9721 2005-05-06 15:15:48 +02:00