1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00
unknown f095274fe8 merge with 4.1
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
Docs/Support/texi2html:
  Auto merged
Makefile.am:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/my_time.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/include/ps_modify.inc:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/insert.test:
  merge with 4.1
  Fixed test case to not use 'if exists' when it shouldn't
mysql-test/t/range.test:
  merge with 4.1
  Added missing drop table
sql/ha_ndbcluster.cc:
  merge with 4.1
  Simple optimization: use max() instead of ? :
sql/item_func.cc:
  merge with 4.1
  (Added back old variable names for easier merges)
sql/opt_range.cc:
  merge with 4.1
  Removed argument 'parent_alloc' from QUICK_RANGE_SELECT as this was not used
  Added assert if using QUICK_GROUP_MIN_MAX_SELECT with parent_alloc as the init() function can't handle this
  Changed back get_quick_select_for_ref() to use it's own alloc root becasue this function may be called several times for one query
sql/sql_handler.cc:
  merge with 4.1
  change variable 'err' to 'error' as same function had a label named 'err'
sql/sql_update.cc:
  Use multi-update code from 5.0 instead of 4.1
  We will fix the locking code shortly in 5.0 to be faster than in 4.1
2004-10-29 19:26:52 +03:00
..
2004-05-05 17:05:24 +03:00
2004-10-29 19:26:52 +03:00
2004-09-27 17:01:26 +02:00
2004-10-29 19:26:52 +03:00
2003-12-10 04:31:42 +00:00
2003-12-10 04:31:42 +00:00
2004-03-30 02:32:41 +03:00
2004-10-29 19:26:52 +03:00
2003-11-21 01:53:01 +02:00
2004-08-26 18:26:38 +03:00
2004-10-02 22:20:08 +03:00
2004-10-29 19:26:52 +03:00
2004-10-02 22:20:08 +03:00
2004-02-16 10:03:25 +02:00
2004-10-29 19:26:52 +03:00
2004-10-21 14:54:17 +05:00
2004-09-06 15:14:10 +03:00
2004-10-26 22:41:45 +02:00
2004-10-07 10:50:13 +03:00
2004-07-07 11:29:39 +03:00
2004-09-27 17:01:26 +02:00
2003-06-04 19:21:51 +03:00
2004-08-20 22:54:42 +02:00
2004-10-07 10:50:13 +03:00
2003-12-10 04:31:42 +00:00
2004-10-29 19:26:52 +03:00
2004-05-13 23:47:20 +03:00
2003-12-10 04:31:42 +00:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-09-09 07:26:28 +03:00
2004-09-06 15:14:10 +03:00
2004-08-19 03:02:09 +02:00
2004-03-16 16:35:53 +01:00
2004-05-13 23:47:20 +03:00
2004-10-29 19:26:52 +03:00
2004-07-17 02:09:25 +03:00
2004-10-29 19:26:52 +03:00
2004-09-28 20:08:00 +03:00
2004-10-02 22:20:08 +03:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-10-07 10:50:13 +03:00
2004-06-20 19:11:02 +02:00
2003-12-14 21:31:02 +01:00
2003-12-25 20:11:01 +04:00
2004-09-06 15:14:10 +03:00
2003-12-10 04:31:42 +00:00
2004-06-22 04:47:28 +04:00
2004-10-29 19:26:52 +03:00
2003-12-10 04:31:42 +00:00
2004-05-14 16:00:57 +02:00
2004-05-14 16:00:57 +02:00
2004-05-29 20:55:46 +04:00
2004-10-19 14:12:55 -07:00
2004-06-26 14:21:32 +02:00
2003-12-10 04:31:42 +00:00
2004-09-27 17:01:26 +02:00
2004-10-02 22:20:08 +03:00
2004-10-02 22:20:08 +03:00
2003-12-10 04:31:42 +00:00
2004-10-19 14:12:55 -07:00
2003-08-11 22:44:43 +03:00
2004-09-02 22:06:30 -07:00
2004-10-29 19:26:52 +03:00
2004-09-28 20:08:00 +03:00
2003-12-10 04:31:42 +00:00
2004-02-16 10:03:25 +02:00
2004-07-26 19:40:24 +02:00
2004-06-28 11:06:22 +02:00
2004-10-02 22:20:08 +03:00
2004-07-28 10:49:21 +04:00
2004-10-29 19:26:52 +03:00
2004-09-09 11:22:23 -05:00
2004-07-15 04:19:07 +03:00
2004-06-24 11:52:50 +00:00
2004-10-29 19:26:52 +03:00
2004-10-12 07:20:38 +02:00
2004-09-30 21:36:25 +00:00
2004-05-11 10:40:48 +02:00
2004-10-07 08:42:11 +00:00
2004-10-02 22:20:08 +03:00
2004-10-02 22:20:08 +03:00
2004-09-06 15:14:10 +03:00
2004-10-29 19:26:52 +03:00
2004-09-27 17:01:26 +02:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-10-11 20:58:48 +00:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-09-27 17:01:26 +02:00
2004-05-05 23:29:35 +03:00
2003-12-10 04:31:42 +00:00
2003-12-10 04:31:42 +00:00
2004-05-13 23:47:20 +03:00
2004-07-20 16:51:30 +02:00
2003-12-10 04:31:42 +00:00
2003-08-11 22:44:43 +03:00
2003-10-08 12:01:58 +03:00
2003-10-29 14:23:35 +01:00
2004-10-29 19:26:52 +03:00
2004-07-20 11:00:10 +02:00
2003-12-19 16:25:50 +02:00
2004-07-15 04:19:07 +03:00
2004-06-21 10:21:20 +03:00
2004-06-21 10:21:20 +03:00
2004-02-11 00:06:46 +01:00
2004-05-05 21:24:21 +03:00
2004-02-16 10:03:25 +02:00
2004-05-05 17:05:24 +03:00
2004-03-18 00:09:13 +02:00
2004-05-24 21:12:05 +04:00
2004-05-26 17:04:45 +02:00
2003-08-11 22:44:43 +03:00
2004-07-15 04:19:07 +03:00
2004-07-07 11:29:39 +03:00
2004-07-07 11:29:39 +03:00
2004-05-17 01:52:13 +03:00
2004-09-07 21:30:28 +02:00
2004-07-15 04:19:07 +03:00
2004-05-19 05:09:10 +03:00
2004-07-07 11:29:39 +03:00
2004-07-15 04:19:07 +03:00
2004-08-07 23:18:13 +02:00
2004-10-29 19:26:52 +03:00
2004-09-27 17:01:26 +02:00
2004-10-29 19:26:52 +03:00
2004-10-29 19:26:52 +03:00
2004-07-20 11:00:10 +02:00
2004-09-08 21:54:01 +03:00
2004-10-29 19:26:52 +03:00
2003-12-10 04:31:42 +00:00
2004-10-29 19:26:52 +03:00
2004-08-24 17:24:23 +02:00
2004-09-27 17:01:26 +02:00
2004-08-18 19:57:55 +02:00
2004-10-29 19:26:52 +03:00
2004-09-27 17:01:26 +02:00
2003-12-10 04:31:42 +00:00
2004-09-27 17:01:26 +02:00
2004-10-29 19:26:52 +03:00
2004-09-28 20:08:00 +03:00
2004-09-28 20:08:00 +03:00
2004-02-16 10:03:25 +02:00
2004-10-29 19:26:52 +03:00
2004-10-06 19:14:33 +03:00
2004-10-29 19:26:52 +03:00
2004-10-02 22:20:08 +03:00