diff options
| author | unknown <venu@myvenu.com> | 2002-11-26 18:54:17 -0800 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2002-11-26 18:54:17 -0800 |
| commit | e9f96cf92a82db9afda5cb9fe9d392b29bbdfb9c (patch) | |
| tree | 5786a143f7249cc2e0a037161368b72d35d9e517 /client | |
| parent | 4adb15f3fa83c2ca5b0d5586fa90d2b50dbedb61 (diff) | |
| parent | 4826ed009186289b1b3f7a39a8bd0076cb85b712 (diff) | |
| download | mariadb-git-e9f96cf92a82db9afda5cb9fe9d392b29bbdfb9c.tar.gz | |
Merge myvenu.com:/home/venu/bk/src-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/insert_test.c | 1 | ||||
| -rw-r--r-- | client/select_test.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/client/insert_test.c b/client/insert_test.c index 42691df6875..fb4890faf73 100644 --- a/client/insert_test.c +++ b/client/insert_test.c @@ -16,6 +16,7 @@ #include <stdio.h> #include <stdlib.h> +#include <my_global.h> #include "mysql.h" #define INSERT_QUERY "insert into test (name,num) values ('item %d', %d)" diff --git a/client/select_test.c b/client/select_test.c index ee2a9192865..d7f18c0f1f0 100644 --- a/client/select_test.c +++ b/client/select_test.c @@ -19,6 +19,7 @@ #endif #include <stdio.h> #include <stdlib.h> +#include "my_global.h" #include "mysql.h" #define SELECT_QUERY "select name from test where num = %d" |