diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-10 17:20:39 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-10 17:20:39 -0400 |
| commit | a6edf110bcd6b393c801624181e5b20b6557b8c1 (patch) | |
| tree | 6c80944794a080d0760a0fcb611aac380726616d /sql-common/client.c | |
| parent | 8154ca618b68784098dcb8b84ba2cf77707c80e4 (diff) | |
| parent | 2f45384bf1eb48b9fab73bf413ceb2dc557f29b7 (diff) | |
| download | mariadb-git-a6edf110bcd6b393c801624181e5b20b6557b8c1.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
libmysqld/lib_sql.cc:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_geofunc.h:
Auto merged
sql-common/client.c:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
mysql-test/t/mysqldump.test:
Manual merge. (Seems to need null-merging.)
sql/mysqld.cc:
Manual merge + formatting change.
sql/sql_show.cc:
Manual merge
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 160f6eb2602..8c0420a27ba 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1701,7 +1701,7 @@ int mysql_init_character_set(MYSQL *mysql) C_MODE_END -MYSQL * +MYSQL * STDCALL CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, const char *passwd, const char *db, uint port, const char *unix_socket,ulong client_flag) |