Below is the list of changes that have just been committed into a local
4.1 repository of igor. When igor 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
1.2491 06/06/06 09:59:45 igor@stripped +3 -0
Fixed some problems for Windows build
client/mysqldump.c
1.200 06/06/06 09:59:41 igor@stripped +2 -1
VS compiler does not accept variable declarations within blocks.
Such a behaviour complies with the Standard C.
VC++Files/client/mysql_ia64.dsp
1.3 06/06/06 09:59:41 igor@stripped +4 -0
Fixed omission of mysys\my_conio.c.
VC++Files/client/mysql.dsp
1.15 06/06/06 09:59:41 igor@stripped +4 -0
Fixed omission of mysys\my_conio.c.
# 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: igor
# Host: rurik.mysql.com
# Root: /home/igor/dev/mysql-4.1-0
--- 1.199/client/mysqldump.c 2006-05-19 04:21:27 -07:00
+++ 1.200/client/mysqldump.c 2006-06-06 09:59:41 -07:00
@@ -2222,6 +2222,7 @@
static char *get_actual_table_name(const char *old_table_name, MEM_ROOT *root)
{
char *name= 0;
+ ulong *lengths;
MYSQL_RES *tableRes;
MYSQL_ROW row;
char query[50 + 2*NAME_LEN];
@@ -2246,7 +2247,7 @@
if (numRows > 0)
{
row= mysql_fetch_row( tableRes );
- ulong *lengths= mysql_fetch_lengths(tableRes);
+ lengths= mysql_fetch_lengths(tableRes);
name= strmake_root(root, row[0], lengths[0]);
}
mysql_free_result(tableRes);
--- 1.2/VC++Files/client/mysql_ia64.dsp 2005-05-24 13:42:38 -07:00
+++ 1.3/VC++Files/client/mysql_ia64.dsp 2006-06-06 09:59:41 -07:00
@@ -130,6 +130,10 @@
# End Source File
# Begin Source File
+SOURCE=..\mysys\my_conio.c
+# End Source File
+# Begin Source File
+
SOURCE=.\sql_string.cpp
# End Source File
# End Target
--- 1.14/VC++Files/client/mysql.dsp 2005-08-03 10:57:26 -07:00
+++ 1.15/VC++Files/client/mysql.dsp 2006-06-06 09:59:41 -07:00
@@ -144,6 +144,10 @@
# End Source File
# Begin Source File
+SOURCE=..\mysys\my_conio.c
+# End Source File
+# Begin Source File
+
SOURCE=.\sql_string.cpp
# End Source File
# End Target
| Thread |
|---|
| • bk commit into 4.1 tree (igor:1.2491) | igor | 6 Jun |
