diff options
| author | unknown <serg@janus.mylan> | 2007-11-01 12:30:45 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-11-01 12:30:45 +0100 |
| commit | 4f7f5941ed617ffab9f6763ea0ec229c3601741f (patch) | |
| tree | 76c1a51eb7958fad227e2ac06551e27609490b1c /tests | |
| parent | 41c2a2c490522da0f163aa25ac88da9db74e0c66 (diff) | |
| parent | 969332eac05358b384f626c66a86a21888e6a83a (diff) | |
| download | mariadb-git-4f7f5941ed617ffab9f6763ea0ec229c3601741f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
client/mysqldump.c:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index d3ba0660198..c297868b2bd 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -11930,7 +11930,7 @@ static void test_bug5194() MAX_PARAM_COUNT * CHARS_PER_PARAM + 1); param_str= (char*) malloc(COLUMN_COUNT * CHARS_PER_PARAM); - if (bind == 0 || query == 0 || param_str == 0) + if (my_bind == 0 || query == 0 || param_str == 0) { fprintf(stderr, "Can't allocate enough memory for query structs\n"); if (my_bind) |