Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-12-31 01:04:07+01:00, kent@stripped +10 -0
Merge kboortz@stripped:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.0
MERGE: 1.2344.1.9
myisam/mi_check.c@stripped, 2006-12-31 01:04:04+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.147.1.2
myisam/mi_dynrec.c@stripped, 2006-12-31 01:04:04+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.43.1.3
myisam/mi_packrec.c@stripped, 2006-12-31 01:04:04+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.35.1.2
myisam/mi_range.c@stripped, 2006-12-31 01:04:04+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.16.1.2
myisam/mi_test1.c@stripped, 2006-12-31 01:04:04+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.27.1.2
myisam/mi_write.c@stripped, 2006-12-31 01:04:04+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.58.1.2
myisam/rt_split.c@stripped, 2006-12-31 01:04:04+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.14.1.2
sql/opt_range.cc@stripped, 2006-12-31 01:04:04+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.235.1.1
sql/sql_class.h@stripped, 2006-12-31 01:04:04+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.313.1.3
sql/sql_insert.cc@stripped, 2006-12-31 01:04:04+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.206.1.2
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kent
# Host: kent-amd64.(none)
# Root: /home/kent/bk/main/mysql-5.0/RESYNC
--- 1.149/myisam/mi_check.c 2006-12-31 01:04:11 +01:00
+++ 1.150/myisam/mi_check.c 2006-12-31 01:04:11 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- 1.46/myisam/mi_dynrec.c 2006-12-31 01:04:11 +01:00
+++ 1.47/myisam/mi_dynrec.c 2006-12-31 01:04:11 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- 1.38/myisam/mi_packrec.c 2006-12-31 01:04:11 +01:00
+++ 1.39/myisam/mi_packrec.c 2006-12-31 01:04:11 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- 1.18/myisam/mi_range.c 2006-12-31 01:04:11 +01:00
+++ 1.19/myisam/mi_range.c 2006-12-31 01:04:11 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2004, 2006 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- 1.29/myisam/mi_test1.c 2006-12-31 01:04:11 +01:00
+++ 1.30/myisam/mi_test1.c 2006-12-31 01:04:11 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2005 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- 1.60/myisam/mi_write.c 2006-12-31 01:04:11 +01:00
+++ 1.61/myisam/mi_write.c 2006-12-31 01:04:11 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- 1.236/sql/opt_range.cc 2006-12-31 01:04:11 +01:00
+++ 1.237/sql/opt_range.cc 2006-12-31 01:04:11 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- 1.316/sql/sql_class.h 2006-12-31 01:04:11 +01:00
+++ 1.317/sql/sql_class.h 2006-12-31 01:04:11 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- 1.210/sql/sql_insert.cc 2006-12-31 01:04:11 +01:00
+++ 1.211/sql/sql_insert.cc 2006-12-31 01:04:11 +01:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- 1.16/myisam/rt_split.c 2006-12-31 01:04:11 +01:00
+++ 1.17/myisam/rt_split.c 2006-12-31 01:04:11 +01:00
@@ -1,5 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & Alexey Botchkov & MySQL Finland AB
- & TCX DataKonsult AB
+/* Copyright (C) 2002-2005 MySQL AB & Alexey Botchkov
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
| Thread |
|---|
| • bk commit into 5.0 tree (kent:1.2356) | kent | 31 Dec |
